Accepting request 99612 from home:a_jaeger:my-factory-packages
Fix for bnc#740109 OBS-URL: https://build.opensuse.org/request/show/99612 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=152
This commit is contained in:
Andreas Jaeger
Git OBS Bridge
parent
3448a54a31
commit
f702e1f3fa
187
glibc-2.15-math64crash.patch
Normal file
187
glibc-2.15-math64crash.patch
Normal file
@ -0,0 +1,187 @@
|
|||||||
|
The following patch comes from Arch Linux - and is just a workaround
|
||||||
|
until the real problem is fixed.
|
||||||
|
|
||||||
|
diff --git a/sysdeps/x86_64/fpu/multiarch/Makefile b/sysdeps/x86_64/fpu/multiarch/Makefile
|
||||||
|
index be68903..a032da8 100644
|
||||||
|
--- a/sysdeps/x86_64/fpu/multiarch/Makefile
|
||||||
|
+++ b/sysdeps/x86_64/fpu/multiarch/Makefile
|
||||||
|
@@ -1,5 +1,5 @@
|
||||||
|
ifeq ($(subdir),math)
|
||||||
|
-libm-sysdep_routines += s_floor-c s_ceil-c s_floorf-c s_ceilf-c \
|
||||||
|
+libm-sysdep_routines += s_floorf-c s_ceilf-c \
|
||||||
|
s_rint-c s_rintf-c s_nearbyint-c s_nearbyintf-c
|
||||||
|
|
||||||
|
ifeq ($(have-mfma4),yes)
|
||||||
|
diff --git a/sysdeps/x86_64/fpu/multiarch/s_ceil-c.c b/sysdeps/x86_64/fpu/multiarch/s_ceil-c.c
|
||||||
|
deleted file mode 100644
|
||||||
|
index 6a5ea3f..0000000
|
||||||
|
--- a/sysdeps/x86_64/fpu/multiarch/s_ceil-c.c
|
||||||
|
+++ /dev/null
|
||||||
|
@@ -1,2 +0,0 @@
|
||||||
|
-#define __ceil __ceil_c
|
||||||
|
-#include <sysdeps/ieee754/dbl-64/wordsize-64/s_ceil.c>
|
||||||
|
diff --git a/sysdeps/x86_64/fpu/multiarch/s_ceil.S b/sysdeps/x86_64/fpu/multiarch/s_ceil.S
|
||||||
|
deleted file mode 100644
|
||||||
|
index d0f8da3..0000000
|
||||||
|
--- a/sysdeps/x86_64/fpu/multiarch/s_ceil.S
|
||||||
|
+++ /dev/null
|
||||||
|
@@ -1,40 +0,0 @@
|
||||||
|
-/* Copyright (C) 2011 Free Software Foundation, Inc.
|
||||||
|
- This file is part of the GNU C Library.
|
||||||
|
- Contributed by Ulrich Drepper <drepper@gmail.come>, 2011.
|
||||||
|
-
|
||||||
|
- The GNU C Library is free software; you can redistribute it and/or
|
||||||
|
- modify it under the terms of the GNU Lesser General Public
|
||||||
|
- License as published by the Free Software Foundation; either
|
||||||
|
- version 2.1 of the License, or (at your option) any later version.
|
||||||
|
-
|
||||||
|
- The GNU C Library is distributed in the hope that it will be useful,
|
||||||
|
- but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
- Lesser General Public License for more details.
|
||||||
|
-
|
||||||
|
- You should have received a copy of the GNU Lesser General Public
|
||||||
|
- License along with the GNU C Library; if not, write to the Free
|
||||||
|
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
||||||
|
- 02111-1307 USA. */
|
||||||
|
-
|
||||||
|
-#include <machine/asm.h>
|
||||||
|
-#include <init-arch.h>
|
||||||
|
-
|
||||||
|
-
|
||||||
|
-ENTRY(__ceil)
|
||||||
|
- .type __ceil, @gnu_indirect_function
|
||||||
|
- call __get_cpu_features@plt
|
||||||
|
- movq %rax, %rdx
|
||||||
|
- leaq __ceil_sse41(%rip), %rax
|
||||||
|
- testl $bit_SSE4_1, CPUID_OFFSET+index_SSE4_1(%rdx)
|
||||||
|
- jnz 2f
|
||||||
|
- leaq __ceil_c(%rip), %rax
|
||||||
|
-2: ret
|
||||||
|
-END(__ceil)
|
||||||
|
-weak_alias (__ceil, ceil)
|
||||||
|
-
|
||||||
|
-
|
||||||
|
-ENTRY(__ceil_sse41)
|
||||||
|
- roundsd $2, %xmm0, %xmm0
|
||||||
|
- ret
|
||||||
|
-END(__ceil_sse41)
|
||||||
|
diff --git a/sysdeps/x86_64/fpu/multiarch/s_floor-c.c b/sysdeps/x86_64/fpu/multiarch/s_floor-c.c
|
||||||
|
deleted file mode 100644
|
||||||
|
index 68733b6..0000000
|
||||||
|
--- a/sysdeps/x86_64/fpu/multiarch/s_floor-c.c
|
||||||
|
+++ /dev/null
|
||||||
|
@@ -1,3 +0,0 @@
|
||||||
|
-#undef __floor
|
||||||
|
-#define __floor __floor_c
|
||||||
|
-#include <sysdeps/ieee754/dbl-64/wordsize-64/s_floor.c>
|
||||||
|
diff --git a/sysdeps/x86_64/fpu/multiarch/s_floor.S b/sysdeps/x86_64/fpu/multiarch/s_floor.S
|
||||||
|
deleted file mode 100644
|
||||||
|
index 514ea95..0000000
|
||||||
|
--- a/sysdeps/x86_64/fpu/multiarch/s_floor.S
|
||||||
|
+++ /dev/null
|
||||||
|
@@ -1,40 +0,0 @@
|
||||||
|
-/* Copyright (C) 2011 Free Software Foundation, Inc.
|
||||||
|
- This file is part of the GNU C Library.
|
||||||
|
- Contributed by Ulrich Drepper <drepper@gmail.come>, 2011.
|
||||||
|
-
|
||||||
|
- The GNU C Library is free software; you can redistribute it and/or
|
||||||
|
- modify it under the terms of the GNU Lesser General Public
|
||||||
|
- License as published by the Free Software Foundation; either
|
||||||
|
- version 2.1 of the License, or (at your option) any later version.
|
||||||
|
-
|
||||||
|
- The GNU C Library is distributed in the hope that it will be useful,
|
||||||
|
- but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
- Lesser General Public License for more details.
|
||||||
|
-
|
||||||
|
- You should have received a copy of the GNU Lesser General Public
|
||||||
|
- License along with the GNU C Library; if not, write to the Free
|
||||||
|
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
||||||
|
- 02111-1307 USA. */
|
||||||
|
-
|
||||||
|
-#include <machine/asm.h>
|
||||||
|
-#include <init-arch.h>
|
||||||
|
-
|
||||||
|
-
|
||||||
|
-ENTRY(__floor)
|
||||||
|
- .type __floor, @gnu_indirect_function
|
||||||
|
- call __get_cpu_features@plt
|
||||||
|
- movq %rax, %rdx
|
||||||
|
- leaq __floor_sse41(%rip), %rax
|
||||||
|
- testl $bit_SSE4_1, CPUID_OFFSET+index_SSE4_1(%rdx)
|
||||||
|
- jnz 2f
|
||||||
|
- leaq __floor_c(%rip), %rax
|
||||||
|
-2: ret
|
||||||
|
-END(__floor)
|
||||||
|
-weak_alias (__floor, floor)
|
||||||
|
-
|
||||||
|
-
|
||||||
|
-ENTRY(__floor_sse41)
|
||||||
|
- roundsd $1, %xmm0, %xmm0
|
||||||
|
- ret
|
||||||
|
-END(__floor_sse41)
|
||||||
|
diff --git a/sysdeps/x86_64/fpu/multiarch/s_sin.c b/sysdeps/x86_64/fpu/multiarch/s_sin.c
|
||||||
|
deleted file mode 100644
|
||||||
|
index 1ba9dbc..0000000
|
||||||
|
--- a/sysdeps/x86_64/fpu/multiarch/s_sin.c
|
||||||
|
+++ /dev/null
|
||||||
|
@@ -1,31 +0,0 @@
|
||||||
|
-#if defined HAVE_FMA4_SUPPORT || defined HAVE_AVX_SUPPORT
|
||||||
|
-# include <init-arch.h>
|
||||||
|
-# include <math.h>
|
||||||
|
-# undef NAN
|
||||||
|
-
|
||||||
|
-extern double __cos_sse2 (double);
|
||||||
|
-extern double __sin_sse2 (double);
|
||||||
|
-extern double __cos_avx (double);
|
||||||
|
-extern double __sin_avx (double);
|
||||||
|
-# ifdef HAVE_FMA4_SUPPORT
|
||||||
|
-extern double __cos_fma4 (double);
|
||||||
|
-extern double __sin_fma4 (double);
|
||||||
|
-# else
|
||||||
|
-# undef HAS_FMA4
|
||||||
|
-# define HAS_FMA4 0
|
||||||
|
-# define __cos_fma4 ((void *) 0)
|
||||||
|
-# define __sin_fma4 ((void *) 0)
|
||||||
|
-# endif
|
||||||
|
-
|
||||||
|
-libm_ifunc (__cos, HAS_FMA4 ? __cos_fma4 : HAS_AVX ? __cos_avx : __cos_sse2);
|
||||||
|
-weak_alias (__cos, cos)
|
||||||
|
-
|
||||||
|
-libm_ifunc (__sin, HAS_FMA4 ? __sin_fma4 : HAS_AVX ? __sin_avx : __sin_sse2);
|
||||||
|
-weak_alias (__sin, sin)
|
||||||
|
-
|
||||||
|
-# define __cos __cos_sse2
|
||||||
|
-# define __sin __sin_sse2
|
||||||
|
-#endif
|
||||||
|
-
|
||||||
|
-
|
||||||
|
-#include <sysdeps/ieee754/dbl-64/s_sin.c>
|
||||||
|
diff --git a/sysdeps/x86_64/fpu/multiarch/s_tan.c b/sysdeps/x86_64/fpu/multiarch/s_tan.c
|
||||||
|
deleted file mode 100644
|
||||||
|
index 8f6601e..0000000
|
||||||
|
--- a/sysdeps/x86_64/fpu/multiarch/s_tan.c
|
||||||
|
+++ /dev/null
|
||||||
|
@@ -1,21 +0,0 @@
|
||||||
|
-#if defined HAVE_FMA4_SUPPORT || defined HAVE_AVX_SUPPORT
|
||||||
|
-# include <init-arch.h>
|
||||||
|
-# include <math.h>
|
||||||
|
-
|
||||||
|
-extern double __tan_sse2 (double);
|
||||||
|
-extern double __tan_avx (double);
|
||||||
|
-# ifdef HAVE_FMA4_SUPPORT
|
||||||
|
-extern double __tan_fma4 (double);
|
||||||
|
-# else
|
||||||
|
-# undef HAS_FMA4
|
||||||
|
-# define HAS_FMA4 0
|
||||||
|
-# define __tan_fma4 ((void *) 0)
|
||||||
|
-# endif
|
||||||
|
-
|
||||||
|
-libm_ifunc (tan, HAS_FMA4 ? __tan_fma4 : HAS_AVX ? __tan_avx : __tan_sse2);
|
||||||
|
-
|
||||||
|
-# define tan __tan_sse2
|
||||||
|
-#endif
|
||||||
|
-
|
||||||
|
-
|
||||||
|
-#include <sysdeps/ieee754/dbl-64/s_tan.c>
|
||||||
@ -1,3 +1,16 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Jan 10 12:31:14 UTC 2012 - aj@suse.de
|
||||||
|
|
||||||
|
- Remove all math ifuncs on x86-64.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Jan 10 09:53:58 UTC 2012 - aj@suse.de
|
||||||
|
|
||||||
|
- Remove math ifuncs that cause crashes in apache2 and
|
||||||
|
gdk-pixbuf-query-loaders-64 (bnc#740109) for now
|
||||||
|
(glibc-2.15-math64crash.patch).
|
||||||
|
- nscd needs the same glibc version, add require.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Jan 9 08:17:08 UTC 2012 - aj@suse.de
|
Mon Jan 9 08:17:08 UTC 2012 - aj@suse.de
|
||||||
|
|
||||||
|
|||||||
@ -194,6 +194,8 @@ Patch88: pthread-cond-wait-revert.patch
|
|||||||
Patch89: glibc-2.16-scanf.patch
|
Patch89: glibc-2.16-scanf.patch
|
||||||
# PATCH-FIX-UPSTREAM Fix getcontext on 32-bit powerpc - aj@suse.de
|
# PATCH-FIX-UPSTREAM Fix getcontext on 32-bit powerpc - aj@suse.de
|
||||||
Patch90: glibc-ppc-getcontext.patch
|
Patch90: glibc-ppc-getcontext.patch
|
||||||
|
# PATCH-FIX-OPENSUSE Revert some math ifuncs (bnc#740109) - aj@suse.de
|
||||||
|
Patch91: glibc-2.15-math64crash.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
The GNU C Library provides the most important standard libraries used
|
The GNU C Library provides the most important standard libraries used
|
||||||
@ -260,6 +262,7 @@ License: LGPL-2.1+
|
|||||||
Group: System/Daemons
|
Group: System/Daemons
|
||||||
Provides: aaa_base:/etc/init.d/nscd
|
Provides: aaa_base:/etc/init.d/nscd
|
||||||
Provides: glibc:/usr/sbin/nscd
|
Provides: glibc:/usr/sbin/nscd
|
||||||
|
Requires: glibc = %{version}
|
||||||
Requires(preun): %insserv_prereq
|
Requires(preun): %insserv_prereq
|
||||||
Requires(post): %insserv_prereq
|
Requires(post): %insserv_prereq
|
||||||
Requires(postun): %insserv_prereq
|
Requires(postun): %insserv_prereq
|
||||||
@ -411,6 +414,7 @@ rm nscd/s-stamp
|
|||||||
%patch88 -p1 -R
|
%patch88 -p1 -R
|
||||||
%patch89 -p1
|
%patch89 -p1
|
||||||
%patch90 -p1
|
%patch90 -p1
|
||||||
|
%patch91 -p1
|
||||||
|
|
||||||
#
|
#
|
||||||
# Inconsistency detected by ld.so: dl-close.c: 719: _dl_close: Assertion `map->l_init_called' failed!
|
# Inconsistency detected by ld.so: dl-close.c: 719: _dl_close: Assertion `map->l_init_called' failed!
|
||||||
@ -510,6 +514,9 @@ PARALLEL="%{?_smp_mflags}"
|
|||||||
# fails to build otherwise - need to recheck and fix
|
# fails to build otherwise - need to recheck and fix
|
||||||
%define enable_stackguard_randomization 0
|
%define enable_stackguard_randomization 0
|
||||||
%endif
|
%endif
|
||||||
|
# Remove completely, these give some strange crashes with dlopen
|
||||||
|
# See bnc#740109
|
||||||
|
rm -rf sysdeps/x86_64/fpu/multiarch
|
||||||
|
|
||||||
configure_and_build_glibc() {
|
configure_and_build_glibc() {
|
||||||
local dirname="$1"; shift
|
local dirname="$1"; shift
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user