From 980d0cdd2fc40c30f3ddef644659d7d0dc00ed40 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Thu, 8 Dec 2016 16:08:29 +1030 Subject: [PATCH] [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. --- gold/ChangeLog | 5 +++++ gold/powerpc.cc | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gold/ChangeLog b/gold/ChangeLog index 8b999092946..38fd9eab548 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,8 @@ +2016-12-08 Alan Modra + + * powerpc.cc (Powerpc_relobj::stub_table): Return NULL rather + then asserting. + 2016-12-08 Alan Modra * options.h (--stub-group-multi): Fix typo. diff --git a/gold/powerpc.cc b/gold/powerpc.cc index 068f5ca602a..87cb8bc9fab 100644 --- a/gold/powerpc.cc +++ b/gold/powerpc.cc @@ -292,8 +292,8 @@ public: = static_cast*>( parameters->sized_target()); 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; } -- 2.30.2