diff options
| author | Stefan Liebler <stli@linux.ibm.com> | 2018-12-18 13:57:14 +0100 |
|---|---|---|
| committer | Stefan Liebler <stli@linux.ibm.com> | 2018-12-18 13:57:14 +0100 |
| commit | 32f12653d4ea2fbff409351bf8067f9a0b4a3963 (patch) | |
| tree | d35734238850cb4d53774f6656cef864c7ce34d5 /sysdeps/s390/strchr.c | |
| parent | 316b88421993d540513a6b25b59ec16df267e9b4 (diff) | |
| download | glibc-32f12653d4ea2fbff409351bf8067f9a0b4a3963.zip glibc-32f12653d4ea2fbff409351bf8067f9a0b4a3963.tar.gz glibc-32f12653d4ea2fbff409351bf8067f9a0b4a3963.tar.bz2 | |
S390: Refactor strchr ifunc handling.
The ifunc handling for strchr is adjusted in order to omit ifunc
variants if those will never be used as the minimum architecture level
already supports newer CPUs by default.
Glibc internal calls will then also use the "newer" ifunc variant.
ChangeLog:
* sysdeps/s390/multiarch/Makefile
(sysdep_routines): Remove strchr variants.
* sysdeps/s390/Makefile (sysdep_routines): Add strchr variants.
* sysdeps/s390/multiarch/ifunc-impl-list.c
(__libc_ifunc_impl_list): Refactor ifunc handling for strchr.
* sysdeps/s390/multiarch/strchr-c.c: Move to ...
* sysdeps/s390/strchr-c.c: ... here and adjust ifunc handling.
* sysdeps/s390/multiarch/strchr-vx.S: Move to ...
* sysdeps/s390/strchr-vx.S: ... here and adjust ifunc handling.
* sysdeps/s390/multiarch/strchr.c: Move to ...
* sysdeps/s390/strchr.c: ... here and adjust ifunc handling.
* sysdeps/s390/ifunc-strchr.h: New file.
Diffstat (limited to 'sysdeps/s390/strchr.c')
| -rw-r--r-- | sysdeps/s390/strchr.c | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/sysdeps/s390/strchr.c b/sysdeps/s390/strchr.c new file mode 100644 index 0000000..a106c61 --- /dev/null +++ b/sysdeps/s390/strchr.c @@ -0,0 +1,43 @@ +/* Multiple versions of strchr. + 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-strchr.h> + +#if HAVE_STRCHR_IFUNC +# define strchr __redirect_strchr +/* Omit the strchr inline definitions because it would redefine strchr. */ +# define __NO_STRING_INLINES +# include <string.h> +# undef strchr +# include <ifunc-resolve.h> + +# if HAVE_STRCHR_C +extern __typeof (__redirect_strchr) STRCHR_C attribute_hidden; +# endif + +# if HAVE_STRCHR_Z13 +extern __typeof (__redirect_strchr) STRCHR_Z13 attribute_hidden; +# endif + +s390_libc_ifunc_expr (__redirect_strchr, strchr, + (HAVE_STRCHR_Z13 && (hwcap & HWCAP_S390_VX)) + ? STRCHR_Z13 + : STRCHR_DEFAULT + ) +weak_alias (strchr, index) +#endif /* HAVE_STRCHR_IFUNC */ |