diff options
| author | Stefan Liebler <stli@linux.ibm.com> | 2018-12-18 13:57:22 +0100 |
|---|---|---|
| committer | Stefan Liebler <stli@linux.ibm.com> | 2018-12-18 13:57:22 +0100 |
| commit | 4753713aaed400d88cfc598e25d504478120b065 (patch) | |
| tree | 99af0df98fb82cd59be28de908c79b95d78258b9 /sysdeps/s390/multiarch/ifunc-impl-list.c | |
| parent | c09c1b6f014a45f6c4ba189f5ae94b1fb1a2982a (diff) | |
| download | glibc-4753713aaed400d88cfc598e25d504478120b065.tar.gz glibc-4753713aaed400d88cfc598e25d504478120b065.tar.xz glibc-4753713aaed400d88cfc598e25d504478120b065.zip | |
S390: Refactor wcsrchr ifunc handling.
The ifunc handling for wcsrchr 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. ChangeLog: * sysdeps/s390/multiarch/Makefile (sysdep_routines): Remove wcsrchr variants. * sysdeps/s390/Makefile (sysdep_routines): Add wcsrchr variants. * sysdeps/s390/multiarch/ifunc-impl-list.c (__libc_ifunc_impl_list): Refactor ifunc handling for wcsrchr. * sysdeps/s390/multiarch/wcsrchr-c.c: Move to ... * sysdeps/s390/wcsrchr-c.c: ... here and adjust ifunc handling. * sysdeps/s390/multiarch/wcsrchr-vx.S: Move to ... * sysdeps/s390/wcsrchr-vx.S: ... here and adjust ifunc handling. * sysdeps/s390/multiarch/wcsrchr.c: Move to ... * sysdeps/s390/wcsrchr.c: ... here and adjust ifunc handling. * sysdeps/s390/ifunc-wcsrchr.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 553a76c39e..ffb4d5b687 100644 --- a/sysdeps/s390/multiarch/ifunc-impl-list.c +++ b/sysdeps/s390/multiarch/ifunc-impl-list.c @@ -58,6 +58,7 @@ #include <ifunc-wcsncmp.h> #include <ifunc-wcschr.h> #include <ifunc-wcschrnul.h> +#include <ifunc-wcsrchr.h> /* Maximum number of IFUNC implementations. */ #define MAX_IFUNC 3 @@ -580,6 +581,18 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, ) #endif /* HAVE_WCSCHRNUL_IFUNC */ +#if HAVE_WCSRCHR_IFUNC + IFUNC_IMPL (i, name, wcsrchr, +# if HAVE_WCSRCHR_Z13 + IFUNC_IMPL_ADD (array, i, wcsrchr, + dl_hwcap & HWCAP_S390_VX, WCSRCHR_Z13) +# endif +# if HAVE_WCSRCHR_C + IFUNC_IMPL_ADD (array, i, wcsrchr, 1, WCSRCHR_C) +# endif + ) +#endif /* HAVE_WCSRCHR_IFUNC */ + #ifdef HAVE_S390_VX_ASM_SUPPORT # define IFUNC_VX_IMPL(FUNC) \ @@ -588,8 +601,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 (wcsrchr); - IFUNC_VX_IMPL (wcsspn); IFUNC_VX_IMPL (wcspbrk); |