diff options
| author | Stefan Liebler <stli@linux.ibm.com> | 2018-12-18 13:57:23 +0100 |
|---|---|---|
| committer | Stefan Liebler <stli@linux.ibm.com> | 2018-12-18 13:57:23 +0100 |
| commit | 8e87c1f6d45a63dc2175825c2dc5d66192a13aab (patch) | |
| tree | db2faa21872a7ff359be90777b0ccb388fbcb2f0 /sysdeps/s390/multiarch/ifunc-impl-list.c | |
| parent | 8507e831907ff46d06382fe453c6832db2594e0b (diff) | |
| download | glibc-8e87c1f6d45a63dc2175825c2dc5d66192a13aab.tar.gz glibc-8e87c1f6d45a63dc2175825c2dc5d66192a13aab.tar.xz glibc-8e87c1f6d45a63dc2175825c2dc5d66192a13aab.zip | |
S390: Refactor wcspbrk ifunc handling.
The ifunc handling for wcspbrk 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 wcspbrk variants. * sysdeps/s390/Makefile (sysdep_routines): Add wcspbrk variants. * sysdeps/s390/multiarch/ifunc-impl-list.c (__libc_ifunc_impl_list): Refactor ifunc handling for wcspbrk. * sysdeps/s390/multiarch/wcspbrk-c.c: Move to ... * sysdeps/s390/wcspbrk-c.c: ... here and adjust ifunc handling. * sysdeps/s390/multiarch/wcspbrk-vx.S: Move to ... * sysdeps/s390/wcspbrk-vx.S: ... here and adjust ifunc handling. * sysdeps/s390/multiarch/wcspbrk.c: Move to ... * sysdeps/s390/wcspbrk.c: ... here and adjust ifunc handling. * sysdeps/s390/ifunc-wcspbrk.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 6f4de2845b..89d6e8ad7e 100644 --- a/sysdeps/s390/multiarch/ifunc-impl-list.c +++ b/sysdeps/s390/multiarch/ifunc-impl-list.c @@ -60,6 +60,7 @@ #include <ifunc-wcschrnul.h> #include <ifunc-wcsrchr.h> #include <ifunc-wcsspn.h> +#include <ifunc-wcspbrk.h> /* Maximum number of IFUNC implementations. */ #define MAX_IFUNC 3 @@ -606,6 +607,18 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, ) #endif /* HAVE_WCSSPN_IFUNC */ +#if HAVE_WCSPBRK_IFUNC + IFUNC_IMPL (i, name, wcspbrk, +# if HAVE_WCSPBRK_Z13 + IFUNC_IMPL_ADD (array, i, wcspbrk, + dl_hwcap & HWCAP_S390_VX, WCSPBRK_Z13) +# endif +# if HAVE_WCSPBRK_C + IFUNC_IMPL_ADD (array, i, wcspbrk, 1, WCSPBRK_C) +# endif + ) +#endif /* HAVE_WCSPBRK_IFUNC */ + #ifdef HAVE_S390_VX_ASM_SUPPORT # define IFUNC_VX_IMPL(FUNC) \ @@ -614,8 +627,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 (wcspbrk); - IFUNC_VX_IMPL (wcscspn); IFUNC_VX_IMPL (wmemchr); |