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 | 79b44cf61115bd48006227bb325b709f294c56f9 (patch) | |
tree | 90ab47045117506151aaaf876a39a2e549b1acc4 /sysdeps/s390/wcscspn.c | |
parent | 8e87c1f6d45a63dc2175825c2dc5d66192a13aab (diff) | |
download | glibc-79b44cf61115bd48006227bb325b709f294c56f9.zip glibc-79b44cf61115bd48006227bb325b709f294c56f9.tar.gz glibc-79b44cf61115bd48006227bb325b709f294c56f9.tar.bz2 |
S390: Refactor wcscspn ifunc handling.
The ifunc handling for wcscspn 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.
ChangeLog:
* sysdeps/s390/multiarch/Makefile
(sysdep_routines): Remove wcscspn variants.
* sysdeps/s390/Makefile (sysdep_routines): Add wcscspn variants.
* sysdeps/s390/multiarch/ifunc-impl-list.c
(__libc_ifunc_impl_list): Refactor ifunc handling for wcscspn.
* sysdeps/s390/multiarch/wcscspn-c.c: Move to ...
* sysdeps/s390/wcscspn-c.c: ... here and adjust ifunc handling.
* sysdeps/s390/multiarch/wcscspn-vx.S: Move to ...
* sysdeps/s390/wcscspn-vx.S: ... here and adjust ifunc handling.
* sysdeps/s390/multiarch/wcscspn.c: Move to ...
* sysdeps/s390/wcscspn.c: ... here and adjust ifunc handling.
* sysdeps/s390/ifunc-wcscspn.h: New file.
Diffstat (limited to 'sysdeps/s390/wcscspn.c')
-rw-r--r-- | sysdeps/s390/wcscspn.c | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/sysdeps/s390/wcscspn.c b/sysdeps/s390/wcscspn.c new file mode 100644 index 0000000..0ce31b8 --- /dev/null +++ b/sysdeps/s390/wcscspn.c @@ -0,0 +1,38 @@ +/* Multiple versions of wcscspn. + 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-wcscspn.h> + +#if HAVE_WCSCSPN_IFUNC +# include <wchar.h> +# include <ifunc-resolve.h> + +# if HAVE_WCSCSPN_C +extern __typeof (wcscspn) WCSCSPN_C attribute_hidden; +# endif + +# if HAVE_WCSCSPN_Z13 +extern __typeof (wcscspn) WCSCSPN_Z13 attribute_hidden; +# endif + +s390_libc_ifunc_expr (wcscspn, wcscspn, + (HAVE_WCSCSPN_Z13 && (hwcap & HWCAP_S390_VX)) + ? WCSCSPN_Z13 + : WCSCSPN_DEFAULT + ) +#endif |