diff options
| author | Stefan Liebler <stli@linux.ibm.com> | 2018-12-18 13:57:24 +0100 |
|---|---|---|
| committer | Stefan Liebler <stli@linux.ibm.com> | 2018-12-18 13:57:24 +0100 |
| commit | c62534ae524111eae48b2c2adf3f9a2ca90824f5 (patch) | |
| tree | da07e010bcc14752b47a8b438daf39b502faf3a9 /sysdeps/s390/multiarch/ifunc-impl-list.c | |
| parent | 79b44cf61115bd48006227bb325b709f294c56f9 (diff) | |
| download | glibc-c62534ae524111eae48b2c2adf3f9a2ca90824f5.tar.gz glibc-c62534ae524111eae48b2c2adf3f9a2ca90824f5.tar.xz glibc-c62534ae524111eae48b2c2adf3f9a2ca90824f5.zip | |
S390: Refactor wmemchr ifunc handling.
The ifunc handling for wmemchr is adjusted in order to omit ifunc if the minimum architecture level already supports newer CPUs by default. Unfortunately the c ifunc variant can't be omitted at all as it is used by the z13 ifunc variant as fallback if the pointers are not 4-byte aligned. Glibc internal calls will use the "newer" ifunc variant. ChangeLog: * sysdeps/s390/multiarch/Makefile (sysdep_routines): Remove wmemchr variants. * sysdeps/s390/Makefile (sysdep_routines): Add wmemchr variants. * sysdeps/s390/multiarch/ifunc-impl-list.c (__libc_ifunc_impl_list): Refactor ifunc handling for wmemchr. * sysdeps/s390/multiarch/wmemchr-c.c: Move to ... * sysdeps/s390/wmemchr-c.c: ... here and adjust ifunc handling. * sysdeps/s390/multiarch/wmemchr-vx.S: Move to ... * sysdeps/s390/wmemchr-vx.S: ... here and adjust ifunc handling. * sysdeps/s390/multiarch/wmemchr.c: Move to ... * sysdeps/s390/wmemchr.c: ... here and adjust ifunc handling. * sysdeps/s390/ifunc-wmemchr.h: New file.
Diffstat (limited to 'sysdeps/s390/multiarch/ifunc-impl-list.c')
| -rw-r--r-- | sysdeps/s390/multiarch/ifunc-impl-list.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/sysdeps/s390/multiarch/ifunc-impl-list.c b/sysdeps/s390/multiarch/ifunc-impl-list.c index 7d8031a069..b5f55deb7f 100644 --- a/sysdeps/s390/multiarch/ifunc-impl-list.c +++ b/sysdeps/s390/multiarch/ifunc-impl-list.c @@ -62,6 +62,7 @@ #include <ifunc-wcsspn.h> #include <ifunc-wcspbrk.h> #include <ifunc-wcscspn.h> +#include <ifunc-wmemchr.h> /* Maximum number of IFUNC implementations. */ #define MAX_IFUNC 3 @@ -632,6 +633,18 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, ) #endif /* HAVE_WCSCSPN_IFUNC */ +#if HAVE_WMEMCHR_IFUNC + IFUNC_IMPL (i, name, wmemchr, +# if HAVE_WMEMCHR_Z13 + IFUNC_IMPL_ADD (array, i, wmemchr, + dl_hwcap & HWCAP_S390_VX, WMEMCHR_Z13) +# endif +# if HAVE_WMEMCHR_C + IFUNC_IMPL_ADD (array, i, wmemchr, 1, WMEMCHR_C) +# endif + ) +#endif /* HAVE_WMEMCHR_IFUNC */ + #ifdef HAVE_S390_VX_ASM_SUPPORT # define IFUNC_VX_IMPL(FUNC) \ @@ -640,8 +653,6 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, __##FUNC##_vx) \ IFUNC_IMPL_ADD (array, i, FUNC, 1, __##FUNC##_c)) - IFUNC_VX_IMPL (wmemchr); - IFUNC_VX_IMPL (wmemset); IFUNC_VX_IMPL (wmemcmp); |