diff options
| author | Andreas Schwab <schwab@suse.de> | 2013-12-18 11:53:27 +1000 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2013-12-18 14:28:30 +1000 |
| commit | 1818483b15d22016b0eae41d37ee91cc87b37510 (patch) | |
| tree | 671c0713c560f5c493c16fb96e86c0df1e95c55b /sysdeps/i386/i686/multiarch/Makefile | |
| parent | 25de95bfd1f637f9392ffe7ecb6e875ac15eede5 (diff) | |
| download | glibc-1818483b15d22016b0eae41d37ee91cc87b37510.tar.gz glibc-1818483b15d22016b0eae41d37ee91cc87b37510.tar.xz glibc-1818483b15d22016b0eae41d37ee91cc87b37510.zip | |
Remove use of SSE4.2 functions for strstr on i686
The SSE4.2 have been removed from x86_64 by commit 584b18eb. This patch fixes the build on i686, which attempts to use the removed files.
Diffstat (limited to 'sysdeps/i386/i686/multiarch/Makefile')
| -rw-r--r-- | sysdeps/i386/i686/multiarch/Makefile | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sysdeps/i386/i686/multiarch/Makefile b/sysdeps/i386/i686/multiarch/Makefile index 8946bfa586..55778cbcd1 100644 --- a/sysdeps/i386/i686/multiarch/Makefile +++ b/sysdeps/i386/i686/multiarch/Makefile @@ -11,7 +11,7 @@ sysdep_routines += bzero-sse2 memset-sse2 memcpy-ssse3 mempcpy-ssse3 \ memmove-ssse3-rep bcopy-ssse3 bcopy-ssse3-rep \ memset-sse2-rep bzero-sse2-rep strcmp-ssse3 \ strcmp-sse4 strncmp-c strncmp-ssse3 strncmp-sse4 \ - memcmp-ssse3 memcmp-sse4 strcasestr-nonascii varshift \ + memcmp-ssse3 memcmp-sse4 varshift \ strlen-sse2 strlen-sse2-bsf strncpy-c strcpy-ssse3 \ strncpy-ssse3 stpcpy-ssse3 stpncpy-ssse3 strcpy-sse2 \ strncpy-sse2 stpcpy-sse2 stpncpy-sse2 strcat-ssse3 \ @@ -25,14 +25,11 @@ sysdep_routines += bzero-sse2 memset-sse2 memcpy-ssse3 mempcpy-ssse3 \ strncase_l-c strncase-c strncase_l-ssse3 \ strcasecmp_l-sse4 strncase_l-sse4 ifeq (yes,$(config-cflags-sse4)) -sysdep_routines += strcspn-c strpbrk-c strspn-c strstr-c strcasestr-c +sysdep_routines += strcspn-c strpbrk-c strspn-c CFLAGS-varshift.c += -msse4 CFLAGS-strcspn-c.c += -msse4 CFLAGS-strpbrk-c.c += -msse4 CFLAGS-strspn-c.c += -msse4 -CFLAGS-strstr.c += -msse4 -CFLAGS-strcasestr.c += -msse4 -CFLAGS-strcasestr-nonascii.c += -msse4 endif endif |