diff options
| author | Stefan Liebler <stli@linux.ibm.com> | 2018-12-18 13:57:17 +0100 |
|---|---|---|
| committer | Stefan Liebler <stli@linux.ibm.com> | 2018-12-18 13:57:17 +0100 |
| commit | 2e02d0b7a9bf3421638d2d0f2526275a1df5c0da (patch) | |
| tree | 88c02093fb6a962263e75eab11a31a8265ef40b6 /sysdeps/s390/multiarch/ifunc-impl-list.c | |
| parent | 89bfcbdf9d3d36eff0d544f655991149a7ae680b (diff) | |
| download | glibc-2e02d0b7a9bf3421638d2d0f2526275a1df5c0da.tar.gz glibc-2e02d0b7a9bf3421638d2d0f2526275a1df5c0da.tar.xz glibc-2e02d0b7a9bf3421638d2d0f2526275a1df5c0da.zip | |
S390: Refactor wcslen ifunc handling.
The ifunc handling for wcslen 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 wcslen variants. * sysdeps/s390/Makefile (sysdep_routines): Add wcslen variants. * sysdeps/s390/multiarch/ifunc-impl-list.c (__libc_ifunc_impl_list): Refactor ifunc handling for wcslen. * sysdeps/s390/multiarch/wcslen-c.c: Move to ... * sysdeps/s390/wcslen-c.c: ... here and adjust ifunc handling. * sysdeps/s390/multiarch/wcslen-vx.S: Move to ... * sysdeps/s390/wcslen-vx.S: ... here and adjust ifunc handling. * sysdeps/s390/multiarch/wcslen.c: Move to ... * sysdeps/s390/wcslen.c: ... here and adjust ifunc handling. * sysdeps/s390/ifunc-wcslen.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 0f01b99691..7bf5f14c01 100644 --- a/sysdeps/s390/multiarch/ifunc-impl-list.c +++ b/sysdeps/s390/multiarch/ifunc-impl-list.c @@ -46,6 +46,7 @@ #include <ifunc-rawmemchr.h> #include <ifunc-memccpy.h> #include <ifunc-memrchr.h> +#include <ifunc-wcslen.h> /* Maximum number of IFUNC implementations. */ #define MAX_IFUNC 3 @@ -424,6 +425,18 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, ) #endif /* HAVE_MEMRCHR_IFUNC */ +#if HAVE_WCSLEN_IFUNC + IFUNC_IMPL (i, name, wcslen, +# if HAVE_WCSLEN_Z13 + IFUNC_IMPL_ADD (array, i, wcslen, + dl_hwcap & HWCAP_S390_VX, WCSLEN_Z13) +# endif +# if HAVE_WCSLEN_C + IFUNC_IMPL_ADD (array, i, wcslen, 1, WCSLEN_C) +# endif + ) +#endif /* HAVE_WCSLEN_IFUNC */ + #ifdef HAVE_S390_VX_ASM_SUPPORT # define IFUNC_VX_IMPL(FUNC) \ @@ -432,8 +445,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 (wcslen); - IFUNC_VX_IMPL (wcsnlen); IFUNC_VX_IMPL (wcscpy); |