This is the mail archive of the
binutils-cvs@sourceware.org
mailing list for the binutils project.
[binutils-gdb/binutils-2_25-branch] [GOLD] Correct powerpc64 ifunc plt entry test
- From: Alan Modra <amodra at sourceware dot org>
- To: bfd-cvs at sourceware dot org
- Date: 11 Feb 2015 12:54:46 -0000
- Subject: [binutils-gdb/binutils-2_25-branch] [GOLD] Correct powerpc64 ifunc plt entry test
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=12c11e3a86a56fe7ecc8fea7e14295e3e2b48464
commit 12c11e3a86a56fe7ecc8fea7e14295e3e2b48464
Author: Alan Modra <amodra@gmail.com>
Date: Thu Jan 22 12:39:50 2015 +1030
[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:
---
gold/ChangeLog | 5 +++++
gold/powerpc.cc | 8 ++++----
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/gold/ChangeLog b/gold/ChangeLog
index 5acec31..b7b2d9a 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 d093c9d..707acda 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);