From f35c4853cc5b0e51d8a460be390f7a20cd44ba44 Mon Sep 17 00:00:00 2001 From: Cary Coutant Date: Mon, 7 Jul 2014 10:14:45 -0700 Subject: 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. --- gold/object.cc | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'gold/object.cc') 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 void Sized_relobj_file::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 +void +Sized_relobj_file::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::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, -- cgit v1.1