Move wide char related routines to wcsmbs subdir

diff --git a/ChangeLog b/ChangeLog
index 8526a41..ec76080 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-28  Andreas Schwab  <schwab@redhat.com>
+
+       * sysdeps/i386/i686/multiarch/Makefile (sysdep_routines): Move
+       wide char related routines to wcsmbs subdir.
+
 2011-10-27  Andreas Schwab  <schwab@redhat.com>
 
        [BZ #13344]

diff --git a/sysdeps/i386/i686/multiarch/Makefile b/sysdeps/i386/i686/multiarch/Makefile
index 5f18538..42bcd3c 100644 (file)
--- a/sysdeps/i386/i686/multiarch/Makefile
+++ b/sysdeps/i386/i686/multiarch/Makefile
@@ -15,11 +15,10 @@ sysdep_routines += bzero-sse2 memset-sse2 memcpy-ssse3 mempcpy-ssse3 \
                   strncpy-sse2 stpcpy-sse2 stpncpy-sse2 strcat-ssse3 \
                   strcat-sse2 strncat-ssse3 strncat-sse2 strncat-c \
                   strchr-sse2 strrchr-sse2 strchr-sse2-bsf strrchr-sse2-bsf \
-                  wcscmp-sse2 wcscmp-c memchr-sse2 memchr-sse2-bsf \
+                  memchr-sse2 memchr-sse2-bsf \
                   memrchr-sse2 memrchr-sse2-bsf memrchr-c \
                   rawmemchr-sse2 rawmemchr-sse2-bsf \
-                  strnlen-sse2 strnlen-c wcslen-sse2 wcslen-c \
-                  wmemcmp-sse4 wmemcmp-ssse3 wmemcmp-c
+                  strnlen-sse2 strnlen-c
 ifeq (yes,$(config-cflags-sse4))
 sysdep_routines += strcspn-c strpbrk-c strspn-c strstr-c strcasestr-c
 CFLAGS-varshift.c += -msse4
@@ -32,6 +31,11 @@ CFLAGS-strcasestr-nonascii.c += -msse4
 endif
 endif
 
+ifeq ($(subdir),wcsmbs)
+sysdep_routines += wcscmp-sse2 wcscmp-c wcslen-sse2 wcslen-c \
+                  wmemcmp-sse4 wmemcmp-ssse3 wmemcmp-c
+endif
+
 ifeq (mathyes,$(subdir)$(config-cflags-avx))
 libm-sysdep_routines += s_fma-fma s_fmaf-fma
 CFLAGS-s_fma-fma.c += -mavx -mfpmath=sse