diff options
| -rw-r--r-- | ChangeLog | 20 | ||||
| -rw-r--r-- | sysdeps/powerpc/power6/wcsrchr.c (renamed from sysdeps/powerpc/powerpc32/power6/wcsrchr.c) | 9 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc32/power4/multiarch/Makefile | 4 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc32/power4/multiarch/ifunc-impl-list.c | 11 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc32/power4/multiarch/wcsrchr-power6.c | 20 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc32/power4/multiarch/wcsrchr-power7.c | 20 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc32/power4/multiarch/wcsrchr-ppc32.c | 26 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc32/power4/multiarch/wcsrchr.c | 36 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc64/power6/wcsrchr.c | 2 | ||||
| -rw-r--r-- | wcsmbs/wcsrchr.c | 5 |
10 files changed, 146 insertions, 7 deletions
@@ -1,5 +1,25 @@ 2013-12-06 Adhemerval Zanella <azanella@linux.vnet.ibm.com> + * wcsmbs/wcsrchr.c (wcsrchr): Using macro to redefine symbol name + * sysdeps/powerpc/powerpc32/power4/multiarch/wcsrchr-power6.c: New + file. + * sysdeps/powerpc/powerpc32/power4/multiarch/wcsrchr-power7.c: New + file. + * sysdeps/powerpc/powerpc32/power4/multiarch/wcsrchr-ppc32.c: New + file. + * sysdeps/powerpc/powerpc32/power4/multiarch/wcsrchr.c: New file: + multiarch wcsrchr for PPC32. + * sysdeps/powerpc/powerpc32/power4/multiarch/Makefile: Added wcschr + multiarch objects. + * sysdeps/powerpc/powerpc32/power4/multiarch/ifunc-impl-list + (__libc_ifunc_impl_list): Likewise. + * sysdeps/powerpc/powerpc32/power6/wcsrchr.c: Move ... + * sysdeps/powerpc/power6/wcsrchr.c: ... to here. + * sysdeps/powerpc/powerpc64/power6/wcsrchr.c: Adjust to use + sysdeps/powerpc/power6/wcsrchr.c. + +2013-12-06 Adhemerval Zanella <azanella@linux.vnet.ibm.com> + * sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-power6.c: New file. * sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-power7.c: New diff --git a/sysdeps/powerpc/powerpc32/power6/wcsrchr.c b/sysdeps/powerpc/power6/wcsrchr.c index 8d26af05fb..5602be35e9 100644 --- a/sysdeps/powerpc/powerpc32/power6/wcsrchr.c +++ b/sysdeps/powerpc/power6/wcsrchr.c @@ -1,4 +1,4 @@ -/* wcsrchr.c - Wide Character Reverse Search for powerpc32/power6. +/* wcsrchr.c - Wide Character Reverse Search for POWER6+. Copyright (C) 2012-2013 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -18,12 +18,13 @@ #include <wchar.h> +#ifndef WCSRCHR +# define WCSRCHR wcsrchr +#endif /* Find the last occurrence of WC in WCS. */ wchar_t * -wcsrchr (wcs, wc) - const wchar_t *wcs; - const wchar_t wc; +WCSRCHR (const wchar_t *wcs, const wchar_t wc) { const wchar_t *wcs2 = wcs + 1; const wchar_t *retval = NULL; diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/Makefile b/sysdeps/powerpc/powerpc32/power4/multiarch/Makefile index 12b180ec7d..4af490ea6e 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/Makefile +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/Makefile @@ -9,10 +9,12 @@ sysdep_routines += memcpy-power7 memcpy-a2 memcpy-power6 memcpy-cell \ strcasecmp-power7 strcasecmp_l-power7 strncase-power7 \ strncase_l-power7 strchrnul-power7 strchrnul-ppc32 \ strchr-power7 strchr-ppc32 wcschr-power7 wcschr-power6 \ - wcschr-ppc32 + wcschr-ppc32 wcsrchr-power7 wcsrchr-power6 wcsrchr-ppc32 CFLAGS-strncase-power7.c += -mcpu=power7 -funroll-loops CFLAGS-strncase_l-power7.c += -mcpu=power7 -funroll-loops CFLAGS-wcschr-power7.c += -mcpu=power7 CFLAGS-wcschr-power6.c += -mcpu=power6 +CFLAGS-wcsrchr-power7.c += -mcpu=power7 +CFLAGS-wcsrchr-power6.c += -mcpu=power6 endif diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/ifunc-impl-list.c b/sysdeps/powerpc/powerpc32/power4/multiarch/ifunc-impl-list.c index a602beac98..7ac5c4a9fd 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/ifunc-impl-list.c +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/ifunc-impl-list.c @@ -192,5 +192,16 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, IFUNC_IMPL_ADD (array, i, wcschr, 1, __wcschr_ppc)) + /* Support sysdeps/powerpc/powerpc32/power4/multiarch/wcsrchr.c. */ + IFUNC_IMPL (i, name, wcsrchr, + IFUNC_IMPL_ADD (array, i, wcsrchr, + hwcap & PPC_FEATURE_HAS_VSX, + __wcsrchr_power7) + IFUNC_IMPL_ADD (array, i, wcsrchr, + hwcap & PPC_FEATURE_ARCH_2_05, + __wcsrchr_power6) + IFUNC_IMPL_ADD (array, i, wcsrchr, 1, + __wcsrchr_ppc)) + return i; } diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/wcsrchr-power6.c b/sysdeps/powerpc/powerpc32/power4/multiarch/wcsrchr-power6.c new file mode 100644 index 0000000000..68fe4775be --- /dev/null +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/wcsrchr-power6.c @@ -0,0 +1,20 @@ +/* Copyright (C) 2013 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + +#define WCSRCHR __wcsrchr_power6 + +#include <sysdeps/powerpc/power6/wcsrchr.c> diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/wcsrchr-power7.c b/sysdeps/powerpc/powerpc32/power4/multiarch/wcsrchr-power7.c new file mode 100644 index 0000000000..3422816689 --- /dev/null +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/wcsrchr-power7.c @@ -0,0 +1,20 @@ +/* Copyright (C) 2013 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + +#define WCSRCHR __wcsrchr_power7 + +#include <sysdeps/powerpc/power6/wcsrchr.c> diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/wcsrchr-ppc32.c b/sysdeps/powerpc/powerpc32/power4/multiarch/wcsrchr-ppc32.c new file mode 100644 index 0000000000..b33eadacd8 --- /dev/null +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/wcsrchr-ppc32.c @@ -0,0 +1,26 @@ +/* Copyright (C) 2013 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + +#include <wchar.h> + +#ifndef NOT_IN_libc +# define WCSRCHR __wcsrchr_ppc +#endif + +extern __typeof (wcsrchr) __wcsrchr_ppc; + +#include <wcsmbs/wcsrchr.c> diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/wcsrchr.c b/sysdeps/powerpc/powerpc32/power4/multiarch/wcsrchr.c new file mode 100644 index 0000000000..cd0b87e935 --- /dev/null +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/wcsrchr.c @@ -0,0 +1,36 @@ +/* Multiple versions of wcsrchr + Copyright (C) 2013 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + +#ifndef NOT_IN_libc +# include <wchar.h> +# include <shlib-compat.h> +# include "init-arch.h" + +extern __typeof (wcsrchr) __wcsrchr_ppc attribute_hidden; +extern __typeof (wcsrchr) __wcsrchr_power6 attribute_hidden; +extern __typeof (wcsrchr) __wcsrchr_power7 attribute_hidden; + +libc_ifunc (wcsrchr, + (hwcap & PPC_FEATURE_HAS_VSX) + ? __wcsrchr_power7 : + (hwcap & PPC_FEATURE_ARCH_2_05) + ? __wcsrchr_power6 + : __wcsrchr_ppc); +#else +#include <wcsmbs/wcsrchr.c> +#endif diff --git a/sysdeps/powerpc/powerpc64/power6/wcsrchr.c b/sysdeps/powerpc/powerpc64/power6/wcsrchr.c index 2327c05b04..b86472d7bd 100644 --- a/sysdeps/powerpc/powerpc64/power6/wcsrchr.c +++ b/sysdeps/powerpc/powerpc64/power6/wcsrchr.c @@ -1 +1 @@ -#include "../../powerpc32/power6/wcsrchr.c" +#include <sysdeps/powerpc/power6/wcsrchr.c> diff --git a/wcsmbs/wcsrchr.c b/wcsmbs/wcsrchr.c index e30b851b7e..a8e7c5e73f 100644 --- a/wcsmbs/wcsrchr.c +++ b/wcsmbs/wcsrchr.c @@ -18,10 +18,13 @@ #include <wchar.h> +#ifndef WCSRCHR +# define WCSRCHR wcsrchr +#endif /* Find the last occurrence of WC in WCS. */ wchar_t * -wcsrchr (wcs, wc) +WCSRCHR (wcs, wc) const wchar_t *wcs; const wchar_t wc; { |