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/multiarch/ifunc-impl-list.c | |
| parent | 316b88421993d540513a6b25b59ec16df267e9b4 (diff) | |
| download | glibc-32f12653d4ea2fbff409351bf8067f9a0b4a3963.tar.gz glibc-32f12653d4ea2fbff409351bf8067f9a0b4a3963.tar.xz glibc-32f12653d4ea2fbff409351bf8067f9a0b4a3963.zip | |
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/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 d982de5788..e809ca3bac 100644 --- a/sysdeps/s390/multiarch/ifunc-impl-list.c +++ b/sysdeps/s390/multiarch/ifunc-impl-list.c @@ -36,6 +36,7 @@ #include <ifunc-strncat.h> #include <ifunc-strcmp.h> #include <ifunc-strncmp.h> +#include <ifunc-strchr.h> /* Maximum number of IFUNC implementations. */ #define MAX_IFUNC 3 @@ -294,6 +295,18 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, ) #endif /* HAVE_STRNCMP_IFUNC */ +#if HAVE_STRCHR_IFUNC + IFUNC_IMPL (i, name, strchr, +# if HAVE_STRCHR_Z13 + IFUNC_IMPL_ADD (array, i, strchr, + dl_hwcap & HWCAP_S390_VX, STRCHR_Z13) +# endif +# if HAVE_STRCHR_C + IFUNC_IMPL_ADD (array, i, strchr, 1, STRCHR_C) +# endif + ) +#endif /* HAVE_STRCHR_IFUNC */ + #ifdef HAVE_S390_VX_ASM_SUPPORT # define IFUNC_VX_IMPL(FUNC) \ @@ -322,7 +335,6 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, IFUNC_VX_IMPL (wcsncmp); - IFUNC_VX_IMPL (strchr); IFUNC_VX_IMPL (wcschr); IFUNC_VX_IMPL (strchrnul); |