diff options
| author | P. J. McDermott <pjm@nac.net> | 2013-09-11 13:29:52 (EDT) |
|---|---|---|
| committer | P. J. McDermott <pjm@nac.net> | 2013-09-11 13:29:52 (EDT) |
| commit | cc6fc2a243fd66554ecadf419037a7e4bd5b6613 (patch) | |
| tree | 39306511f551c17649c7dd66e755217af1ed16bc | |
| parent | b777b148aafd59118bd46beee509ec610b0cf06e (diff) | |
Remove unnecessary HAVE_AVX_SUPPORT patch.
| -rw-r--r-- | patches/05_fix-link-without-avx.patch | 67 |
1 files changed, 0 insertions, 67 deletions
diff --git a/patches/05_fix-link-without-avx.patch b/patches/05_fix-link-without-avx.patch deleted file mode 100644 index df9b78f..0000000 --- a/patches/05_fix-link-without-avx.patch +++ /dev/null @@ -1,67 +0,0 @@ -From: Adhemerval Zanella <azanella@linux.vnet.ibm.com> -Description: Fix ld.so linking with HAVE_AVX_SUPPORT disabled - sysdeps/x86_64/multiarch/ifunc-impl-list.c unconditionally uses *_avx symbols, - but sysdeps/x86_64/multiarch/strcmp.S conditionally defines them. - . - This results in the following link error when a compiler without -mavx support - is detected by sysdeps/x86_64/configure: - . - gcc -shared -static-libgcc [...] -o /usr/src/eglibc_2.17~r22751+sip1-1/tmp/libcbuild/libc.so [...] -lgcc - /usr/src/eglibc_2.17~r22751+sip1-1/tmp/libcbuild/libc_pic.os: In function `__libc_ifunc_impl_list': - /usr/src/eglibc_2.17~r22751+sip1-1/tmp/src/libc/misc/../sysdeps/x86_64/multiarch/ifunc-impl-list.c:96: undefined reference to `__strcasecmp_avx' - /usr/bin/ld: /usr/src/eglibc_2.17~r22751+sip1-1/tmp/libcbuild/libc_pic.os: relocation R_X86_64_PC32 against undefined hidden symbol `__strcasecmp_avx' can not be used when making a shared object - /usr/bin/ld: final link failed: Bad value - collect2: error: ld returned 1 exit status - make[2]: *** [/usr/src/eglibc_2.17~r22751+sip1-1/tmp/libcbuild/libc.so] Error 1 - make[2]: Leaving directory `/usr/src/eglibc_2.17~r22751+sip1-1/tmp/src/libc' - make[1]: *** [all] Error 2 - make[1]: Leaving directory `/usr/src/eglibc_2.17~r22751+sip1-1/tmp/libcbuild' - make: *** [build-libc] Error 2 - -diff -Naur src.orig/libc/sysdeps/x86_64/multiarch/ifunc-impl-list.c src/libc/sysdeps/x86_64/multiarch/ifunc-impl-list.c ---- src.orig/libc/sysdeps/x86_64/multiarch/ifunc-impl-list.c 2012-10-25 13:18:12.000000000 -0400 -+++ src/libc/sysdeps/x86_64/multiarch/ifunc-impl-list.c 2013-06-26 15:44:53.310685644 -0400 -@@ -94,8 +94,10 @@ - - /* Support sysdeps/x86_64/multiarch/strcasecmp_l.S. */ - IFUNC_IMPL (i, name, strcasecmp, -+#ifdef HAVE_AVX_SUPPORT - IFUNC_IMPL_ADD (array, i, strcasecmp, HAS_AVX, - __strcasecmp_avx) -+#endif - IFUNC_IMPL_ADD (array, i, strcasecmp, HAS_SSE4_2, - __strcasecmp_sse42) - IFUNC_IMPL_ADD (array, i, strcasecmp, HAS_SSSE3, -@@ -104,8 +106,10 @@ - - /* Support sysdeps/x86_64/multiarch/strcasecmp_l.S. */ - IFUNC_IMPL (i, name, strcasecmp_l, -+#ifdef HAVE_AVX_SUPPORT - IFUNC_IMPL_ADD (array, i, strcasecmp_l, HAS_AVX, - __strcasecmp_l_avx) -+#endif - IFUNC_IMPL_ADD (array, i, strcasecmp_l, HAS_SSE4_2, - __strcasecmp_l_sse42) - IFUNC_IMPL_ADD (array, i, strcasecmp_l, HAS_SSSE3, -@@ -151,8 +155,10 @@ - - /* Support sysdeps/x86_64/multiarch/strncase_l.S. */ - IFUNC_IMPL (i, name, strncasecmp, -+#ifdef HAVE_AVX_SUPPORT - IFUNC_IMPL_ADD (array, i, strncasecmp, HAS_AVX, - __strncasecmp_avx) -+#endif - IFUNC_IMPL_ADD (array, i, strncasecmp, HAS_SSE4_2, - __strncasecmp_sse42) - IFUNC_IMPL_ADD (array, i, strncasecmp, HAS_SSSE3, -@@ -162,8 +168,10 @@ - - /* Support sysdeps/x86_64/multiarch/strncase_l.S. */ - IFUNC_IMPL (i, name, strncasecmp_l, -+#ifdef HAVE_AVX_SUPPORT - IFUNC_IMPL_ADD (array, i, strncasecmp_l, HAS_AVX, - __strncasecmp_l_avx) -+#endif - IFUNC_IMPL_ADD (array, i, strncasecmp_l, HAS_SSE4_2, - __strncasecmp_l_sse42) - IFUNC_IMPL_ADD (array, i, strncasecmp_l, HAS_SSSE3, |