diff options
| author | Adhemerval Zanella <azanella@linux.vnet.ibm.com> | 2015-01-20 15:41:38 -0500 |
|---|---|---|
| committer | Adhemerval Zanella <azanella@linux.vnet.ibm.com> | 2015-02-09 06:42:27 -0500 |
| commit | 3001e54c5786f714537acfb631b502e2229f883f (patch) | |
| tree | 7059e6254c1c05a74517bd876e648952a09bdea0 | |
| parent | 59b61c82fe18e612058302e4c726385c4eb301d8 (diff) | |
| download | glibc-3001e54c5786f714537acfb631b502e2229f883f.tar glibc-3001e54c5786f714537acfb631b502e2229f883f.tar.gz glibc-3001e54c5786f714537acfb631b502e2229f883f.tar.bz2 glibc-3001e54c5786f714537acfb631b502e2229f883f.zip | |
powerpc: multiarch Makefile cleanup for powerpc64
This patch cleanups the multiarch Makefile by putting the wide chars
implementation to correct wcsmbs rule.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc64/multiarch/Makefile | 15 |
2 files changed, 16 insertions, 5 deletions
@@ -1,3 +1,9 @@ +2015-02-09 Adhemerval Zanellla <azanella@linux.vnet.ibm.com> + + * sysdeps/powerpc/powerpc64/multiarch/Makefile [sysdep_routines]: + Remove wide chars objects. + [wcsmbs]: New rule for wide char objects. + 2015-02-09 Andreas Schwab <schwab@suse.de> [BZ #17912] diff --git a/sysdeps/powerpc/powerpc64/multiarch/Makefile b/sysdeps/powerpc/powerpc64/multiarch/Makefile index b7ea28420f..fe4f255c87 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/Makefile +++ b/sysdeps/powerpc/powerpc64/multiarch/Makefile @@ -10,9 +10,7 @@ sysdep_routines += memcpy-power7 memcpy-a2 memcpy-power6 memcpy-cell \ strncase-power7 strncase_l-power7 \ strncmp-power8 strncmp-power7 strncmp-power4 strncmp-ppc64 \ strchr-power7 strchr-ppc64 \ - strchrnul-power7 strchrnul-ppc64 wcschr-power7 \ - wcschr-power6 wcschr-ppc64 wcsrchr-power7 wcsrchr-power6 \ - wcsrchr-ppc64 wcscpy-power7 wcscpy-power6 wcscpy-ppc64 \ + strchrnul-power7 strchrnul-ppc64 \ wordcopy-power7 wordcopy-power6 wordcopy-ppc64 \ strcpy-power8 strcpy-power7 strcpy-ppc64 stpcpy-power8 \ stpcpy-power7 stpcpy-ppc64 \ @@ -25,12 +23,19 @@ sysdep_routines += memcpy-power7 memcpy-a2 memcpy-power6 memcpy-cell \ CFLAGS-strncase-power7.c += -mcpu=power7 -funroll-loops CFLAGS-strncase_l-power7.c += -mcpu=power7 -funroll-loops +CFLAGS-wordcopy-power7.c += -mcpu=power7 +CFLAGS-wordcopy-power6.c += -mcpu=power6 +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 -CFLAGS-wordcopy-power7.c += -mcpu=power7 -CFLAGS-wordcopy-power6.c += -mcpu=power6 endif |