powerpc: Use generic wcsrchr optimization

[thirdparty/glibc.git] / sysdeps / powerpc / powerpc64 / multiarch / Makefile

diff --git a/sysdeps/powerpc/powerpc64/multiarch/Makefile b/sysdeps/powerpc/powerpc64/multiarch/Makefile
index 2c83c2202846ba91c331789f675a942a8e18b3d2..ea936bf9edad3b4ab1ea8d6594beab3820159df2 100644 (file)
--- a/sysdeps/powerpc/powerpc64/multiarch/Makefile
+++ b/sysdeps/powerpc/powerpc64/multiarch/Makefile
@@ -1,22 +1,28 @@
 ifeq ($(subdir),string)
-sysdep_routines += memcpy-power7 memcpy-a2 memcpy-power6 memcpy-cell \
-                  memcpy-power4 memcpy-ppc64 memcmp-power7 memcmp-power4 \
-                  memcmp-ppc64 memset-power7 memset-power6 memset-power4 \
+sysdep_routines += memcpy-power8-cached memcpy-power7 memcpy-a2 memcpy-power6 \
+                  memcpy-cell memcpy-power4 memcpy-ppc64 \
+                  memcmp-power8 memcmp-power7 memcmp-power4 memcmp-ppc64 \
+                  memset-power7 memset-power6 memset-power4 \
                   memset-ppc64 memset-power8 \
-                  mempcpy-power7 mempcpy-ppc64 memchr-power7 memchr-ppc64 \
-                  memrchr-power7 memrchr-ppc64 rawmemchr-power7 \
-                  rawmemchr-ppc64 strlen-power7 strlen-ppc64 strnlen-power7 \
-                  strnlen-ppc64 strcasecmp-power7 strcasecmp_l-power7 \
+                  mempcpy-power7 mempcpy-ppc64 \
+                  memchr-power8 memchr-power7 memchr-ppc64 \
+                  memrchr-power8 memrchr-power7 memrchr-ppc64 \
+                  rawmemchr-power7 rawmemchr-ppc64 \
+                  strlen-power7 strlen-ppc64 \
+                  strnlen-power8 strnlen-power7 strnlen-ppc64 \
+                  strcasecmp-power7 strcasecmp_l-power7 \
                   strncase-power7 strncase_l-power7 \
-                  strncmp-power8 strncmp-power7 strncmp-power4 strncmp-ppc64 \
-                  strchr-power7 strchr-ppc64 \
-                  strchrnul-power7 strchrnul-ppc64 \
+                  strncmp-power8 strncmp-power7 \
+                  strncmp-power4 strncmp-ppc64 \
+                  strchr-power8 strchr-power7 strchr-ppc64 \
+                  strchrnul-power8 strchrnul-power7 strchrnul-ppc64 \
                   strcpy-power8 strcpy-power7 strcpy-ppc64 stpcpy-power8 \
                   stpcpy-power7 stpcpy-ppc64 \
-                  strrchr-power7 strrchr-ppc64 strncat-power7 strncat-ppc64 \
+                  strrchr-power8 strrchr-power7 strrchr-ppc64 \
+                  strncat-power8 strncat-power7 strncat-ppc64 \
                   strncpy-power7 strncpy-ppc64 \
                   stpncpy-power8 stpncpy-power7 stpncpy-ppc64 \
-                  strcmp-power9 strcmp-power8 strcmp-power7 strcmp-ppc64 \
+                  strcmp-power8 strcmp-power7 strcmp-ppc64 \
                   strcat-power8 strcat-power7 strcat-ppc64 \
                   memmove-power7 memmove-ppc64 wordcopy-ppc64 bcopy-ppc64 \
                   strncpy-power8 strstr-power7 strstr-ppc64 \
@@ -25,19 +31,9 @@ sysdep_routines += memcpy-power7 memcpy-a2 memcpy-power6 memcpy-cell \
                   strcasecmp-ppc64 strcasecmp-power8 strncase-ppc64 \
                   strncase-power8
 
+ifneq (,$(filter %le,$(config-machine)))
+sysdep_routines += strcmp-power9 strncmp-power9
+endif
 CFLAGS-strncase-power7.c += -mcpu=power7 -funroll-loops
 CFLAGS-strncase_l-power7.c += -mcpu=power7 -funroll-loops
 endif
-
-ifeq ($(subdir),wcsmbs)
-sysdep_routines += wcschr-power7 wcschr-power6 wcschr-ppc64 \
-                  wcsrchr-power7 wcsrchr-power6 wcsrchr-ppc64 \
-                  wcscpy-power7 wcscpy-power6 wcscpy-ppc64 \
-
-CFLAGS-wcschr-power7.c += -mcpu=power7
-CFLAGS-wcschr-power6.c += -mcpu=power6
-CFLAGS-wcsrchr-power7.c += -mcpu=power7
-CFLAGS-wcsrchr-power6.c += -mcpu=power6
-CFLAGS-wcscpy-power7.c += -mcpu=power7
-CFLAGS-wcscpy-power6.c += -mcpu=power6
-endif