Accepting request 102160 from home:a_jaeger:my-factory-packages

Fix relocation ordering to fix ifunc crash (bnc#740109)

OBS-URL: https://build.opensuse.org/request/show/102160
OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=159

glibc.spec

@@ -53,8 +53,14 @@ BuildRequires:  libstdc++-devel
  %define powerpc_optimize_cpu_power7 0
  %define powerpc_optimize_cpu_cell 0
 %endif # ppc, ppc64
+%ifarch x86_64
+# 2.6.32 is the SLES 11 SP1 kernel
+# 2.6.34 is the openSUSE 11.3 kernel
+%define enablekernel 2.6.32
+%else
 # 2.6.16 is the SLES 10 kernel, use this as oldest supported kernel
 %define enablekernel 2.6.16
+%endif
 # ngpt was used in 8.1 and SLES8
 Obsoletes:      ngpt < 2.2.2
 Obsoletes:      ngpt-devel < 2.2.2
@@ -194,8 +200,8 @@ Patch88:        pthread-cond-wait-revert.patch
 Patch89:        glibc-2.16-scanf.patch
 # PATCH-FIX-UPSTREAM Fix getcontext on 32-bit powerpc - aj@suse.de
 Patch90:        glibc-ppc-getcontext.patch
-# PATCH-FIX-OPENSUSE Revert some math ifuncs (bnc#740109) - aj@suse.de
-Patch91:        glibc-2.15-math64crash.patch
+# PATCH-FIX-UPSTREAM Fix ifunc relocations (bnc#740109) - aj@suse.de
+Patch91:        glibc-ifunc-2.16.patch
 # PATCH-FIX-OPENSUSE Remove netlink optimization (bnc#741021) - aj@suse.de
 Patch92:        glibc-revert-netlink-cache.patch
 
@@ -539,9 +545,6 @@ PARALLEL="%{?_smp_mflags}"
 	# fails to build otherwise - need to recheck and fix
 	%define enable_stackguard_randomization 0
 %endif
-# Remove completely, these give some strange crashes with dlopen
-# See bnc#740109
-rm -rf sysdeps/x86_64/fpu/multiarch
 
 configure_and_build_glibc() {
 	local dirname="$1"; shift