From: Alan Modra <amodra@gmail.com>
Date: Thu, 22 Jan 2015 02:09:50 +0000 (+1030)
Subject: [GOLD] Correct powerpc64 ifunc plt entry test
X-Git-Tag: binutils-2_25_1~225
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=12c11e3a86a56fe7ecc8fea7e14295e3e2b48464;p=thirdparty%2Fbinutils-gdb.git

[GOLD] Correct powerpc64 ifunc plt entry test

Found when attempting to build an ELFv2 Linux kernel.  We don't
generally need a plt entry for ELFv2 got relocs, only on ifunc, just
like ppc32.

	* powerpc.cc (Target_powerpc::Scan::local <got relocs>): Correct
	condition for need of ifunc plt entry.
	(Target_powerpc::Scan::global <got relocs>): Likewise.
---

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 5acec31ffa5..b7b2d9a78e6 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,6 +1,11 @@
 2015-02-11  Alan Modra  <amodra@gmail.com>
 
 	Apply from master
+	2015-01-22  Alan Modra  <amodra@gmail.com>
+	* powerpc.cc (Target_powerpc::Scan::local <got relocs>): Correct
+	condition for need of ifunc plt entry.
+	(Target_powerpc::Scan::global <got relocs>): Likewise.
+
 	2014-12-22  Cary Coutant  <ccoutant@google.com>
 	* powerpc.cc (Target_powerpc::relocate): Fix overflow check.
 
diff --git a/gold/powerpc.cc b/gold/powerpc.cc
index d093c9df898..707acda8b67 100644
--- a/gold/powerpc.cc
+++ b/gold/powerpc.cc
@@ -5584,8 +5584,8 @@ Target_powerpc<size, big_endian>::Scan::local(
 
 	if (!parameters->options().output_is_position_independent())
 	  {
-	    if ((size == 32 && is_ifunc)
-		|| (size == 64 && target->abiversion() >= 2))
+	    if (is_ifunc
+		&& (size == 32 || target->abiversion() >= 2))
 	      got->add_local_plt(object, r_sym, GOT_TYPE_STANDARD);
 	    else
 	      got->add_local(object, r_sym, GOT_TYPE_STANDARD);
@@ -6032,8 +6032,8 @@ Target_powerpc<size, big_endian>::Scan::global(
 	got = target->got_section(symtab, layout);
 	if (gsym->final_value_is_known())
 	  {
-	    if ((size == 32 && is_ifunc)
-		|| (size == 64 && target->abiversion() >= 2))
+	    if (is_ifunc
+		&& (size == 32 || target->abiversion() >= 2))
 	      got->add_global_plt(gsym, GOT_TYPE_STANDARD);
 	    else
 	      got->add_global(gsym, GOT_TYPE_STANDARD);