[glibc/f20] Resolves: #804768 - Require specific binutils, or later, for s390/s390x support.

[Patsy Franklin]

commit fda0a1a26c2601cf72b6ff87b20abb79529e5a02
Author: Patsy Franklin <pfrankli at redhat.com>
Date:   Wed Sep 18 14:36:07 2013 -0400

    Resolves: #804768
    - Require specific binutils, or later, for s390/s390x support.

 glibc.spec |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)
---
diff --git a/glibc.spec b/glibc.spec
index 305a726..41ed673 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,6 +1,6 @@
 %define glibcsrcdir glibc-2.18
 %define glibcversion 2.18
-%define glibcrelease 7%{?dist}
+%define glibcrelease 8%{?dist}
 # Pre-release tarballs are pulled in from git using a command that is
 # effectively:
 #
@@ -280,9 +280,16 @@ Conflicts: kernel < %{enablekernel}
 BuildRequires: binutils >= 2.20.51.0.2
 Conflicts: binutils < 2.20.51.0.2
 %else
+%ifarch s390 s390x
+# Needed for STT_GNU_IFUNC support for s390/390x
+BuildRequires: binutils >= 2.23.52.0.1-8
+Conflicts: binutils < 2.23.52.0.1-8
+%else
+# Default to this version
 BuildRequires: binutils >= 2.19.51.0.10
 Conflicts: binutils < 2.19.51.0.10
 %endif
+%endif
 # Earlier releases have broken support for IRELATIVE relocations
 Conflicts: prelink < 0.4.2
 %else
@@ -1630,6 +1637,9 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Wed Sep 18 2013 Patsy Franklin <pfrankli at redhat.com> - 2.18-8
+- Fix conditional requiring specific binutils for s390/s390x.
+
 * Mon Sep 16 2013 Siddhesh Poyarekar <siddhesh at redhat.com> - 2.18-7
 - Fix integer overflows in *valloc and memalign (CVE-2013-4332, #1008299).