powerpc: multiarch Makefile cleanup for powerpc32

This patch cleanups the multiarch Makefile by putting the wide chars
implementation to correct wcsmbs rule.

diff --git a/ChangeLog b/ChangeLog
index 89443945f891c2c2ea2558c5c473b08b621c453a..e8496064b18355835b9e6d0f2aef7fbe43940a30 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2015-02-09  Adhemerval Zanellla  <azanella@linux.vnet.ibm.com>
 
+       * sysdeps/powerpc/powerpc32/power4/multiarch/Makefile
+       [sysdep_routines]: Remove wide chars objects.
+       [wcsmbs]: New rule for wide char objects.
+
        * sysdeps/powerpc/powerpc64/multiarch/Makefile [sysdep_routines]:
        Remove wordcopy-power6 obejct.
        * sysdeps/powerpc/powerpc64/multiarch/memmove-ppc64.c (__memmove_ppc):

diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/Makefile b/sysdeps/powerpc/powerpc32/power4/multiarch/Makefile
index a7d33b92733eb16366408e6276a57c5e5e374910..2271d57b13f84eca5fe214a356996cc1c92ad4f7 100644 (file)
--- a/sysdeps/powerpc/powerpc32/power4/multiarch/Makefile
+++ b/sysdeps/powerpc/powerpc32/power4/multiarch/Makefile
@@ -8,13 +8,19 @@ sysdep_routines += memcpy-power7 memcpy-a2 memcpy-power6 memcpy-cell \
                   strnlen-ppc32 strncmp-power7 strncmp-ppc32 \
                   strcasecmp-power7 strcasecmp_l-power7 strncase-power7 \
                   strncase_l-power7 strchrnul-power7 strchrnul-ppc32 \
-                  strchr-power7 strchr-ppc32 wcschr-power7 wcschr-power6 \
-                  wcschr-ppc32 wcsrchr-power7 wcsrchr-power6 wcsrchr-ppc32 \
-                  wcscpy-power7 wcscpy-power6 wcscpy-ppc32 wordcopy-power7 \
-                  wordcopy-power6 wordcopy-ppc32 memmove-power7 memmove-ppc
+                  strchr-power7 strchr-ppc32 \
+                  wordcopy-power7 wordcopy-power6 wordcopy-ppc32 \
+                  memmove-power7 memmove-ppc
 
 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-ppc32 \
+                  wcsrchr-power7 wcsrchr-power6 wcsrchr-ppc32 \
+                  wcscpy-power7 wcscpy-power6 wcscpy-ppc32
+
 CFLAGS-wcschr-power7.c += -mcpu=power7
 CFLAGS-wcschr-power6.c += -mcpu=power6
 CFLAGS-wcsrchr-power7.c += -mcpu=power7