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 | 814a76e1bcc59e6c4899279ede887bf9fecf5a40 (patch) | |
| tree | 8dd3160e2dcdbd4cbce3d044dcf7c52be0131ca0 /sysdeps/s390/multiarch/ifunc-impl-list.c | |
| parent | 3389cae427b4032c3a991cb32b5178a85a652d84 (diff) | |
| download | glibc-814a76e1bcc59e6c4899279ede887bf9fecf5a40.tar.gz glibc-814a76e1bcc59e6c4899279ede887bf9fecf5a40.tar.xz glibc-814a76e1bcc59e6c4899279ede887bf9fecf5a40.zip | |
S390: Refactor wcsncat ifunc handling.
The ifunc handling for wcsncat 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 wcsncat variants. * sysdeps/s390/Makefile (sysdep_routines): Add wcsncat variants. * sysdeps/s390/multiarch/ifunc-impl-list.c (__libc_ifunc_impl_list): Refactor ifunc handling for wcsncat. * sysdeps/s390/multiarch/wcsncat-c.c: Move to ... * sysdeps/s390/wcsncat-c.c: ... here and adjust ifunc handling. * sysdeps/s390/multiarch/wcsncat-vx.S: Move to ... * sysdeps/s390/wcsncat-vx.S: ... here and adjust ifunc handling. * sysdeps/s390/multiarch/wcsncat.c: Move to ... * sysdeps/s390/wcsncat.c: ... here and adjust ifunc handling. * sysdeps/s390/ifunc-wcsncat.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 b05bd35fd8..7b7b1e7497 100644 --- a/sysdeps/s390/multiarch/ifunc-impl-list.c +++ b/sysdeps/s390/multiarch/ifunc-impl-list.c @@ -53,6 +53,7 @@ #include <ifunc-wcsncpy.h> #include <ifunc-wcpncpy.h> #include <ifunc-wcscat.h> +#include <ifunc-wcsncat.h> /* Maximum number of IFUNC implementations. */ #define MAX_IFUNC 3 @@ -515,6 +516,18 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, ) #endif /* HAVE_WCSCAT_IFUNC */ +#if HAVE_WCSNCAT_IFUNC + IFUNC_IMPL (i, name, wcsncat, +# if HAVE_WCSNCAT_Z13 + IFUNC_IMPL_ADD (array, i, wcsncat, + dl_hwcap & HWCAP_S390_VX, WCSNCAT_Z13) +# endif +# if HAVE_WCSNCAT_C + IFUNC_IMPL_ADD (array, i, wcsncat, 1, WCSNCAT_C) +# endif + ) +#endif /* HAVE_WCSNCAT_IFUNC */ + #ifdef HAVE_S390_VX_ASM_SUPPORT # define IFUNC_VX_IMPL(FUNC) \ @@ -523,8 +536,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 (wcsncat); - IFUNC_VX_IMPL (wcscmp); IFUNC_VX_IMPL (wcsncmp); |