From 8260f49e839eb9b445d586f4be2da04a1196f057 Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Dec 11 2017 12:25:56 +0000
Subject: Do not enable relro by default for the PowerPC64 architecture.

Relates: #1523946

---

diff --git a/binutils.spec b/binutils.spec
index a4bccf4..ce9ee28 100644
--- a/binutils.spec
+++ b/binutils.spec
@@ -54,7 +54,7 @@
 Summary: A GNU collection of binary utilities
 Name: %{?cross}binutils%{?_with_debug:-debug}
 Version: 2.29.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv3+
 Group: Development/Tools
 URL: http://sources.redhat.com/binutils
@@ -149,12 +149,12 @@ Provides: bundled(libiberty)
 %define gold_arches %ix86 x86_64 %arm aarch64 %{power64} s390x
 
 %if %{with bootstrap}
-%define build_gold	no
+%define build_gold      no
 %else
 %ifarch %gold_arches
-%define build_gold	both
+%define build_gold      both
 %else
-%define build_gold	no
+%define build_gold      no
 %endif
 %endif
 
@@ -201,8 +201,8 @@ BuildRequires: libstdc++-static
 Conflicts: gcc-c++ < 4.0.0
 
 # The higher of these two numbers determines the default ld.
-%{!?ld_bfd_priority: %global ld_bfd_priority	50}
-%{!?ld_gold_priority:%global ld_gold_priority	30}
+%{!?ld_bfd_priority: %global ld_bfd_priority    50}
+%{!?ld_gold_priority:%global ld_gold_priority   30}
 
 %if "%{build_gold}" == "both"
 Requires(post): coreutils
@@ -274,6 +274,7 @@ using libelf instead of BFD.
 %patch08 -p1
 %patch09 -p1
 %patch10 -p1
+%patch11 -p1
 
 # We cannot run autotools as there is an exact requirement of autoconf-2.59.
 
@@ -354,6 +355,20 @@ case %{binutils_target} in x86_64*|i?86*|arm*|aarch64*)
   ;;
 esac
 
+%if %{default_relro}
+# BZ 1523946: PowerPC64 is not ready for relro.
+case %{binutils_target} in
+    ppc64*)
+        CARGS="$CARGS --enable-relro=no"
+        ;;
+    *)
+        CARGS="$CARGS --enable-relro=yes"
+        ;;
+esac
+%else
+        CARGS="$CARGS --enable-relro=no"
+%endif
+
 %if 0%{?_with_debug:1}
 CFLAGS="$CFLAGS -O0 -ggdb2 -Wno-error -D_FORTIFY_SOURCE=0"
 %define enable_shared 0
@@ -397,11 +412,6 @@ CFLAGS="$CFLAGS -O0 -ggdb2 -Wno-error -D_FORTIFY_SOURCE=0"
 %else
   --enable-compressed-debug-sections=none \
 %endif
-%if %{default_relro}
-  --enable-relro=yes \
-%else
-  --enable-relro=no \
-%endif
   $CARGS \
   --enable-plugins \
   --with-bugurl=http://bugzilla.redhat.com/bugzilla/
@@ -673,6 +683,9 @@ exit 0
 
 #----------------------------------------------------------------------------
 %changelog
+* Mon Dec 11 2017 Nick Clifton  <nickc@redhat.com> 2.29.1-8
+- Do not enable relro by default for the PowerPC64 architecture.  (#1523946)
+
 * Thu Dec 07 2017 Nick Clifton  <nickc@redhat.com> 2.29.1-7
 - Stop strip from crashing when deleteing relocs in a file with annobin notes.  (#1520805)