diff options
| author | Cary Coutant <ccoutant@google.com> | 2014-07-07 10:14:45 -0700 |
|---|---|---|
| committer | Cary Coutant <ccoutant@google.com> | 2014-07-08 10:44:09 -0700 |
| commit | f35c4853cc5b0e51d8a460be390f7a20cd44ba44 (patch) | |
| tree | 5b082da36bcbf9b57c3064b2461229294e71ce69 /gold/object.cc | |
| parent | b484180108158f427f3637987de02199416ed53a (diff) | |
| download | fsf-binutils-gdb-f35c4853cc5b0e51d8a460be390f7a20cd44ba44.zip fsf-binutils-gdb-f35c4853cc5b0e51d8a460be390f7a20cd44ba44.tar.gz fsf-binutils-gdb-f35c4853cc5b0e51d8a460be390f7a20cd44ba44.tar.bz2 | |
Fix internal error with LTO on ARM.
This prevents the target-specific do_read_symbols methods from being called
twice when do_layout_deferred_sections needs to layout an .eh_frame section.
gold/
PR gold/15639
* dynobj.h (Sized_dynobj::base_read_symbols): New method.
* dynobj.cc (Sized_dynobj::do_read_symbols): Move body to...
(Sized_dynobj::base_read_symbols): ...new method.
* object.h (Sized_relobj_file::base_read_symbols): New method.
* object.cc (Sized_relobj_file::do_read_symbols): Move body to...
(Sized_relobj_file::base_read_symbols): ...new method.
* arm.cc (Arm_relobj::do_read_symbols): Call base_read_symbols.
* mips.cc: (Mips_relobj::do_read_symbols): Likewise.
* powerpc.cc (Powerpc_dynobj::do_read_symbols): Likewise.
Diffstat (limited to 'gold/object.cc')
| -rw-r--r-- | gold/object.cc | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/gold/object.cc b/gold/object.cc index c894c13..1811cda 100644 --- a/gold/object.cc +++ b/gold/object.cc @@ -755,6 +755,16 @@ template<int size, bool big_endian> void Sized_relobj_file<size, big_endian>::do_read_symbols(Read_symbols_data* sd) { + this->base_read_symbols(sd); +} + +// Read the sections and symbols from an object file. This is common +// code for all target-specific overrides of do_read_symbols(). + +template<int size, bool big_endian> +void +Sized_relobj_file<size, big_endian>::base_read_symbols(Read_symbols_data* sd) +{ this->read_section_data(&this->elf_file_, sd); const unsigned char* const pshdrs = sd->section_headers->data(); @@ -1848,7 +1858,7 @@ Sized_relobj_file<size, big_endian>::do_layout_deferred_sections(Layout* layout) // Reading the symbols again here may be slow. Read_symbols_data sd; - this->read_symbols(&sd); + this->base_read_symbols(&sd); this->layout_eh_frame_section(layout, sd.symbols->data(), sd.symbols_size, |