diff options
| author | Ian Lance Taylor <ian@airs.com> | 2009-12-14 19:53:05 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@airs.com> | 2009-12-14 19:53:05 +0000 |
| commit | 2ea97941102380c28117882600265c1187c6fc8b (patch) | |
| tree | 8f423876f9f118fbe6f7959e60984cd13ad7430d /gold/dwarf_reader.cc | |
| parent | ab8e2090b6435823d50b29b7a255140ba6ea673f (diff) | |
| download | fsf-binutils-gdb-2ea97941102380c28117882600265c1187c6fc8b.zip fsf-binutils-gdb-2ea97941102380c28117882600265c1187c6fc8b.tar.gz fsf-binutils-gdb-2ea97941102380c28117882600265c1187c6fc8b.tar.bz2 | |
Revert -Wshadow changes, all changes from:
2009-12-11 Doug Kwan <dougkwan@google.com>
2009-12-11 Nick Clifton <nickc@redhat.com>
* configure.ac: Remove -Wshadow when setting WARN_CXXFLAGS.
Diffstat (limited to 'gold/dwarf_reader.cc')
| -rw-r--r-- | gold/dwarf_reader.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gold/dwarf_reader.cc b/gold/dwarf_reader.cc index c8d29cd..4062fe6 100644 --- a/gold/dwarf_reader.cc +++ b/gold/dwarf_reader.cc @@ -294,7 +294,7 @@ Sized_dwarf_line_info<size, big_endian>::process_one_opcode( case elfcpp::DW_LNS_advance_pc: { const uint64_t advance_address - = read_unsigned_LEB_128(start, &templen); + = read_unsigned_LEB_128(start, &templen); oplen += templen; lsm->address += header_.min_insn_length * advance_address; } @@ -353,7 +353,7 @@ Sized_dwarf_line_info<size, big_endian>::process_one_opcode( case elfcpp::DW_LNS_extended_op: { const uint64_t extended_op_len - = read_unsigned_LEB_128(start, &templen); + = read_unsigned_LEB_128(start, &templen); start += templen; oplen += templen + extended_op_len; @@ -375,7 +375,7 @@ Sized_dwarf_line_info<size, big_endian>::process_one_opcode( { lsm->address = elfcpp::Swap_unaligned<size, big_endian>::readval(start); typename Reloc_map::const_iterator it - = reloc_map_.find(start - this->buffer_); + = reloc_map_.find(start - this->buffer_); if (it != reloc_map_.end()) { // value + addend. @@ -420,16 +420,17 @@ Sized_dwarf_line_info<size, big_endian>::process_one_opcode( default: { - // Ignore unknown opcode silently. + // Ignore unknown opcode silently for (int i = 0; i < header_.std_opcode_lengths[opcode]; i++) { + size_t templen; read_unsigned_LEB_128(start, &templen); start += templen; oplen += templen; } } break; - } + } *len = oplen; return false; } |