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 | a1361e65617c660a3ba7d561e081dcd18762a688 (patch) | |
| tree | ef08422408294839c89776412e25886e417a9734 /sysdeps/s390/ifunc-strchrnul.h | |
| parent | 32f12653d4ea2fbff409351bf8067f9a0b4a3963 (diff) | |
| download | glibc-a1361e65617c660a3ba7d561e081dcd18762a688.zip glibc-a1361e65617c660a3ba7d561e081dcd18762a688.tar.gz glibc-a1361e65617c660a3ba7d561e081dcd18762a688.tar.bz2 | |
S390: Refactor strchrnul ifunc handling.
The ifunc handling for strchrnul 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.
ChangeLog:
* sysdeps/s390/multiarch/Makefile
(sysdep_routines): Remove strchrnul variants.
* sysdeps/s390/Makefile (sysdep_routines): Add strchrnul variants.
* sysdeps/s390/multiarch/ifunc-impl-list.c
(__libc_ifunc_impl_list): Refactor ifunc handling for strchrnul.
* sysdeps/s390/multiarch/strchrnul-c.c: Move to ...
* sysdeps/s390/strchrnul-c.c: ... here and adjust ifunc handling.
* sysdeps/s390/multiarch/strchrnul-vx.S: Move to ...
* sysdeps/s390/strchrnul-vx.S: ... here and adjust ifunc handling.
* sysdeps/s390/multiarch/strchrnul.c: Move to ...
* sysdeps/s390/strchrnul.c: ... here and adjust ifunc handling.
* sysdeps/s390/ifunc-strchrnul.h: New file.
Diffstat (limited to 'sysdeps/s390/ifunc-strchrnul.h')
| -rw-r--r-- | sysdeps/s390/ifunc-strchrnul.h | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/sysdeps/s390/ifunc-strchrnul.h b/sysdeps/s390/ifunc-strchrnul.h new file mode 100644 index 0000000..cac817e --- /dev/null +++ b/sysdeps/s390/ifunc-strchrnul.h @@ -0,0 +1,52 @@ +/* strchrnul variant information on S/390 version. + Copyright (C) 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/>. */ + +#if defined USE_MULTIARCH && IS_IN (libc) \ + && ! defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT +# define HAVE_STRCHRNUL_IFUNC 1 +#else +# define HAVE_STRCHRNUL_IFUNC 0 +#endif + +#ifdef HAVE_S390_VX_ASM_SUPPORT +# define HAVE_STRCHRNUL_IFUNC_AND_VX_SUPPORT HAVE_STRCHRNUL_IFUNC +#else +# define HAVE_STRCHRNUL_IFUNC_AND_VX_SUPPORT 0 +#endif + +#if defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT +# define STRCHRNUL_DEFAULT STRCHRNUL_Z13 +# define HAVE_STRCHRNUL_C 0 +# define HAVE_STRCHRNUL_Z13 1 +#else +# define STRCHRNUL_DEFAULT STRCHRNUL_C +# define HAVE_STRCHRNUL_C 1 +# define HAVE_STRCHRNUL_Z13 HAVE_STRCHRNUL_IFUNC_AND_VX_SUPPORT +#endif + +#if HAVE_STRCHRNUL_C +# define STRCHRNUL_C __strchrnul_c +#else +# define STRCHRNUL_C NULL +#endif + +#if HAVE_STRCHRNUL_Z13 +# define STRCHRNUL_Z13 __strchrnul_vx +#else +# define STRCHRNUL_Z13 NULL +#endif |