From 7404fe1b8d20b30162a7e56307d5a2d400cb5645 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Wed, 5 Sep 2012 00:34:20 +0000 Subject: * object.h (Sized_relobj_file::emit_relocs): Delete. (Sized_relobj_file::emit_relocs_reltype): Delete. * reloc.cc (Sized_relobj_file::do_relocate_sections): Call target relocate_relocs for --emit-relocs. (Sized_relobj_file::emit_relocs, emit_relocs_reltype): Delete. * output.h: Update comment. (Output_segment::first_section): New function. (Output_segment::first_section_load_address): Use first_section. * output.cc (Output_segment::first_section): New function extracted.. (Output_segment::first_section_load_address): ..from here. Delete. * target-reloc.h (relocate_for_relocatable): Rename to relocate_relocs. * target.h (Sized_target::relocate_for_relocatable): Likewise. * arm.cc (Target_arm::relocate_for_relocatable): Likewise, and adjust call to target.h function. * i386.cc (Target_i386): Likewise. * sparc.cc (Target_sparc): Likewise. * x86_64.cc (Target_x86_64): Likewise. * powerpc.cc (Target_powerpc): Likewise. (Target_powerpc::Scan::local, global): Handle R_POWERPC_TLS. Ensure first tls section has section symbol for optimised local dynamic output relocs. (Target_powerpc::Relocate::relocate): Correct local dynamic value. (Target_powerpc::relocate_relocs): Adjust relocs emitted for optimised tls code. * testsuite/testfile.cc (Target_test::relocate_for_relocatable): Rename to relocate_relocs. Update error message. --- gold/x86_64.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gold/x86_64.cc') diff --git a/gold/x86_64.cc b/gold/x86_64.cc index 625aff8..a15b6ae 100644 --- a/gold/x86_64.cc +++ b/gold/x86_64.cc @@ -469,9 +469,9 @@ class Target_x86_64 : public Sized_target const unsigned char* plocal_symbols, Relocatable_relocs*); - // Relocate a section during a relocatable link. + // Emit relocations for a section. void - relocate_for_relocatable( + relocate_relocs( const Relocate_info*, unsigned int sh_type, const unsigned char* prelocs, @@ -4208,7 +4208,7 @@ Target_x86_64::scan_relocatable_relocs( template void -Target_x86_64::relocate_for_relocatable( +Target_x86_64::relocate_relocs( const Relocate_info* relinfo, unsigned int sh_type, const unsigned char* prelocs, @@ -4224,7 +4224,7 @@ Target_x86_64::relocate_for_relocatable( { gold_assert(sh_type == elfcpp::SHT_RELA); - gold::relocate_for_relocatable( + gold::relocate_relocs( relinfo, prelocs, reloc_count, -- cgit v1.1