diff options
| author | Stefan Liebler <stli@linux.ibm.com> | 2018-12-18 13:57:20 +0100 |
|---|---|---|
| committer | Stefan Liebler <stli@linux.ibm.com> | 2018-12-18 13:57:20 +0100 |
| commit | 3389cae427b4032c3a991cb32b5178a85a652d84 (patch) | |
| tree | e4d75b13a9d6ed47455a9f9f6a9912347253582e /sysdeps/s390/multiarch/ifunc-impl-list.c | |
| parent | c3081bcbd91a619115f047c2ceea90a9090d5216 (diff) | |
| download | glibc-3389cae427b4032c3a991cb32b5178a85a652d84.tar.gz glibc-3389cae427b4032c3a991cb32b5178a85a652d84.tar.xz glibc-3389cae427b4032c3a991cb32b5178a85a652d84.zip | |
S390: Refactor wcscat ifunc handling.
The ifunc handling for wcscat 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 wcscat variants. * sysdeps/s390/Makefile (sysdep_routines): Add wcscat variants. * sysdeps/s390/multiarch/ifunc-impl-list.c (__libc_ifunc_impl_list): Refactor ifunc handling for wcscat. * sysdeps/s390/multiarch/wcscat-c.c: Move to ... * sysdeps/s390/wcscat-c.c: ... here and adjust ifunc handling. * sysdeps/s390/multiarch/wcscat-vx.S: Move to ... * sysdeps/s390/wcscat-vx.S: ... here and adjust ifunc handling. * sysdeps/s390/multiarch/wcscat.c: Move to ... * sysdeps/s390/wcscat.c: ... here and adjust ifunc handling. * sysdeps/s390/ifunc-wcscat.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 e60238fcde..b05bd35fd8 100644 --- a/sysdeps/s390/multiarch/ifunc-impl-list.c +++ b/sysdeps/s390/multiarch/ifunc-impl-list.c @@ -52,6 +52,7 @@ #include <ifunc-wcpcpy.h> #include <ifunc-wcsncpy.h> #include <ifunc-wcpncpy.h> +#include <ifunc-wcscat.h> /* Maximum number of IFUNC implementations. */ #define MAX_IFUNC 3 @@ -502,6 +503,18 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, ) #endif /* HAVE_WCPNCPY_IFUNC */ +#if HAVE_WCSCAT_IFUNC + IFUNC_IMPL (i, name, wcscat, +# if HAVE_WCSCAT_Z13 + IFUNC_IMPL_ADD (array, i, wcscat, + dl_hwcap & HWCAP_S390_VX, WCSCAT_Z13) +# endif +# if HAVE_WCSCAT_C + IFUNC_IMPL_ADD (array, i, wcscat, 1, WCSCAT_C) +# endif + ) +#endif /* HAVE_WCSCAT_IFUNC */ + #ifdef HAVE_S390_VX_ASM_SUPPORT # define IFUNC_VX_IMPL(FUNC) \ @@ -510,8 +523,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 (wcscat); - IFUNC_VX_IMPL (wcsncat); IFUNC_VX_IMPL (wcscmp); |