diff options
| author | Stefan Liebler <stli@linux.ibm.com> | 2018-12-18 13:57:23 +0100 |
|---|---|---|
| committer | Stefan Liebler <stli@linux.ibm.com> | 2018-12-18 13:57:23 +0100 |
| commit | 8e87c1f6d45a63dc2175825c2dc5d66192a13aab (patch) | |
| tree | db2faa21872a7ff359be90777b0ccb388fbcb2f0 /sysdeps/s390/wcspbrk.c | |
| parent | 8507e831907ff46d06382fe453c6832db2594e0b (diff) | |
| download | glibc-8e87c1f6d45a63dc2175825c2dc5d66192a13aab.tar glibc-8e87c1f6d45a63dc2175825c2dc5d66192a13aab.tar.gz glibc-8e87c1f6d45a63dc2175825c2dc5d66192a13aab.tar.bz2 glibc-8e87c1f6d45a63dc2175825c2dc5d66192a13aab.zip | |
S390: Refactor wcspbrk ifunc handling.
The ifunc handling for wcspbrk is adjusted in order to omit ifunc
if the minimum architecture level already supports newer CPUs by default.
Unfortunately the c ifunc variant can't be omitted at all as it is used
by the z13 ifunc variant as fallback if the pointers are not 4-byte aligned.
Glibc internal calls will use the "newer" ifunc variant.
ChangeLog:
* sysdeps/s390/multiarch/Makefile
(sysdep_routines): Remove wcspbrk variants.
* sysdeps/s390/Makefile (sysdep_routines): Add wcspbrk variants.
* sysdeps/s390/multiarch/ifunc-impl-list.c
(__libc_ifunc_impl_list): Refactor ifunc handling for wcspbrk.
* sysdeps/s390/multiarch/wcspbrk-c.c: Move to ...
* sysdeps/s390/wcspbrk-c.c: ... here and adjust ifunc handling.
* sysdeps/s390/multiarch/wcspbrk-vx.S: Move to ...
* sysdeps/s390/wcspbrk-vx.S: ... here and adjust ifunc handling.
* sysdeps/s390/multiarch/wcspbrk.c: Move to ...
* sysdeps/s390/wcspbrk.c: ... here and adjust ifunc handling.
* sysdeps/s390/ifunc-wcspbrk.h: New file.
Diffstat (limited to 'sysdeps/s390/wcspbrk.c')
| -rw-r--r-- | sysdeps/s390/wcspbrk.c | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/sysdeps/s390/wcspbrk.c b/sysdeps/s390/wcspbrk.c new file mode 100644 index 0000000000..84ab911a24 --- /dev/null +++ b/sysdeps/s390/wcspbrk.c @@ -0,0 +1,39 @@ +/* Multiple versions of wcspbrk. + Copyright (C) 2015-2018 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 <ifunc-wcspbrk.h> + +#if HAVE_WCSPBRK_IFUNC +# define wcspbrk __redirect_wcspbrk +# include <wchar.h> +# undef wcspbrk +# include <ifunc-resolve.h> +# if HAVE_WCSPBRK_C +extern __typeof (__redirect_wcspbrk) WCSPBRK_C attribute_hidden; +# endif + +# if HAVE_WCSPBRK_Z13 +extern __typeof (__redirect_wcspbrk) WCSPBRK_Z13 attribute_hidden; +# endif + +s390_libc_ifunc_expr (__redirect_wcspbrk, wcspbrk, + (HAVE_WCSPBRK_Z13 && (hwcap & HWCAP_S390_VX)) + ? WCSPBRK_Z13 + : WCSPBRK_DEFAULT + ) +#endif |