Commit: 4790d4b3cef58c4663f8b63bb1761e8494d323f5 - binutils_os216 (git)

GNU Binutils with patches for OS216

Commit MetaInfo

• Revision: 4790d4b3cef58c4663f8b63bb1761e8494d323f5 (tree)
• Zeit: 2017-02-22 08:10:22
• Autor: Alan Modra <amodra@gmai...>
• Commiter: Alan Modra

Log Message

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

Ändern Zusammenfassung

• modified: gold/ChangeLog
• modified: gold/powerpc.cc

Diff

--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -2,6 +2,10 @@
 
 	Apply from master
 	2016-12-08  Alan Modra  <[e-mail]>
+	* powerpc.cc (Powerpc_relobj::stub_table): Return NULL rather
+	then asserting.
+
+	2016-12-08  Alan Modra  <[e-mail]>
 	* options.h (--stub-group-multi): Fix typo.
 
 	2016-12-07  Alan Modra  <[e-mail]>

--- 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;
   }