diff options
| author | Stefan Liebler <stli@linux.ibm.com> | 2018-12-18 13:57:18 +0100 |
|---|---|---|
| committer | Stefan Liebler <stli@linux.ibm.com> | 2018-12-18 13:57:18 +0100 |
| commit | c7e7cd266ed123b6dfb722f599934ca5dcfd3e93 (patch) | |
| tree | 7ef5ef26b7fbed31024f59cefa691369968eea19 /sysdeps/s390/multiarch/ifunc-impl-list.c | |
| parent | 2e02d0b7a9bf3421638d2d0f2526275a1df5c0da (diff) | |
| download | glibc-c7e7cd266ed123b6dfb722f599934ca5dcfd3e93.tar.gz glibc-c7e7cd266ed123b6dfb722f599934ca5dcfd3e93.tar.xz glibc-c7e7cd266ed123b6dfb722f599934ca5dcfd3e93.zip | |
S390: Refactor wcsnlen ifunc handling.
The ifunc handling for wcsnlen 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 wcsnlen variants. * sysdeps/s390/Makefile (sysdep_routines): Add wcsnlen variants. * sysdeps/s390/multiarch/ifunc-impl-list.c (__libc_ifunc_impl_list): Refactor ifunc handling for wcsnlen. * sysdeps/s390/multiarch/wcsnlen-c.c: Move to ... * sysdeps/s390/wcsnlen-c.c: ... here and adjust ifunc handling. * sysdeps/s390/multiarch/wcsnlen-vx.S: Move to ... * sysdeps/s390/wcsnlen-vx.S: ... here and adjust ifunc handling. * sysdeps/s390/multiarch/wcsnlen.c: Move to ... * sysdeps/s390/wcsnlen.c: ... here and adjust ifunc handling. * sysdeps/s390/ifunc-wcsnlen.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 7bf5f14c01..c199fd0e0b 100644 --- a/sysdeps/s390/multiarch/ifunc-impl-list.c +++ b/sysdeps/s390/multiarch/ifunc-impl-list.c @@ -47,6 +47,7 @@ #include <ifunc-memccpy.h> #include <ifunc-memrchr.h> #include <ifunc-wcslen.h> +#include <ifunc-wcsnlen.h> /* Maximum number of IFUNC implementations. */ #define MAX_IFUNC 3 @@ -437,6 +438,18 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, ) #endif /* HAVE_WCSLEN_IFUNC */ +#if HAVE_WCSNLEN_IFUNC + IFUNC_IMPL (i, name, wcsnlen, +# if HAVE_WCSNLEN_Z13 + IFUNC_IMPL_ADD (array, i, wcsnlen, + dl_hwcap & HWCAP_S390_VX, WCSNLEN_Z13) +# endif +# if HAVE_WCSNLEN_C + IFUNC_IMPL_ADD (array, i, wcsnlen, 1, WCSNLEN_C) +# endif + ) +#endif /* HAVE_WCSNLEN_IFUNC */ + #ifdef HAVE_S390_VX_ASM_SUPPORT # define IFUNC_VX_IMPL(FUNC) \ @@ -445,8 +458,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 (wcsnlen); - IFUNC_VX_IMPL (wcscpy); IFUNC_VX_IMPL (wcpcpy); |