[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.

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 0b751b571b788c887d236bca12b339a8cc46f3cf..2fd3038510f4f14cccbb949196a14d5de3e10506 100644 (file)
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -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.

diff --git a/gold/powerpc.cc b/gold/powerpc.cc
index 1f2bc9ede798de03a647c91cd8b10e6268c0a0b6..a448efbc9440608aa847ae03a9c0f89944f1a3f9 100644 (file)
--- a/gold/powerpc.cc
+++ b/gold/powerpc.cc
@@ -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);