mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2024-12-09 04:21:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

[GOLD] Avoid duplicate PLT stub symbols on ppc32

Browse Source 
If two objects are compiled with -fPIC or -fPIE and call the same
function, two different PLT entries are created, one for each object,
but the same stub symbol name is used for both.

	* powerpc.cc (Stub_table::define_stub_syms): Always include object's
	uniq_ value.
This commit is contained in:
James Clarke 2017-06-20 18:01:52 +09:30 committed by Alan Modra
parent abfa390dac
commit 94de2a2c57
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gold/ChangeLog
View File

@ -1,3 +1,8 @@
2017-06-20 James Clarke <jrtc27@jrtc27.com>
* powerpc.cc (Stub_table::define_stub_syms): Always include object's
uniq_ value.
2017-06-15 Eric Christopher <echristo@gmail.com>
* aarch64.cc: Fix a few typos and grammar-os.

18
gold/powerpc.cc
View File

@ -4656,19 +4656,25 @@ Stub_table<size, big_endian>::define_stub_syms(Symbol_table* symtab)
add[0] = 0;
if (cs->first.addend_ != 0)
sprintf(add, "+%x", static_cast<uint32_t>(cs->first.addend_));
char localname[18];
const char *symname;
if (cs->first.sym_ == NULL)
char obj[10];
obj[0] = 0;
if (cs->first.object_)
{
const Powerpc_relobj<size, big_endian>* ppcobj = static_cast
<const Powerpc_relobj<size, big_endian>*>(cs->first.object_);
sprintf(localname, "%x:%x", ppcobj->uniq(), cs->first.locsym_);
sprintf(obj, "%x:", ppcobj->uniq());
}
char localname[9];
const char *symname;
if (cs->first.sym_ == NULL)
{
sprintf(localname, "%x", cs->first.locsym_);
symname = localname;
}
else
symname = cs->first.sym_->name();
char* name = new char[8 + 10 + strlen(symname) + strlen(add) + 1];
sprintf(name, "%08x.plt_call.%s%s", this->uniq_, symname, add);
char* name = new char[8 + 10 + strlen(obj) + strlen(symname) + strlen(add) + 1];
sprintf(name, "%08x.plt_call.%s%s%s", this->uniq_, obj, symname, add);
Address value = this->stub_address() - this->address() + cs->second;
unsigned int stub_size = this->plt_call_size(cs);
this->targ_->define_local(symtab, name, this, value, stub_size);