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 | 26ea8760877cf03272e98c21eb1a7745ceca76c4 (patch) | |
| tree | a9a5b1e89987738a2358df4e681b105485b0c980 /sysdeps/s390/strrchr.c | |
| parent | a1361e65617c660a3ba7d561e081dcd18762a688 (diff) | |
| download | glibc-26ea8760877cf03272e98c21eb1a7745ceca76c4.zip glibc-26ea8760877cf03272e98c21eb1a7745ceca76c4.tar.gz glibc-26ea8760877cf03272e98c21eb1a7745ceca76c4.tar.bz2 | |
S390: Refactor strrchr ifunc handling.
The ifunc handling for strrchr 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 strrchr variants.
* sysdeps/s390/Makefile (sysdep_routines): Add strrchr variants.
* sysdeps/s390/multiarch/ifunc-impl-list.c
(__libc_ifunc_impl_list): Refactor ifunc handling for strrchr.
* sysdeps/s390/multiarch/strrchr-c.c: Move to ...
* sysdeps/s390/strrchr-c.c: ... here and adjust ifunc handling.
* sysdeps/s390/multiarch/strrchr-vx.S: Move to ...
* sysdeps/s390/strrchr-vx.S: ... here and adjust ifunc handling.
* sysdeps/s390/multiarch/strrchr.c: Move to ...
* sysdeps/s390/strrchr.c: ... here and adjust ifunc handling.
* sysdeps/s390/ifunc-strrchr.h: New file.
Diffstat (limited to 'sysdeps/s390/strrchr.c')
| -rw-r--r-- | sysdeps/s390/strrchr.c | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/sysdeps/s390/strrchr.c b/sysdeps/s390/strrchr.c new file mode 100644 index 0000000..9a8cecf --- /dev/null +++ b/sysdeps/s390/strrchr.c @@ -0,0 +1,41 @@ +/* Multiple versions of strrchr. + 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-strrchr.h> + +#if HAVE_STRRCHR_IFUNC +# define strrchr __redirect_strrchr +# include <string.h> +# undef strrchr +# include <ifunc-resolve.h> + +# if HAVE_STRRCHR_C +extern __typeof (__redirect_strrchr) STRRCHR_C attribute_hidden; +# endif + +# if HAVE_STRRCHR_Z13 +extern __typeof (__redirect_strrchr) STRRCHR_Z13 attribute_hidden; +# endif + +s390_libc_ifunc_expr (__redirect_strrchr, strrchr, + (HAVE_STRRCHR_Z13 && (hwcap & HWCAP_S390_VX)) + ? STRRCHR_Z13 + : STRRCHR_DEFAULT + ) +weak_alias (strrchr, rindex) +#endif /* HAVE_STRRCHR_IFUNC */ |