diff options
| -rw-r--r-- | ChangeLog | 18 | ||||
| -rw-r--r-- | sysdeps/powerpc/power6/wcschr.c (renamed from sysdeps/powerpc/powerpc32/power6/wcschr.c) | 9 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc32/power4/multiarch/Makefile | 5 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc32/power4/multiarch/ifunc-impl-list.c | 11 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-power6.c | 26 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-power7.c | 26 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-ppc32.c | 31 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc32/power4/multiarch/wcschr.c | 38 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc64/power6/wcschr.c | 2 |
9 files changed, 160 insertions, 6 deletions
@@ -1,5 +1,23 @@ 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 + file. + * sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-ppc32.c: New file. + * sysdeps/powerpc/powerpc32/power4/multiarch/wcschr.c: New file: + multiarch wcschr 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/wcschr.c: Move ... + * sysdeps/powerpc/power6/wcschr.c: ... to here. + * sysdeps/powerpc/powerpc64/power6/wcschr.c: Adjust to use + sysdeps/powerpc/power6/wcschr.c. + +2013-12-06 Adhemerval Zanella <azanella@linux.vnet.ibm.com> + * sysdeps/powerpc/powerpc32/power4/multiarch/rtld-strchr.S: New file. * sysdeps/powerpc/powerpc32/power4/multiarch/strchr-power7.S: New file. diff --git a/sysdeps/powerpc/powerpc32/power6/wcschr.c b/sysdeps/powerpc/power6/wcschr.c index 1ba64e1..e58b623 100644 --- a/sysdeps/powerpc/powerpc32/power6/wcschr.c +++ b/sysdeps/powerpc/power6/wcschr.c @@ -1,4 +1,4 @@ -/* wcschr.c - Wide Character Search for powerpc32/power6. +/* wcschr.c - Wide Character 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 WCSCHR +# define WCSCHR wcschr +#endif /* Find the first occurrence of WC in WCS. */ wchar_t * -wcschr (wcs, wc) - const wchar_t *wcs; - const wchar_t wc; +WCSCHR (const wchar_t *wcs, const wchar_t wc) { const wchar_t *wcs2 = wcs + 1; diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/Makefile b/sysdeps/powerpc/powerpc32/power4/multiarch/Makefile index a8ce149..12b180e 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/Makefile +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/Makefile @@ -8,8 +8,11 @@ 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 + strchr-power7 strchr-ppc32 wcschr-power7 wcschr-power6 \ + wcschr-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 endif diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/ifunc-impl-list.c b/sysdeps/powerpc/powerpc32/power4/multiarch/ifunc-impl-list.c index 81755e7..a602bea 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/ifunc-impl-list.c +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/ifunc-impl-list.c @@ -181,5 +181,16 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, IFUNC_IMPL_ADD (array, i, strchr, 1, __strchr_ppc)) + /* Support sysdeps/powerpc/powerpc32/power4/multiarch/wcschr.c. */ + IFUNC_IMPL (i, name, wcschr, + IFUNC_IMPL_ADD (array, i, wcschr, + hwcap & PPC_FEATURE_HAS_VSX, + __wcschr_power7) + IFUNC_IMPL_ADD (array, i, wcschr, + hwcap & PPC_FEATURE_ARCH_2_05, + __wcschr_power6) + IFUNC_IMPL_ADD (array, i, wcschr, 1, + __wcschr_ppc)) + return i; } diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-power6.c b/sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-power6.c new file mode 100644 index 0000000..7d1f45a --- /dev/null +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-power6.c @@ -0,0 +1,26 @@ +/* wcschr.c - Wide Character Search for powerpc32/power6. + 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; see the file COPYING.LIB. If + not, see <http://www.gnu.org/licenses/>. */ + +#include <wchar.h> + +#define WCSCHR __wcschr_power6 + +#undef libc_hidden_def +#define libc_hidden_def(name) + +#include <sysdeps/powerpc/power6/wcschr.c> diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-power7.c b/sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-power7.c new file mode 100644 index 0000000..9e6c99c --- /dev/null +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-power7.c @@ -0,0 +1,26 @@ +/* wcschr.c - Wide Character Search for powerpc32/power7. + 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; see the file COPYING.LIB. If + not, see <http://www.gnu.org/licenses/>. */ + +#include <wchar.h> + +#define WCSCHR __wcschr_power7 + +#undef libc_hidden_def +#define libc_hidden_def(name) + +#include <sysdeps/powerpc/power6/wcschr.c> diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-ppc32.c b/sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-ppc32.c new file mode 100644 index 0000000..477341e --- /dev/null +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-ppc32.c @@ -0,0 +1,31 @@ +/* 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 +# ifdef SHARED +# undef libc_hidden_def +# define libc_hidden_def(name) \ + __hidden_ver1 (__wcschr_ppc, __GI_wcschr, __wcschr_ppc); +# endif +# define WCSCHR __wcschr_ppc +#endif + +extern __typeof (wcschr) __wcschr_ppc; + +#include <wcsmbs/wcschr.c> diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/wcschr.c b/sysdeps/powerpc/powerpc32/power4/multiarch/wcschr.c new file mode 100644 index 0000000..51fbefe --- /dev/null +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/wcschr.c @@ -0,0 +1,38 @@ +/* Multiple versions of wcschr + 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 (wcschr) __wcschr_ppc attribute_hidden; +extern __typeof (wcschr) __wcschr_power6 attribute_hidden; +extern __typeof (wcschr) __wcschr_power7 attribute_hidden; + +libc_ifunc (wcschr, + (hwcap & PPC_FEATURE_HAS_VSX) + ? __wcschr_power7 : + (hwcap & PPC_FEATURE_ARCH_2_05) + ? __wcschr_power6 + : __wcschr_ppc); +#else +#undef libc_hidden_def +#define libc_hidden_def(a) +#include <wcsmbs/wcschr.c> +#endif diff --git a/sysdeps/powerpc/powerpc64/power6/wcschr.c b/sysdeps/powerpc/powerpc64/power6/wcschr.c index 9136c02..ae04a13 100644 --- a/sysdeps/powerpc/powerpc64/power6/wcschr.c +++ b/sysdeps/powerpc/powerpc64/power6/wcschr.c @@ -1 +1 @@ -#include "../../powerpc32/power6/wcschr.c" +#include <sysdeps/powerpc/power6/wcschr.c> |