diff mbox

[5/6] powerpc: multiarch Makefile cleanup for powerpc32

Message ID 54BFD08D.5040902@linux.vnet.ibm.com
State New
Headers show

Commit Message

Adhemerval Zanella Jan. 21, 2015, 4:15 p.m. UTC
This patch cleanups the multiarch Makefile by putting the wide chars
implementation to correct wcsmbs rule.

Tested on powerpc32-fpu.

--

	* sysdeps/powerpc/powerpc32/power4/multiarch/Makefile
	[sysdep_routines]: Remove wide chars objects.
	[wcsmbs]: New rule for wide char objects.

--
diff mbox

Patch

diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/Makefile b/sysdeps/powerpc/powerpc32/power4/multiarch/Makefile
index a7d33b9..2271d57 100644
--- 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