From 94de2a2c57b7f6b2870f72ecdcacc6d909c6421a Mon Sep 17 00:00:00 2001 From: James Clarke Date: Tue, 20 Jun 2017 18:01:52 +0930 Subject: [PATCH] [GOLD] Avoid duplicate PLT stub symbols on ppc32 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. --- gold/ChangeLog | 5 +++++ gold/powerpc.cc | 18 ++++++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/gold/ChangeLog b/gold/ChangeLog index 0b751b571b7..2fd3038510f 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,8 @@ +2017-06-20 James Clarke + + * powerpc.cc (Stub_table::define_stub_syms): Always include object's + uniq_ value. + 2017-06-15 Eric Christopher * aarch64.cc: Fix a few typos and grammar-os. diff --git a/gold/powerpc.cc b/gold/powerpc.cc index 1f2bc9ede79..a448efbc944 100644 --- a/gold/powerpc.cc +++ b/gold/powerpc.cc @@ -4656,19 +4656,25 @@ Stub_table::define_stub_syms(Symbol_table* symtab) add[0] = 0; if (cs->first.addend_ != 0) sprintf(add, "+%x", static_cast(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* ppcobj = static_cast *>(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); -- 2.30.2