diff options
Diffstat (limited to 'gold/tilegx.cc')
| -rw-r--r-- | gold/tilegx.cc | 128 |
1 files changed, 84 insertions, 44 deletions
diff --git a/gold/tilegx.cc b/gold/tilegx.cc index 07960ef..bb17330 100644 --- a/gold/tilegx.cc +++ b/gold/tilegx.cc @@ -308,6 +308,21 @@ class Target_tilegx : 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( @@ -523,15 +538,6 @@ class Target_tilegx : public Sized_target<size, big_endian> section_size_type); }; - // 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 @@ -4154,26 +4160,26 @@ Target_tilegx<size, big_endian>::gc_process_relocs(Symbol_table* symtab, { typedef Target_tilegx<size, big_endian> Tilegx; typedef typename Target_tilegx<size, big_endian>::Scan Scan; + 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, - Tilegx, elfcpp::SHT_RELA, Scan, - typename Target_tilegx<size, big_endian>::Relocatable_size_for_reloc>( - symtab, - layout, - this, - object, - data_shndx, - prelocs, - reloc_count, - output_section, - needs_special_offset_handling, - local_symbol_count, - plocal_symbols); + gold::gc_process_relocs<size, big_endian, Tilegx, Scan, Classify_reloc>( + symtab, + layout, + this, + object, + data_shndx, + prelocs, + reloc_count, + output_section, + needs_special_offset_handling, + local_symbol_count, + plocal_symbols); } // Scan relocations for a section. @@ -4193,6 +4199,8 @@ Target_tilegx<size, big_endian>::scan_relocs(Symbol_table* symtab, { typedef Target_tilegx<size, big_endian> Tilegx; typedef typename Target_tilegx<size, big_endian>::Scan Scan; + typedef gold::Default_classify_reloc<elfcpp::SHT_RELA, size, big_endian> + Classify_reloc; if (sh_type == elfcpp::SHT_REL) { @@ -4201,7 +4209,7 @@ Target_tilegx<size, big_endian>::scan_relocs(Symbol_table* symtab, return; } - gold::scan_relocs<size, big_endian, Tilegx, elfcpp::SHT_RELA, Scan>( + gold::scan_relocs<size, big_endian, Tilegx, Scan, Classify_reloc>( symtab, layout, this, @@ -4743,11 +4751,13 @@ Target_tilegx<size, big_endian>::relocate_section( { typedef Target_tilegx<size, big_endian> Tilegx; typedef typename Target_tilegx<size, big_endian>::Relocate Tilegx_relocate; + 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, Tilegx, elfcpp::SHT_RELA, - Tilegx_relocate, gold::Default_comdat_behavior>( + gold::relocate_section<size, big_endian, Tilegx, Tilegx_relocate, + gold::Default_comdat_behavior, Classify_reloc>( relinfo, this, prelocs, @@ -4788,24 +4798,50 @@ Target_tilegx<size, big_endian>::apply_relocation( view_size); } -// Return the size of a relocation while scanning during a relocatable -// link. +// Scan the relocs during a relocatable link. template<int size, bool big_endian> -unsigned int -Target_tilegx<size,big_endian>::Relocatable_size_for_reloc::get_size_for_reloc( - unsigned int, Relobj*) +void +Target_tilegx<size, big_endian>::scan_relocatable_relocs( + 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_symbols, + Relocatable_relocs* rr) { - // We are always SHT_RELA, so we should never get here. - gold_unreachable(); - return 0; + typedef gold::Default_classify_reloc<elfcpp::SHT_RELA, size, big_endian> + Classify_reloc; + typedef gold::Default_scan_relocatable_relocs<Classify_reloc> + Scan_relocatable_relocs; + + gold_assert(sh_type == elfcpp::SHT_RELA); + + gold::scan_relocatable_relocs<size, big_endian, Scan_relocatable_relocs>( + symtab, + layout, + object, + data_shndx, + prelocs, + reloc_count, + output_section, + needs_special_offset_handling, + local_symbol_count, + plocal_symbols, + rr); } -// Scan the relocs during a relocatable link. +// Scan the relocs for --emit-relocs. template<int size, bool big_endian> void -Target_tilegx<size, big_endian>::scan_relocatable_relocs( +Target_tilegx<size, big_endian>::emit_relocs_scan( Symbol_table* symtab, Layout* layout, Sized_relobj_file<size, big_endian>* object, @@ -4816,16 +4852,17 @@ Target_tilegx<size, big_endian>::scan_relocatable_relocs( Output_section* output_section, bool needs_special_offset_handling, size_t local_symbol_count, - const unsigned char* plocal_symbols, + const unsigned char* plocal_syms, 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_emit_relocs_strategy<Classify_reloc> + Emit_relocs_strategy; - 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, Emit_relocs_strategy>( symtab, layout, object, @@ -4835,7 +4872,7 @@ Target_tilegx<size, big_endian>::scan_relocatable_relocs( output_section, needs_special_offset_handling, local_symbol_count, - plocal_symbols, + plocal_syms, rr); } @@ -4856,9 +4893,12 @@ Target_tilegx<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, |