diff options
| -rw-r--r-- | gold/ChangeLog | 6 | ||||
| -rw-r--r-- | gold/dwarf_reader.cc | 23 |
2 files changed, 19 insertions, 10 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog index 2e3b87f..97e6e28 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,9 @@ +2010-11-16 Cary Coutant <ccoutant@google.com> + + PR gold/12220 + * dwarf_reader.cc (Sized_dwarf_line_info::Sized_dwarf_line_info): + Check for ".zdebug_line". + 2010-11-16 Doug Kwan <dougkwan@google.com> Cary Coutant <ccoutant@google.com> diff --git a/gold/dwarf_reader.cc b/gold/dwarf_reader.cc index c0188fb..e83e7fb 100644 --- a/gold/dwarf_reader.cc +++ b/gold/dwarf_reader.cc @@ -68,16 +68,19 @@ Sized_dwarf_line_info<size, big_endian>::Sized_dwarf_line_info(Object* object, directories_(), files_(), current_header_index_(-1) { unsigned int debug_shndx; - for (debug_shndx = 0; debug_shndx < object->shnum(); ++debug_shndx) - // FIXME: do this more efficiently: section_name() isn't super-fast - if (object->section_name(debug_shndx) == ".debug_line") - { - section_size_type buffer_size; - this->buffer_ = object->section_contents(debug_shndx, &buffer_size, - false); - this->buffer_end_ = this->buffer_ + buffer_size; - break; - } + for (debug_shndx = 1; debug_shndx < object->shnum(); ++debug_shndx) + { + // FIXME: do this more efficiently: section_name() isn't super-fast + std::string name = object->section_name(debug_shndx); + if (name == ".debug_line" || name == ".zdebug_line") + { + section_size_type buffer_size; + this->buffer_ = object->section_contents(debug_shndx, &buffer_size, + false); + this->buffer_end_ = this->buffer_ + buffer_size; + break; + } + } if (this->buffer_ == NULL) return; |