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/multiarch/ifunc-impl-list.c | |
| 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/multiarch/ifunc-impl-list.c')
| -rw-r--r-- | sysdeps/s390/multiarch/ifunc-impl-list.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/sysdeps/s390/multiarch/ifunc-impl-list.c b/sysdeps/s390/multiarch/ifunc-impl-list.c index c39e1f793a..8e23416730 100644 --- a/sysdeps/s390/multiarch/ifunc-impl-list.c +++ b/sysdeps/s390/multiarch/ifunc-impl-list.c @@ -40,6 +40,7 @@ #include <ifunc-strchrnul.h> #include <ifunc-strrchr.h> #include <ifunc-strspn.h> +#include <ifunc-strpbrk.h> /* Maximum number of IFUNC implementations. */ #define MAX_IFUNC 3 @@ -346,6 +347,18 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, ) #endif /* HAVE_STRSPN_IFUNC */ +#if HAVE_STRPBRK_IFUNC + IFUNC_IMPL (i, name, strpbrk, +# if HAVE_STRPBRK_Z13 + IFUNC_IMPL_ADD (array, i, strpbrk, + dl_hwcap & HWCAP_S390_VX, STRPBRK_Z13) +# endif +# if HAVE_STRPBRK_C + IFUNC_IMPL_ADD (array, i, strpbrk, 1, STRPBRK_C) +# endif + ) +#endif /* HAVE_STRPBRK_IFUNC */ + #ifdef HAVE_S390_VX_ASM_SUPPORT # define IFUNC_VX_IMPL(FUNC) \ @@ -382,7 +395,6 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, IFUNC_VX_IMPL (wcsspn); - IFUNC_VX_IMPL (strpbrk); IFUNC_VX_IMPL (wcspbrk); IFUNC_VX_IMPL (strcspn); |