diff options
| author | Stefan Liebler <stli@linux.ibm.com> | 2018-12-18 13:57:22 +0100 |
|---|---|---|
| committer | Stefan Liebler <stli@linux.ibm.com> | 2018-12-18 13:57:22 +0100 |
| commit | cf3ccc31a3d76a9b4db410d3087055c3aff2b71b (patch) | |
| tree | bda4472e79d7bfbc3cf1c9d4d37bb88eb63e6529 /sysdeps/s390/wcschr.c | |
| parent | e9873e1d47c870d707117ada91c9be21e3bf1537 (diff) | |
| download | glibc-cf3ccc31a3d76a9b4db410d3087055c3aff2b71b.tar.gz | |
S390: Refactor wcschr ifunc handling.
The ifunc handling for wcschr 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 wcschr variants.
* sysdeps/s390/Makefile (sysdep_routines): Add wcschr variants.
* sysdeps/s390/multiarch/ifunc-impl-list.c
(__libc_ifunc_impl_list): Refactor ifunc handling for wcschr.
* sysdeps/s390/multiarch/wcschr-c.c: Move to ...
* sysdeps/s390/wcschr-c.c: ... here and adjust ifunc handling.
* sysdeps/s390/multiarch/wcschr-vx.S: Move to ...
* sysdeps/s390/wcschr-vx.S: ... here and adjust ifunc handling.
* sysdeps/s390/multiarch/wcschr.c: Move to ...
* sysdeps/s390/wcschr.c: ... here and adjust ifunc handling.
* sysdeps/s390/ifunc-wcschr.h: New file.
Diffstat (limited to 'sysdeps/s390/wcschr.c')
| -rw-r--r-- | sysdeps/s390/wcschr.c | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/sysdeps/s390/wcschr.c b/sysdeps/s390/wcschr.c new file mode 100644 index 0000000000..9923864ff8 --- /dev/null +++ b/sysdeps/s390/wcschr.c @@ -0,0 +1,43 @@ +/* Multiple versions of wcschr. + 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-wcschr.h> + +#if HAVE_WCSCHR_IFUNC +# define wcschr __redirect_wcschr +# define __wcschr __redirect___wcschr +# include <wchar.h> +# undef wcschr +# undef __wcschr +# include <ifunc-resolve.h> + +# if HAVE_WCSCHR_C +extern __typeof (__redirect___wcschr) WCSCHR_C attribute_hidden; +# endif + +# if HAVE_WCSCHR_Z13 +extern __typeof (__redirect___wcschr) WCSCHR_Z13 attribute_hidden; +# endif + +s390_libc_ifunc_expr (__redirect___wcschr, __wcschr, + (HAVE_WCSCHR_Z13 && (hwcap & HWCAP_S390_VX)) + ? WCSCHR_Z13 + : WCSCHR_DEFAULT + ) +weak_alias (__wcschr, wcschr) +#endif |