Skip to content

Commit

Permalink
powerpc: multiarch Makefile cleanup for powerpc32
Browse files Browse the repository at this point in the history
This patch cleanups the multiarch Makefile by putting the wide chars
implementation to correct wcsmbs rule.
  • Loading branch information
Adhemerval Zanella committed Feb 9, 2015
1 parent b269211 commit 8548a53
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 4 deletions.
4 changes: 4 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -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):
Expand Down
14 changes: 10 additions & 4 deletions sysdeps/powerpc/powerpc32/power4/multiarch/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 8548a53

Please sign in to comment.