From f93f25bdce20971a92c2170620b73d920b7b9347 Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Fri, 28 Jul 2017 16:00:10 +0100
Subject: [PATCH] Do not enable the PPC64 plt-localentry0 linker optimization
 by default. Resolves: #1475636

---
 binutils-2.29-ppc64-plt-localentry0-disable.patch | 13 +++++++++++++
 binutils.spec                                     |  9 ++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 binutils-2.29-ppc64-plt-localentry0-disable.patch

diff --git a/binutils-2.29-ppc64-plt-localentry0-disable.patch b/binutils-2.29-ppc64-plt-localentry0-disable.patch
new file mode 100644
index 0000000..020f974
--- /dev/null
+++ b/binutils-2.29-ppc64-plt-localentry0-disable.patch
@@ -0,0 +1,13 @@
+--- binutils.orig/bfd/elf64-ppc.c	2017-07-28 14:39:40.690343665 +0100
++++ binutils-2.29/bfd/elf64-ppc.c	2017-07-28 14:40:08.685021561 +0100
+@@ -8347,9 +8347,7 @@ ppc64_elf_tls_setup (struct bfd_link_inf
+     htab->params->no_multi_toc = 1;
+ 
+   if (htab->params->plt_localentry0 < 0)
+-    htab->params->plt_localentry0
+-      = elf_link_hash_lookup (&htab->elf, "GLIBC_2.26",
+-			      FALSE, FALSE, FALSE) != NULL;
++    htab->params->plt_localentry0 = 0;
+ 
+   htab->tls_get_addr = ((struct ppc_link_hash_entry *)
+ 			elf_link_hash_lookup (&htab->elf, ".__tls_get_addr",
diff --git a/binutils.spec b/binutils.spec
index 9300a6e..ab1265d 100644
--- a/binutils.spec
+++ b/binutils.spec
@@ -43,7 +43,7 @@
 Summary: A GNU collection of binary utilities
 Name: %{?cross}binutils%{?_with_debug:-debug}
 Version: 2.29
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv3+
 Group: Development/Tools
 URL: http://sources.redhat.com/binutils
@@ -78,6 +78,8 @@ Patch12: binutils-2.29-skip-rp14918-test-for-arm.patch
 Patch13: binutils-2.29-filename-in-error-messages.patch
 # Ignore duplicate indirect symbols generated by GOLD.
 Patch14: binutils-2.28-ignore-gold-duplicates.patch
+# Do not enable the PPC64 plt-localentry0 linker optimization by default.
+Patch15: binutils-2.29-ppc64-plt-localentry0-disable.patch
 
 Provides: bundled(libiberty)
 
@@ -211,6 +213,7 @@ using libelf instead of BFD.
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 
 # We cannot run autotools as there is an exact requirement of autoconf-2.59.
 
@@ -577,6 +580,10 @@ exit 0
 %endif # %{isnative}
 
 %changelog
+* Fri Jul 28 2017 Nick Clifton  <nickc@redhat.com> 2.29-3
+- Do not enable the PPC64 plt-localentry0 linker optimization by default.
+  (#1475636)
+
 * Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.29-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild