diff options
| author | Alan Modra <amodra@gmail.com> | 2012-10-05 00:45:54 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2012-10-05 00:45:54 +0000 |
| commit | 19fec8c1d313c6757a53dc7f09776dc9770ee2ef (patch) | |
| tree | e330d3c2414ede0d1e0b37e4bb238811cc6c11e3 /gold/i386.cc | |
| parent | fda1189bbcdf6b9c384bf5befee3e3ff6e647711 (diff) | |
| download | binutils-gdb-19fec8c1d313c6757a53dc7f09776dc9770ee2ef.tar.gz | |
* i386.cc (Output_data_plt_i386::address_for_global,
address_for_local): Add plt offset to returned value. Adjust uses.
* sparc.cc (Output_data_plt_sparc::address_for_global,
address_for_local): Likewise.
* tilegx.cc (Output_data_plt_tilegx::address_for_global,
address_for_local): Likewise.
* x86_64.cc (Output_data_plt_x86_64::address_for_global,
address_for_local): Likewise.
* target.h (Target::plt_address_for_global, plt_address_for_local):
Update comment.
* output.cc (Output_reloc::symbol_value): Don't add plt offset here.
(Output_data_got::Got_entry::write): Nor here.
* output.h: Comment fix.
Diffstat (limited to 'gold/i386.cc')
| -rw-r--r-- | gold/i386.cc | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/gold/i386.cc b/gold/i386.cc index 47779d0e8cd..9c52e93166e 100644 --- a/gold/i386.cc +++ b/gold/i386.cc @@ -1151,16 +1151,19 @@ Output_data_plt_i386::address_for_global(const Symbol* gsym) if (gsym->type() == elfcpp::STT_GNU_IFUNC && gsym->can_use_relative_reloc(false)) offset = (this->count_ + 1) * this->get_plt_entry_size(); - return this->address() + offset; + return this->address() + offset + gsym->plt_offset(); } // Return the PLT address to use for a local symbol. These are always // IRELATIVE relocs. uint64_t -Output_data_plt_i386::address_for_local(const Relobj*, unsigned int) +Output_data_plt_i386::address_for_local(const Relobj* object, + unsigned int r_sym) { - return this->address() + (this->count_ + 1) * this->get_plt_entry_size(); + return (this->address() + + (this->count_ + 1) * this->get_plt_entry_size() + + object->local_plt_offset(r_sym)); } // The first entry in the PLT for an executable. @@ -2677,8 +2680,7 @@ Target_i386::Relocate::relocate(const Relocate_info<32, false>* relinfo, else if (gsym != NULL && gsym->use_plt_offset(Scan::get_reference_flags(r_type))) { - symval.set_output_value(target->plt_address_for_global(gsym) - + gsym->plt_offset()); + symval.set_output_value(target->plt_address_for_global(gsym)); psymval = &symval; } else if (gsym == NULL && psymval->is_ifunc_symbol()) @@ -2686,8 +2688,7 @@ Target_i386::Relocate::relocate(const Relocate_info<32, false>* relinfo, unsigned int r_sym = elfcpp::elf_r_sym<32>(rel.get_r_info()); if (object->local_has_plt_offset(r_sym)) { - symval.set_output_value(target->plt_address_for_local(object, r_sym) - + object->local_plt_offset(r_sym)); + symval.set_output_value(target->plt_address_for_local(object, r_sym)); psymval = &symval; } } @@ -3649,7 +3650,7 @@ uint64_t Target_i386::do_dynsym_value(const Symbol* gsym) const { gold_assert(gsym->is_from_dynobj() && gsym->has_plt_offset()); - return this->plt_address_for_global(gsym) + gsym->plt_offset(); + return this->plt_address_for_global(gsym); } // Return a string used to fill a code section with nops to take up |