From: Alan Modra <amodra@gmail.com>
Date: Tue, 28 Apr 2015 03:58:29 +0000 (+0930)
Subject: PowerPC gold assertion on missing global entry stub
X-Git-Tag: binutils-2_25_1~72
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=99381983ab1b423b93bfa3f6fbe7115079717255;p=thirdparty%2Fbinutils-gdb.git

PowerPC gold assertion on missing global entry stub

Global entry stubs are used on ELFv2 to provide addresses for
functions not defined in a non-PIC executable but whose address is
taken, in much the same way as PLT stub code is used on other
targets to provide function addresses.  We don't want to insert a
global entry stub just because (bogus) debug info refers to the
address of a non-local function, but we also don't want gold to die.

	* powerpc.cc (Target_powerpc::Relocate::relocate): Don't assert
	on missing global entry stub due to bogus debug info.
---

diff --git a/gold/ChangeLog b/gold/ChangeLog
index b2225e0b085..f554ee86044 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,6 +1,10 @@
 2015-06-05  Alan Modra  <amodra@gmail.com>
 
 	Apply from master
+	2015-04-28  Alan Modra  <amodra@gmail.com>
+	* powerpc.cc (Target_powerpc::Relocate::relocate): Don't assert
+	on missing global entry stub due to bogus debug info.
+
 	2015-03-24  Alan Modra  <amodra@gmail.com>
 	PR 18147
 	* powerpc.cc (Target_powerpc::Relocate::relocate): Don't report
diff --git a/gold/powerpc.cc b/gold/powerpc.cc
index e7f35540138..3766f727b41 100644
--- a/gold/powerpc.cc
+++ b/gold/powerpc.cc
@@ -6748,8 +6748,11 @@ Target_powerpc<size, big_endian>::Relocate::relocate(
 	  && !is_branch_reloc(r_type))
 	{
 	  unsigned int off = target->glink_section()->find_global_entry(gsym);
-	  gold_assert(off != (unsigned int)-1);
-	  value = target->glink_section()->global_entry_address() + off;
+	  if (off != (unsigned int)-1)
+	    {
+	      value = target->glink_section()->global_entry_address() + off;
+	      has_stub_value = true;
+	    }
 	}
       else
 	{
@@ -6771,8 +6774,8 @@ Target_powerpc<size, big_endian>::Relocate::relocate(
 						  rela.get_r_addend());
 	  gold_assert(off != invalid_address);
 	  value = stub_table->stub_address() + off;
+	  has_stub_value = true;
 	}
-      has_stub_value = true;
     }
 
   if (r_type == elfcpp::R_POWERPC_GOT16