aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdhemerval Zanella <azanella@linux.vnet.ibm.com>2015-01-21 07:38:28 -0500
committerAdhemerval Zanella <azanella@linux.vnet.ibm.com>2015-02-09 06:42:28 -0500
commit8548a53d699399e795a70e066401753622d797e3 (patch)
tree59842e5df6ec5e05a4a3fe629572380340ba56f5
parentb269211467795c71ae0ceb0ce79f2fb6614f33c9 (diff)
downloadglibc-8548a53d699399e795a70e066401753622d797e3.tar
glibc-8548a53d699399e795a70e066401753622d797e3.tar.gz
glibc-8548a53d699399e795a70e066401753622d797e3.tar.bz2
glibc-8548a53d699399e795a70e066401753622d797e3.zip
powerpc: multiarch Makefile cleanup for powerpc32
This patch cleanups the multiarch Makefile by putting the wide chars implementation to correct wcsmbs rule.
-rw-r--r--ChangeLog4
-rw-r--r--sysdeps/powerpc/powerpc32/power4/multiarch/Makefile14
2 files changed, 14 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 89443945f8..e8496064b1 100644
--- 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 a7d33b9273..2271d57b13 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