diff options
author | Cary Coutant <ccoutant@google.com> | 2011-05-24 21:41:10 +0000 |
---|---|---|
committer | Cary Coutant <ccoutant@google.com> | 2011-05-24 21:41:10 +0000 |
commit | 6fa2a40bf45fcc738eb580a6b644ac74b42c2d6a (patch) | |
tree | 41ae0a8dbe33a58e626c8fbcaa13f0b435b193bf /gold/powerpc.cc | |
parent | 2e21250dbcb81b1909ba3fbda8931a47c7215beb (diff) | |
download | fsf-binutils-gdb-6fa2a40bf45fcc738eb580a6b644ac74b42c2d6a.zip fsf-binutils-gdb-6fa2a40bf45fcc738eb580a6b644ac74b42c2d6a.tar.gz fsf-binutils-gdb-6fa2a40bf45fcc738eb580a6b644ac74b42c2d6a.tar.bz2 |
* incremental-dump.cc (dump_incremental_inputs): Print dynamic reloc
info; adjust display of GOT entries.
* incremental.cc (Sized_incremental_binary::setup_readers): Allocate
vector of input objects; remove file_status_.
(Sized_incremental_binary::do_reserve_layout): Remove file_status_.
(Sized_incremental_binary::do_process_got_plt): Adjust calls to
got_plt reader; call target hooks to reserve GOT entries.
(Output_section_incremental_inputs::set_final_data_size): Adjust size
of input file info header and GOT info entry.
(Output_section_incremental_inputs::write_info_blocks): Write dynamic
relocation info.
(Got_plt_view_info::got_descriptor): Remove.
(Got_plt_view_info::sym_index): New data member.
(Got_plt_view_info::input_index): New data member.
(Local_got_offset_visitor::visit): Write input file index.
(Global_got_offset_visitor::visit): Write 0 for input file index.
(Global_symbol_visitor_got_plt::operator()): Replace got_descriptor
with sym_index and input_index.
(Output_section_incremental_inputs::write_got_plt): Adjust size of
incremental info GOT entry; replace got_descriptor with input_index.
(Sized_relobj_incr::Sized_relobj_incr): Adjust initializers; record
map from input file index to object.
(Sized_relobj_incr::do_layout): Replace direct data member reference
with accessor function.
(Sized_relobj_incr::do_for_all_local_got_entries): Move to base class.
* incremental.h (Incremental_input_entry_reader::get_symbol_offset):
Adjust size of input file info header.
(Incremental_input_entry_reader::get_first_dyn_reloc): New function.
(Incremental_input_entry_reader::get_dyn_reloc_count): New function.
(Incremental_input_entry_reader::get_input_section): Adjust size of
input file info header.
(Incremental_got_plt_reader::Incremental_got_plt_reader): Adjust size
of incremental info GOT entry.
(Incremental_got_plt_reader::get_got_desc): Remove.
(Incremental_got_plt_reader::get_got_symndx): New function.
(Incremental_got_plt_reader::get_got_input_index): New function.
(Sized_incremental_binary::Sized_incremental_binary): Remove
file_status_; add input_objects_.
(Sized_incremental_binary::~Sized_incremental_binary): Remove.
(Sized_incremental_binary::set_file_is_unchanged): Remove.
(Sized_incremental_binary::file_is_unchanged): Remove.
(Sized_incremental_binary::set_input_object): New function.
(Sized_incremental_binary::input_object): New function.
(Sized_incremental_binary::file_status_): Remove.
(Sized_incremental_binary::input_objects_): New data member.
(Sized_relobj_incr): Rename Sized_incr_relobj to this; adjust all
references.
(Sized_relobj_incr::invalid_address): Move to base class.
(Sized_relobj_incr::is_output_section_offset_invalid): Move to base
class.
(Sized_relobj_incr::do_output_section_offset): Likewise.
(Sized_relobj_incr::do_for_all_local_got_entries): Likewise.
(Sized_relobj_incr::section_offsets_): Likewise.
* object.cc (Sized_relobj::do_for_all_local_got_entries): New
function.
(Sized_relobj_file::Sized_relobj_file): Remove local_got_offsets_.
(Sized_relobj_file::layout_section): Replace refs to section_offsets_
with accessor function.
(Sized_relobj_file::do_layout): Likewise.
(Sized_relobj_file::do_layout_deferred_sections): Likewise.
(Sized_relobj_file::do_for_all_local_got_entries): Move to base class.
(Sized_relobj_file::compute_final_local_value): Replace refs to
section_offsets_ with accessor function.
(Sized_relobj_file::do_finalize_local_symbols): Likewise.
* object.h (Relobj::Relobj): Initialize new data members.
(Relobj::add_dyn_reloc): New function.
(Relobj::first_dyn_reloc): New function.
(Relobj::dyn_reloc_count): New function.
(Relobj::first_dyn_reloc_): New data member.
(Relobj::dyn_reloc_count_): New data member.
(Sized_relobj): Rename Sized_relobj_base to this; adjust all
references.
(Sized_relobj::Address): New typedef.
(Sized_relobj::invalid_address): Move here from child class.
(Sized_relobj::Sized_relobj): Initialize new data members.
(Sized_relobj::sized_relobj): New function.
(Sized_relobj::is_output_section_offset_invalid): Move here from
child class.
(Sized_relobj::get_output_section_offset): Likewise.
(Sized_relobj::local_has_got_offset): Likewise.
(Sized_relobj::local_got_offset): Likewise.
(Sized_relobj::set_local_got_offset): Likewise.
(Sized_relobj::do_for_all_local_got_entries): Likewise.
(Sized_relobj::clear_got_offsets): New function.
(Sized_relobj::section_offsets): Move here from child class.
(Sized_relobj::do_output_section_offset): Likewise.
(Sized_relobj::do_set_section_offset): Likewise.
(Sized_relobj::Local_got_offsets): Likewise.
(Sized_relobj::local_got_offsets_): Likewise.
(Sized_relobj::section_offsets_): Likewise.
(Sized_relobj_file): Rename Sized_relobj to this; adjust all
references.
(Sized_relobj_file::is_output_section_offset_invalid): Move to base
class.
(Sized_relobj_file::sized_relobj): New function
(Sized_relobj_file::local_has_got_offset): Move to base class.
(Sized_relobj_file::local_got_offset): Likewise.
(Sized_relobj_file::set_local_got_offset): Likewise.
(Sized_relobj_file::get_output_section_offset): Likewise.
(Sized_relobj_file::do_for_all_local_got_entries): Likewise.
(Sized_relobj_file::do_output_section_offset): Likewise.
(Sized_relobj_file::do_set_section_offset): Likewise.
(Sized_relobj_file::Local_got_offsets): Likewise.
(Sized_relobj_file::local_got_offsets_): Likewise.
(Sized_relobj_file::section_offsets_): Likewise.
* output.cc (Output_reloc::Output_reloc): Adjust type of relobj
(all constructors).
(set_needs_dynsym_index): Convert relobj to derived class pointer.
(Output_reloc::get_symbol_index): Likewise.
(Output_reloc::local_section_offset): Likewise.
(Output_reloc::get_address): Likewise.
(Output_reloc::symbol_value): Likewise.
(Output_data_got::reserve_slot): Move to class definition.
(Output_data_got::reserve_local): New function.
(Output_data_got::reserve_slot_for_global): Remove.
(Output_data_got::reserve_global): New function.
* output.h (Output_reloc::Output_reloc): Adjust type of relobj
(all constructors, two instantiations).
(Output_reloc::get_relobj): New function (two instantiations).
(Output_reloc::u1_.relobj, Output_reloc::u2_.relobj): Adjust type.
(Output_data_reloc_base::add): Convert relobj to derived class pointer.
(Output_data_reloc::add_global): Adjust type of relobj.
(Output_data_reloc::add_global_relative): Likewise.
(Output_data_reloc::add_symbolless_global_addend): Likewise.
(Output_data_reloc::add_local): Likewise.
(Output_data_reloc::add_local_relative): Likewise.
(Output_data_reloc::add_symbolless_local_addend): Likewise.
(Output_data_reloc::add_local_section): Likewise.
(Output_data_reloc::add_output_section): Likewise.
(Output_data_reloc::add_absolute): Likewise.
(Output_data_reloc::add_target_specific): Likewise.
(Output_data_got::reserve_slot): Move definition here.
(Output_data_got::reserve_local): New function.
(Output_data_got::reserve_global): New function.
* reloc.cc (Sized_relobj_file::do_read_relocs): Replace refs to
section_offsets_ with accessor function.
(Sized_relobj_file::write_sections): Likewise.
(Sized_relobj_file::do_relocate_sections): Likewise.
* target.h (Sized_target::reserve_local_got_entry): New function.
(Sized_target::reserve_global_got_entry): New function.
* x86_64.cc (Target_x86_64::reserve_local_got_entry): New function.
(Target_x86_64::reserve_global_got_entry): New function.
(Target_x86_64::init_got_plt_for_update): Create rela_dyn section.
Diffstat (limited to 'gold/powerpc.cc')
-rw-r--r-- | gold/powerpc.cc | 77 |
1 files changed, 39 insertions, 38 deletions
diff --git a/gold/powerpc.cc b/gold/powerpc.cc index 661477a..c113bd2 100644 --- a/gold/powerpc.cc +++ b/gold/powerpc.cc @@ -67,7 +67,7 @@ class Target_powerpc : public Sized_target<size, big_endian> void gc_process_relocs(Symbol_table* symtab, Layout* layout, - Sized_relobj<size, big_endian>* object, + Sized_relobj_file<size, big_endian>* object, unsigned int data_shndx, unsigned int sh_type, const unsigned char* prelocs, @@ -81,7 +81,7 @@ class Target_powerpc : public Sized_target<size, big_endian> void scan_relocs(Symbol_table* symtab, Layout* layout, - Sized_relobj<size, big_endian>* object, + Sized_relobj_file<size, big_endian>* object, unsigned int data_shndx, unsigned int sh_type, const unsigned char* prelocs, @@ -116,7 +116,7 @@ class Target_powerpc : public Sized_target<size, big_endian> void scan_relocatable_relocs(Symbol_table* symtab, Layout* layout, - Sized_relobj<size, big_endian>* object, + Sized_relobj_file<size, big_endian>* object, unsigned int data_shndx, unsigned int sh_type, const unsigned char* prelocs, @@ -193,7 +193,7 @@ class Target_powerpc : public Sized_target<size, big_endian> inline void local(Symbol_table* symtab, Layout* layout, Target_powerpc* target, - Sized_relobj<size, big_endian>* object, + Sized_relobj_file<size, big_endian>* object, unsigned int data_shndx, Output_section* output_section, const elfcpp::Rela<size, big_endian>& reloc, unsigned int r_type, @@ -201,7 +201,7 @@ class Target_powerpc : public Sized_target<size, big_endian> inline void global(Symbol_table* symtab, Layout* layout, Target_powerpc* target, - Sized_relobj<size, big_endian>* object, + Sized_relobj_file<size, big_endian>* object, unsigned int data_shndx, Output_section* output_section, const elfcpp::Rela<size, big_endian>& reloc, unsigned int r_type, @@ -210,7 +210,7 @@ class Target_powerpc : public Sized_target<size, big_endian> inline bool local_reloc_may_be_function_pointer(Symbol_table* , Layout* , Target_powerpc* , - Sized_relobj<size, big_endian>* , + Sized_relobj_file<size, big_endian>* , unsigned int , Output_section* , const elfcpp::Rela<size, big_endian>& , @@ -221,7 +221,7 @@ class Target_powerpc : public Sized_target<size, big_endian> inline bool global_reloc_may_be_function_pointer(Symbol_table* , Layout* , Target_powerpc* , - Sized_relobj<size, big_endian>* , + Sized_relobj_file<size, big_endian>* , unsigned int , Output_section* , const elfcpp::Rela<size, @@ -231,11 +231,11 @@ class Target_powerpc : public Sized_target<size, big_endian> private: static void - unsupported_reloc_local(Sized_relobj<size, big_endian>*, + unsupported_reloc_local(Sized_relobj_file<size, big_endian>*, unsigned int r_type); static void - unsupported_reloc_global(Sized_relobj<size, big_endian>*, + unsupported_reloc_global(Sized_relobj_file<size, big_endian>*, unsigned int r_type, Symbol*); static void @@ -313,7 +313,7 @@ class Target_powerpc : public Sized_target<size, big_endian> // Create a GOT entry for the TLS module index. unsigned int got_mod_index_entry(Symbol_table* symtab, Layout* layout, - Sized_relobj<size, big_endian>* object); + Sized_relobj_file<size, big_endian>* object); // Get the PLT section. const Output_data_plt_powerpc<size, big_endian>* @@ -330,7 +330,7 @@ class Target_powerpc : public Sized_target<size, big_endian> // Copy a relocation against a global symbol. void copy_reloc(Symbol_table* symtab, Layout* layout, - Sized_relobj<size, big_endian>* object, + Sized_relobj_file<size, big_endian>* object, unsigned int shndx, Output_section* output_section, Symbol* sym, const elfcpp::Rela<size, big_endian>& reloc) { @@ -496,7 +496,7 @@ private: rela(unsigned char* view, unsigned int right_shift, elfcpp::Elf_Xword dst_mask, - const Sized_relobj<size, big_endian>* object, + const Sized_relobj_file<size, big_endian>* object, const Symbol_value<size>* psymval, typename elfcpp::Swap<valsize, big_endian>::Valtype addend) { @@ -517,7 +517,7 @@ private: static inline void rela_ua(unsigned char* view, unsigned int right_shift, elfcpp::Elf_Xword dst_mask, - const Sized_relobj<size, big_endian>* object, + const Sized_relobj_file<size, big_endian>* object, const Symbol_value<size>* psymval, typename elfcpp::Swap<size, big_endian>::Valtype addend) { @@ -539,7 +539,7 @@ private: static inline void pcrela(unsigned char* view, unsigned int right_shift, elfcpp::Elf_Xword dst_mask, - const Sized_relobj<size, big_endian>* object, + const Sized_relobj_file<size, big_endian>* object, const Symbol_value<size>* psymval, typename elfcpp::Swap<size, big_endian>::Valtype addend, typename elfcpp::Elf_types<size>::Elf_Addr address) @@ -559,7 +559,7 @@ private: template<int valsize> static inline void pcrela_unaligned(unsigned char* view, - const Sized_relobj<size, big_endian>* object, + const Sized_relobj_file<size, big_endian>* object, const Symbol_value<size>* psymval, typename elfcpp::Swap<size, big_endian>::Valtype addend, typename elfcpp::Elf_types<size>::Elf_Addr address) @@ -578,7 +578,7 @@ public: // R_POWERPC_REL32: (Symbol + Addend - Address) static inline void rel32(unsigned char* view, - const Sized_relobj<size, big_endian>* object, + const Sized_relobj_file<size, big_endian>* object, const Symbol_value<size>* psymval, typename elfcpp::Elf_types<size>::Elf_Addr addend, typename elfcpp::Elf_types<size>::Elf_Addr address) @@ -587,7 +587,7 @@ public: // R_POWERPC_REL24: (Symbol + Addend - Address) & 0x3fffffc static inline void rel24(unsigned char* view, - const Sized_relobj<size, big_endian>* object, + const Sized_relobj_file<size, big_endian>* object, const Symbol_value<size>* psymval, typename elfcpp::Elf_types<size>::Elf_Addr addend, typename elfcpp::Elf_types<size>::Elf_Addr address) @@ -599,7 +599,7 @@ public: // R_POWERPC_REL14: (Symbol + Addend - Address) & 0xfffc static inline void rel14(unsigned char* view, - const Sized_relobj<size, big_endian>* object, + const Sized_relobj_file<size, big_endian>* object, const Symbol_value<size>* psymval, typename elfcpp::Elf_types<size>::Elf_Addr addend, typename elfcpp::Elf_types<size>::Elf_Addr address) @@ -617,7 +617,7 @@ public: static inline void addr16(unsigned char* view, - const Sized_relobj<size, big_endian>* object, + const Sized_relobj_file<size, big_endian>* object, const Symbol_value<size>* psymval, typename elfcpp::Elf_types<size>::Elf_Addr addend) { This_reloc::rela16(view, object, psymval, addend); } @@ -640,7 +640,7 @@ public: static inline void addr16_lo(unsigned char* view, - const Sized_relobj<size, big_endian>* object, + const Sized_relobj_file<size, big_endian>* object, const Symbol_value<size>* psymval, typename elfcpp::Elf_types<size>::Elf_Addr addend) { This_reloc::rela16(view, object, psymval, addend); } @@ -656,7 +656,7 @@ public: static inline void addr16_hi(unsigned char* view, - const Sized_relobj<size, big_endian>* object, + const Sized_relobj_file<size, big_endian>* object, const Symbol_value<size>* psymval, typename elfcpp::Elf_types<size>::Elf_Addr addend) { @@ -684,7 +684,7 @@ public: static inline void addr16_ha(unsigned char* view, - const Sized_relobj<size, big_endian>* object, + const Sized_relobj_file<size, big_endian>* object, const Symbol_value<size>* psymval, typename elfcpp::Elf_types<size>::Elf_Addr addend) { @@ -702,7 +702,7 @@ public: // R_PPC_REL16: (Symbol + Addend - Address) & 0xffff static inline void rel16(unsigned char* view, - const Sized_relobj<size, big_endian>* object, + const Sized_relobj_file<size, big_endian>* object, const Symbol_value<size>* psymval, typename elfcpp::Elf_types<size>::Elf_Addr addend, typename elfcpp::Elf_types<size>::Elf_Addr address) @@ -711,7 +711,7 @@ public: // R_PPC_REL16_LO: (Symbol + Addend - Address) & 0xffff static inline void rel16_lo(unsigned char* view, - const Sized_relobj<size, big_endian>* object, + const Sized_relobj_file<size, big_endian>* object, const Symbol_value<size>* psymval, typename elfcpp::Elf_types<size>::Elf_Addr addend, typename elfcpp::Elf_types<size>::Elf_Addr address) @@ -720,7 +720,7 @@ public: // R_PPC_REL16_HI: ((Symbol + Addend - Address) >> 16) & 0xffff static inline void rel16_hi(unsigned char* view, - const Sized_relobj<size, big_endian>* object, + const Sized_relobj_file<size, big_endian>* object, const Symbol_value<size>* psymval, typename elfcpp::Elf_types<size>::Elf_Addr addend, typename elfcpp::Elf_types<size>::Elf_Addr address) @@ -734,7 +734,7 @@ public: // relocation is negative, add one. static inline void rel16_ha(unsigned char* view, - const Sized_relobj<size, big_endian>* object, + const Sized_relobj_file<size, big_endian>* object, const Symbol_value<size>* psymval, typename elfcpp::Elf_types<size>::Elf_Addr addend, typename elfcpp::Elf_types<size>::Elf_Addr address) @@ -1068,9 +1068,10 @@ Target_powerpc<size, big_endian>::plt_entry_size() const template<int size, bool big_endian> unsigned int -Target_powerpc<size, big_endian>::got_mod_index_entry(Symbol_table* symtab, - Layout* layout, - Sized_relobj<size, big_endian>* object) +Target_powerpc<size, big_endian>::got_mod_index_entry( + Symbol_table* symtab, + Layout* layout, + Sized_relobj_file<size, big_endian>* object) { if (this->got_mod_index_offset_ == -1U) { @@ -1176,7 +1177,7 @@ Target_powerpc<size, big_endian>::Scan::get_reference_flags( template<int size, bool big_endian> void Target_powerpc<size, big_endian>::Scan::unsupported_reloc_local( - Sized_relobj<size, big_endian>* object, + Sized_relobj_file<size, big_endian>* object, unsigned int r_type) { gold_error(_("%s: unsupported reloc %u against local symbol"), @@ -1284,7 +1285,7 @@ Target_powerpc<size, big_endian>::Scan::local( Symbol_table* symtab, Layout* layout, Target_powerpc<size, big_endian>* target, - Sized_relobj<size, big_endian>* object, + Sized_relobj_file<size, big_endian>* object, unsigned int data_shndx, Output_section* output_section, const elfcpp::Rela<size, big_endian>& reloc, @@ -1402,7 +1403,7 @@ Target_powerpc<size, big_endian>::Scan::local( template<int size, bool big_endian> void Target_powerpc<size, big_endian>::Scan::unsupported_reloc_global( - Sized_relobj<size, big_endian>* object, + Sized_relobj_file<size, big_endian>* object, unsigned int r_type, Symbol* gsym) { @@ -1418,7 +1419,7 @@ Target_powerpc<size, big_endian>::Scan::global( Symbol_table* symtab, Layout* layout, Target_powerpc<size, big_endian>* target, - Sized_relobj<size, big_endian>* object, + Sized_relobj_file<size, big_endian>* object, unsigned int data_shndx, Output_section* output_section, const elfcpp::Rela<size, big_endian>& reloc, @@ -1609,7 +1610,7 @@ void Target_powerpc<size, big_endian>::gc_process_relocs( Symbol_table* symtab, Layout* layout, - Sized_relobj<size, big_endian>* object, + Sized_relobj_file<size, big_endian>* object, unsigned int data_shndx, unsigned int, const unsigned char* prelocs, @@ -1644,7 +1645,7 @@ void Target_powerpc<size, big_endian>::scan_relocs( Symbol_table* symtab, Layout* layout, - Sized_relobj<size, big_endian>* object, + Sized_relobj_file<size, big_endian>* object, unsigned int data_shndx, unsigned int sh_type, const unsigned char* prelocs, @@ -1756,7 +1757,7 @@ Target_powerpc<size, big_endian>::Relocate::relocate( psymval = &symval; } - const Sized_relobj<size, big_endian>* object = relinfo->object; + const Sized_relobj_file<size, big_endian>* object = relinfo->object; elfcpp::Elf_Xword addend = rela.get_r_addend(); // Get the GOT offset if needed. Unlike i386 and x86_64, our GOT @@ -1959,7 +1960,7 @@ Target_powerpc<size, big_endian>::Relocate::relocate_tls( { Output_segment* tls_segment = relinfo->layout->tls_segment(); typedef Powerpc_relocate_functions<size, big_endian> Reloc; - const Sized_relobj<size, big_endian>* object = relinfo->object; + const Sized_relobj_file<size, big_endian>* object = relinfo->object; const elfcpp::Elf_Xword addend = rela.get_r_addend(); typename elfcpp::Elf_types<size>::Elf_Addr value = psymval->value(object, 0); @@ -2033,7 +2034,7 @@ void Target_powerpc<size, big_endian>::scan_relocatable_relocs( Symbol_table* symtab, Layout* layout, - Sized_relobj<size, big_endian>* object, + Sized_relobj_file<size, big_endian>* object, unsigned int data_shndx, unsigned int sh_type, const unsigned char* prelocs, |