diff options
| author | Alan Modra <amodra@gmail.com> | 2012-09-05 00:34:20 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2012-09-05 00:34:20 +0000 |
| commit | 7404fe1b8d20b30162a7e56307d5a2d400cb5645 (patch) | |
| tree | 71cfb8fde4ad34ab2eb812996ad807feec50828b /gold/arm.cc | |
| parent | f54ae065b8f805b626729a8f60bacf8312a182db (diff) | |
* 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.
Diffstat (limited to 'gold/arm.cc')
| -rw-r--r-- | gold/arm.cc | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/gold/arm.cc b/gold/arm.cc index fa257a79b9..fc7d9811d4 100644 --- a/gold/arm.cc +++ b/gold/arm.cc @@ -2286,20 +2286,20 @@ class Target_arm : public Sized_target<32, big_endian> const unsigned char* plocal_symbols, Relocatable_relocs*); - // Relocate a section during a relocatable link. + // Emit relocations for a section. void - relocate_for_relocatable(const Relocate_info<32, big_endian>*, - unsigned int sh_type, - const unsigned char* prelocs, - size_t reloc_count, - Output_section* output_section, - off_t offset_in_output_section, - const Relocatable_relocs*, - unsigned char* view, - Arm_address view_address, - section_size_type view_size, - unsigned char* reloc_view, - section_size_type reloc_view_size); + relocate_relocs(const Relocate_info<32, big_endian>*, + unsigned int sh_type, + const unsigned char* prelocs, + size_t reloc_count, + Output_section* output_section, + off_t offset_in_output_section, + const Relocatable_relocs*, + unsigned char* view, + Arm_address view_address, + section_size_type view_size, + unsigned char* reloc_view, + section_size_type reloc_view_size); // Perform target-specific processing in a relocatable link. This is // only used if we use the relocation strategy RELOC_SPECIAL. @@ -9588,11 +9588,11 @@ Target_arm<big_endian>::scan_relocatable_relocs( rr); } -// Relocate a section during a relocatable link. +// Emit relocations for a section. template<bool big_endian> void -Target_arm<big_endian>::relocate_for_relocatable( +Target_arm<big_endian>::relocate_relocs( const Relocate_info<32, big_endian>* relinfo, unsigned int sh_type, const unsigned char* prelocs, @@ -9608,7 +9608,7 @@ Target_arm<big_endian>::relocate_for_relocatable( { gold_assert(sh_type == elfcpp::SHT_REL); - gold::relocate_for_relocatable<32, big_endian, elfcpp::SHT_REL>( + gold::relocate_relocs<32, big_endian, elfcpp::SHT_REL>( relinfo, prelocs, reloc_count, |