diff options
Diffstat (limited to 'gold/aarch64.cc')
| -rw-r--r-- | gold/aarch64.cc | 123 |
1 files changed, 83 insertions, 40 deletions
diff --git a/gold/aarch64.cc b/gold/aarch64.cc index 715936b..20f2f4f 100644 --- a/gold/aarch64.cc +++ b/gold/aarch64.cc @@ -2869,6 +2869,21 @@ class Target_aarch64 : public Sized_target<size, big_endian> const unsigned char* plocal_symbols, Relocatable_relocs*); + // Scan the relocs for --emit-relocs. + void + emit_relocs_scan(Symbol_table* symtab, + Layout* layout, + Sized_relobj_file<size, big_endian>* object, + unsigned int data_shndx, + unsigned int sh_type, + const unsigned char* prelocs, + size_t reloc_count, + Output_section* output_section, + bool needs_special_offset_handling, + size_t local_symbol_count, + const unsigned char* plocal_syms, + Relocatable_relocs* rr); + // Relocate a section during a relocatable link. void relocate_relocs( @@ -3224,15 +3239,6 @@ class Target_aarch64 : public Sized_target<size, big_endian> }; // End of class Relocate - // A class which returns the size required for a relocation type, - // used while scanning relocs during a relocatable link. - class Relocatable_size_for_reloc - { - public: - unsigned int - get_size_for_reloc(unsigned int, Relobj*); - }; - // Adjust TLS relocation type based on the options and whether this // is a local symbol. static tls::Tls_optimization @@ -6630,17 +6636,16 @@ Target_aarch64<size, big_endian>::gc_process_relocs( size_t local_symbol_count, const unsigned char* plocal_symbols) { + typedef Target_aarch64<size, big_endian> Aarch64; + typedef gold::Default_classify_reloc<elfcpp::SHT_RELA, size, big_endian> + Classify_reloc; + if (sh_type == elfcpp::SHT_REL) { return; } - gold::gc_process_relocs< - size, big_endian, - Target_aarch64<size, big_endian>, - elfcpp::SHT_RELA, - typename Target_aarch64<size, big_endian>::Scan, - typename Target_aarch64<size, big_endian>::Relocatable_size_for_reloc>( + gold::gc_process_relocs<size, big_endian, Aarch64, Scan, Classify_reloc>( symtab, layout, this, @@ -6671,13 +6676,18 @@ Target_aarch64<size, big_endian>::scan_relocs( size_t local_symbol_count, const unsigned char* plocal_symbols) { + typedef Target_aarch64<size, big_endian> Aarch64; + typedef gold::Default_classify_reloc<elfcpp::SHT_RELA, size, big_endian> + Classify_reloc; + if (sh_type == elfcpp::SHT_REL) { gold_error(_("%s: unsupported REL reloc section"), object->name().c_str()); return; } - gold::scan_relocs<size, big_endian, Target_aarch64, elfcpp::SHT_RELA, Scan>( + + gold::scan_relocs<size, big_endian, Aarch64, Scan, Classify_reloc>( symtab, layout, this, @@ -7868,10 +7878,15 @@ Target_aarch64<size, big_endian>::relocate_section( section_size_type view_size, const Reloc_symbol_changes* reloc_symbol_changes) { - gold_assert(sh_type == elfcpp::SHT_RELA); + typedef Target_aarch64<size, big_endian> Aarch64; typedef typename Target_aarch64<size, big_endian>::Relocate AArch64_relocate; - gold::relocate_section<size, big_endian, Target_aarch64, elfcpp::SHT_RELA, - AArch64_relocate, gold::Default_comdat_behavior>( + typedef gold::Default_classify_reloc<elfcpp::SHT_RELA, size, big_endian> + Classify_reloc; + + gold_assert(sh_type == elfcpp::SHT_RELA); + + gold::relocate_section<size, big_endian, Aarch64, AArch64_relocate, + gold::Default_comdat_behavior, Classify_reloc>( relinfo, this, prelocs, @@ -7884,21 +7899,6 @@ Target_aarch64<size, big_endian>::relocate_section( reloc_symbol_changes); } -// Return the size of a relocation while scanning during a relocatable -// link. - -template<int size, bool big_endian> -unsigned int -Target_aarch64<size, big_endian>::Relocatable_size_for_reloc:: -get_size_for_reloc( - unsigned int , - Relobj* ) -{ - // We will never support SHT_REL relocations. - gold_unreachable(); - return 0; -} - // Scan the relocs during a relocatable link. template<int size, bool big_endian> @@ -7917,13 +7917,14 @@ Target_aarch64<size, big_endian>::scan_relocatable_relocs( const unsigned char* plocal_symbols, Relocatable_relocs* rr) { - gold_assert(sh_type == elfcpp::SHT_RELA); + typedef gold::Default_classify_reloc<elfcpp::SHT_RELA, size, big_endian> + Classify_reloc; + typedef gold::Default_scan_relocatable_relocs<Classify_reloc> + Scan_relocatable_relocs; - typedef gold::Default_scan_relocatable_relocs<elfcpp::SHT_RELA, - Relocatable_size_for_reloc> Scan_relocatable_relocs; + gold_assert(sh_type == elfcpp::SHT_RELA); - gold::scan_relocatable_relocs<size, big_endian, elfcpp::SHT_RELA, - Scan_relocatable_relocs>( + gold::scan_relocatable_relocs<size, big_endian, Scan_relocatable_relocs>( symtab, layout, object, @@ -7937,6 +7938,45 @@ Target_aarch64<size, big_endian>::scan_relocatable_relocs( rr); } +// Scan the relocs for --emit-relocs. + +template<int size, bool big_endian> +void +Target_aarch64<size, big_endian>::emit_relocs_scan( + Symbol_table* symtab, + Layout* layout, + Sized_relobj_file<size, big_endian>* object, + unsigned int data_shndx, + unsigned int sh_type, + const unsigned char* prelocs, + size_t reloc_count, + Output_section* output_section, + bool needs_special_offset_handling, + size_t local_symbol_count, + const unsigned char* plocal_syms, + Relocatable_relocs* rr) +{ + typedef gold::Default_classify_reloc<elfcpp::SHT_RELA, size, big_endian> + Classify_reloc; + typedef gold::Default_emit_relocs_strategy<Classify_reloc> + Emit_relocs_strategy; + + gold_assert(sh_type == elfcpp::SHT_RELA); + + gold::scan_relocatable_relocs<size, big_endian, Emit_relocs_strategy>( + symtab, + layout, + object, + data_shndx, + prelocs, + reloc_count, + output_section, + needs_special_offset_handling, + local_symbol_count, + plocal_syms, + rr); +} + // Relocate a section during a relocatable link. template<int size, bool big_endian> @@ -7954,9 +7994,12 @@ Target_aarch64<size, big_endian>::relocate_relocs( unsigned char* reloc_view, section_size_type reloc_view_size) { + typedef gold::Default_classify_reloc<elfcpp::SHT_RELA, size, big_endian> + Classify_reloc; + gold_assert(sh_type == elfcpp::SHT_RELA); - gold::relocate_relocs<size, big_endian, elfcpp::SHT_RELA>( + gold::relocate_relocs<size, big_endian, Classify_reloc>( relinfo, prelocs, reloc_count, |