OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* powerpc.cc (Output_data_plt_powerpc::add_entry, add_ifunc_entry,

Browse Source 
add_local_ifunc_entry): Revert last change.
	(Target_powerpc::make_plt_entry, make_local_ifunc_plt_entry): Likewise.
This commit is contained in:
Alan Modra 2012-10-12 09:39:19 +00:00
parent 8733202903
commit 03e25981b6
2 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gold/ChangeLog
View File

@ -1,3 +1,9 @@
2012-10-12 Alan Modra <amodra@gmail.com>
* powerpc.cc (Output_data_plt_powerpc::add_entry, add_ifunc_entry,
add_local_ifunc_entry): Revert last change.
(Target_powerpc::make_plt_entry, make_local_ifunc_plt_entry): Likewise.
2012-10-05 Alan Modra <amodra@gmail.com> 2012-10-05 Alan Modra <amodra@gmail.com>
* powerpc.cc (Target_powerpc::do_plt_address_for_local, * powerpc.cc (Target_powerpc::do_plt_address_for_local,

27
gold/powerpc.cc
View File

@ -1544,13 +1544,13 @@ class Output_data_plt_powerpc : public Output_section_data_build
{ } { }
// Add an entry to the PLT. // Add an entry to the PLT.
bool void
add_entry(Symbol*); add_entry(Symbol*);
bool void
add_ifunc_entry(Symbol*); add_ifunc_entry(Symbol*);
bool void
add_local_ifunc_entry(Sized_relobj_file<size, big_endian>*, unsigned int); add_local_ifunc_entry(Sized_relobj_file<size, big_endian>*, unsigned int);
// Return the .rela.plt section data. // Return the .rela.plt section data.
@ -1611,7 +1611,7 @@ class Output_data_plt_powerpc : public Output_section_data_build
// Add an entry to the PLT. // Add an entry to the PLT.
template<int size, bool big_endian> template<int size, bool big_endian>
bool void
Output_data_plt_powerpc<size, big_endian>::add_entry(Symbol* gsym) Output_data_plt_powerpc<size, big_endian>::add_entry(Symbol* gsym)
{ {
if (!gsym->has_plt_offset()) if (!gsym->has_plt_offset())
@ -1625,15 +1625,13 @@ Output_data_plt_powerpc<size, big_endian>::add_entry(Symbol* gsym)
this->rel_->add_global(gsym, dynrel, this, off, 0); this->rel_->add_global(gsym, dynrel, this, off, 0);
off += plt_entry_size; off += plt_entry_size;
this->set_current_data_size(off); this->set_current_data_size(off);
return true;
} }
return false;
} }
// Add an entry for a global ifunc symbol that resolves locally, to the IPLT. // Add an entry for a global ifunc symbol that resolves locally, to the IPLT.
template<int size, bool big_endian> template<int size, bool big_endian>
bool void
Output_data_plt_powerpc<size, big_endian>::add_ifunc_entry(Symbol* gsym) Output_data_plt_powerpc<size, big_endian>::add_ifunc_entry(Symbol* gsym)
{ {
if (!gsym->has_plt_offset()) if (!gsym->has_plt_offset())
@ -1646,15 +1644,13 @@ Output_data_plt_powerpc<size, big_endian>::add_ifunc_entry(Symbol* gsym)
this->rel_->add_symbolless_global_addend(gsym, dynrel, this, off, 0); this->rel_->add_symbolless_global_addend(gsym, dynrel, this, off, 0);
off += plt_entry_size; off += plt_entry_size;
this->set_current_data_size(off); this->set_current_data_size(off);
return true;
} }
return false;
} }
// Add an entry for a local ifunc symbol to the IPLT. // Add an entry for a local ifunc symbol to the IPLT.
template<int size, bool big_endian> template<int size, bool big_endian>
bool void
Output_data_plt_powerpc<size, big_endian>::add_local_ifunc_entry( Output_data_plt_powerpc<size, big_endian>::add_local_ifunc_entry(
Sized_relobj_file<size, big_endian>* relobj, Sized_relobj_file<size, big_endian>* relobj,
unsigned int local_sym_index) unsigned int local_sym_index)
@ -1670,9 +1666,7 @@ Output_data_plt_powerpc<size, big_endian>::add_local_ifunc_entry(
this, off, 0); this, off, 0);
off += plt_entry_size; off += plt_entry_size;
this->set_current_data_size(off); this->set_current_data_size(off);
return true;
} }
return false;
} }
static const uint32_t add_0_11_11 = 0x7c0b5a14; static const uint32_t add_0_11_11 = 0x7c0b5a14;
@ -2430,16 +2424,15 @@ Target_powerpc<size, big_endian>::make_plt_entry(
{ {
if (this->iplt_ == NULL) if (this->iplt_ == NULL)
this->make_iplt_section(layout); this->make_iplt_section(layout);
if (this->iplt_->add_ifunc_entry(gsym)) this->iplt_->add_ifunc_entry(gsym);
this->glink_->add_entry(object, gsym, reloc);
} }
else else
{ {
if (this->plt_ == NULL) if (this->plt_ == NULL)
this->make_plt_section(layout); this->make_plt_section(layout);
if (this->plt_->add_entry(gsym)) this->plt_->add_entry(gsym);
this->glink_->add_entry(object, gsym, reloc);
} }
this->glink_->add_entry(object, gsym, reloc);
} }
// Make a PLT entry for a local STT_GNU_IFUNC symbol. // Make a PLT entry for a local STT_GNU_IFUNC symbol.
@ -2454,7 +2447,7 @@ Target_powerpc<size, big_endian>::make_local_ifunc_plt_entry(
if (this->iplt_ == NULL) if (this->iplt_ == NULL)
this->make_iplt_section(layout); this->make_iplt_section(layout);
unsigned int r_sym = elfcpp::elf_r_sym<size>(reloc.get_r_info()); unsigned int r_sym = elfcpp::elf_r_sym<size>(reloc.get_r_info());
if (this->iplt_->add_local_ifunc_entry(relobj, r_sym)) this->iplt_->add_local_ifunc_entry(relobj, r_sym);
this->glink_->add_entry(relobj, r_sym, reloc); this->glink_->add_entry(relobj, r_sym, reloc);
} }