diff options
| author | Stefan Liebler <stli@linux.ibm.com> | 2018-12-18 13:57:15 +0100 |
|---|---|---|
| committer | Stefan Liebler <stli@linux.ibm.com> | 2018-12-18 13:57:15 +0100 |
| commit | 572cca93fafa59d641c11372a9556722d95b038c (patch) | |
| tree | e5ae1e9e49baee47666af9423b2c83825fdb5a95 /sysdeps/s390/ifunc-strpbrk.h | |
| parent | 483fc56978d11c7118326f92ea678bea2f092300 (diff) | |
| download | glibc-572cca93fafa59d641c11372a9556722d95b038c.tar.gz glibc-572cca93fafa59d641c11372a9556722d95b038c.tar.xz glibc-572cca93fafa59d641c11372a9556722d95b038c.zip | |
S390: Refactor strpbrk ifunc handling.
The ifunc handling for strpbrk 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 strpbrk variants. * sysdeps/s390/Makefile (sysdep_routines): Add strpbrk variants. * sysdeps/s390/multiarch/ifunc-impl-list.c (__libc_ifunc_impl_list): Refactor ifunc handling for strpbrk. * sysdeps/s390/multiarch/strpbrk-c.c: Move to ... * sysdeps/s390/strpbrk-c.c: ... here and adjust ifunc handling. * sysdeps/s390/multiarch/strpbrk-vx.S: Move to ... * sysdeps/s390/strpbrk-vx.S: ... here and adjust ifunc handling. * sysdeps/s390/multiarch/strpbrk.c: Move to ... * sysdeps/s390/strpbrk.c: ... here and adjust ifunc handling. * sysdeps/s390/ifunc-strpbrk.h: New file.
Diffstat (limited to 'sysdeps/s390/ifunc-strpbrk.h')
| -rw-r--r-- | sysdeps/s390/ifunc-strpbrk.h | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/sysdeps/s390/ifunc-strpbrk.h b/sysdeps/s390/ifunc-strpbrk.h new file mode 100644 index 0000000000..4a3138c6bf --- /dev/null +++ b/sysdeps/s390/ifunc-strpbrk.h @@ -0,0 +1,52 @@ +/* strpbrk 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_STRPBRK_IFUNC 1 +#else +# define HAVE_STRPBRK_IFUNC 0 +#endif + +#ifdef HAVE_S390_VX_ASM_SUPPORT +# define HAVE_STRPBRK_IFUNC_AND_VX_SUPPORT HAVE_STRPBRK_IFUNC +#else +# define HAVE_STRPBRK_IFUNC_AND_VX_SUPPORT 0 +#endif + +#if defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT +# define STRPBRK_DEFAULT STRPBRK_Z13 +# define HAVE_STRPBRK_C 0 +# define HAVE_STRPBRK_Z13 1 +#else +# define STRPBRK_DEFAULT STRPBRK_C +# define HAVE_STRPBRK_C 1 +# define HAVE_STRPBRK_Z13 HAVE_STRPBRK_IFUNC_AND_VX_SUPPORT +#endif + +#if HAVE_STRPBRK_C +# define STRPBRK_C __strpbrk_c +#else +# define STRPBRK_C NULL +#endif + +#if HAVE_STRPBRK_Z13 +# define STRPBRK_Z13 __strpbrk_vx +#else +# define STRPBRK_Z13 NULL +#endif |