From: Alan Modra <amodra@gmail.com>
Date: Thu, 8 Dec 2016 05:38:29 +0000 (+1030)
Subject: [GOLD] Don't assert in powerpc stub_table
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4790d4b3cef58c4663f8b63bb1761e8494d323f5;p=thirdparty%2Fbinutils-gdb.git

[GOLD] Don't assert in powerpc stub_table

A branch in a non-exec section that needs a stub can lead to this
assertion.

	* powerpc.cc (Powerpc_relobj::stub_table): Return NULL rather
	then asserting.
---

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 1fe7d03fdb9..65c62771507 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,6 +1,10 @@
 2017-02-22  Alan Modra  <amodra@gmail.com>
 
 	Apply from master
+	2016-12-08  Alan Modra  <amodra@gmail.com>
+	* powerpc.cc (Powerpc_relobj::stub_table): Return NULL rather
+	then asserting.
+
 	2016-12-08  Alan Modra  <amodra@gmail.com>
 	* options.h (--stub-group-multi): Fix typo.
 
diff --git a/gold/powerpc.cc b/gold/powerpc.cc
index 7d4a384ad8b..4d9e66911f2 100644
--- a/gold/powerpc.cc
+++ b/gold/powerpc.cc
@@ -292,8 +292,8 @@ public:
 	  = static_cast<Target_powerpc<size, big_endian>*>(
 	      parameters->sized_target<size, big_endian>());
 	unsigned int indx = this->stub_table_index_[shndx];
-	gold_assert(indx < target->stub_tables().size());
-	return target->stub_tables()[indx];
+	if (indx < target->stub_tables().size())
+	  return target->stub_tables()[indx];
       }
     return NULL;
   }