From 2d4666e46047bf02b9b377f90047968e51dceaab Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Aug 16 2017 09:34:27 +0000
Subject: Use upstream default for multi-arch support


Drop binutils run-time conflict.  If we still want those, they should
be on glibc-devel, not the main package.

---

diff --git a/glibc.spec b/glibc.spec
index c811423..424a970 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -131,14 +131,6 @@
 # will be created for the architecture.
 %define debuginfocommonarches %{biarcharches} alpha alphaev6
 ##############################################################################
-# If the architecture has multiarch support in glibc then it should be listed
-# here to enable support in the build. Multiarch support is a single library
-# with implementations of certain functions for multiple architectures. The
-# most optimal function is selected at runtime based on the hardware that is
-# detected by glibc. The underlying support for function selection and
-# execution is provided by STT_GNU_IFUNC.
-%define multiarcharches %{power64} %{ix86} x86_64 %{sparc}
-##############################################################################
 # Add -s for a less verbose build output.
 %define silentrules PARALLELMFLAGS=
 ##############################################################################
@@ -380,29 +372,9 @@ Conflicts: kernel < %{enablekernel}
 %endif
 %endif
 
-%ifarch %{multiarcharches}
-# Need STT_IFUNC support
-%ifarch %{power64}
-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
+BuildRequires: binutils >= 2.25
 # Earlier releases have broken support for IRELATIVE relocations
 Conflicts: prelink < 0.4.2
-%else
-# Need AS_NEEDED directive
-# Need --hash-style=* support
-BuildRequires: binutils >= 2.17.50.0.2-5
-%endif
 
 BuildRequires: gcc >= 3.2.1-5
 %ifarch s390 s390x
@@ -1012,7 +984,7 @@ AddOns=`echo */configure | sed -e 's!/configure!!g;s!\(nptl\|powerpc-cpu\)\( \|$
 #	Build glibc in `build-%{target}$1', passing the rest of the arguments
 #	as CFLAGS to the build (not the same as configure CFLAGS). Several
 #	global values are used to determine build flags, add-ons, kernel
-#	version, multiarch support, system tap support, etc.
+#	version, system tap support, etc.
 ##############################################################################
 build()
 {
@@ -1030,9 +1002,6 @@ build()
 		--enable-add-ons=$AddOns \
 		--with-headers=%{_prefix}/include $EnableKernel --enable-bind-now \
 		--build=%{target} \
-%ifarch %{multiarcharches}
-		--enable-multi-arch \
-%endif
 		--enable-stack-protector=strong \
 		--enable-tunables \
 		--enable-obsolete-rpc \