diff options
| author | Stefan Liebler <stli@linux.ibm.com> | 2018-12-18 13:57:19 +0100 |
|---|---|---|
| committer | Stefan Liebler <stli@linux.ibm.com> | 2018-12-18 13:57:19 +0100 |
| commit | c3081bcbd91a619115f047c2ceea90a9090d5216 (patch) | |
| tree | de4450057f68e4c5b1c2d75446135ff0a068757a /sysdeps/s390/multiarch/ifunc-impl-list.c | |
| parent | 0966dd86896d7cd6c107c751ba7d3b69542ca11d (diff) | |
| download | glibc-c3081bcbd91a619115f047c2ceea90a9090d5216.tar.gz glibc-c3081bcbd91a619115f047c2ceea90a9090d5216.tar.xz glibc-c3081bcbd91a619115f047c2ceea90a9090d5216.zip | |
S390: Refactor wcpncpy ifunc handling.
The ifunc handling for wcpncpy 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 wcpncpy variants. * sysdeps/s390/Makefile (sysdep_routines): Add wcpncpy variants. * sysdeps/s390/multiarch/ifunc-impl-list.c (__libc_ifunc_impl_list): Refactor ifunc handling for wcpncpy. * sysdeps/s390/multiarch/wcpncpy-c.c: Move to ... * sysdeps/s390/wcpncpy-c.c: ... here and adjust ifunc handling. * sysdeps/s390/multiarch/wcpncpy-vx.S: Move to ... * sysdeps/s390/wcpncpy-vx.S: ... here and adjust ifunc handling. * sysdeps/s390/multiarch/wcpncpy.c: Move to ... * sysdeps/s390/wcpncpy.c: ... here and adjust ifunc handling. * sysdeps/s390/ifunc-wcpncpy.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 9ebaf4de6f..e60238fcde 100644 --- a/sysdeps/s390/multiarch/ifunc-impl-list.c +++ b/sysdeps/s390/multiarch/ifunc-impl-list.c @@ -51,6 +51,7 @@ #include <ifunc-wcscpy.h> #include <ifunc-wcpcpy.h> #include <ifunc-wcsncpy.h> +#include <ifunc-wcpncpy.h> /* Maximum number of IFUNC implementations. */ #define MAX_IFUNC 3 @@ -489,6 +490,18 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, ) #endif /* HAVE_WCSNCPY_IFUNC */ +#if HAVE_WCPNCPY_IFUNC + IFUNC_IMPL (i, name, wcpncpy, +# if HAVE_WCPNCPY_Z13 + IFUNC_IMPL_ADD (array, i, wcpncpy, + dl_hwcap & HWCAP_S390_VX, WCPNCPY_Z13) +# endif +# if HAVE_WCPNCPY_C + IFUNC_IMPL_ADD (array, i, wcpncpy, 1, WCPNCPY_C) +# endif + ) +#endif /* HAVE_WCPNCPY_IFUNC */ + #ifdef HAVE_S390_VX_ASM_SUPPORT # define IFUNC_VX_IMPL(FUNC) \ @@ -497,8 +510,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 (wcpncpy); - IFUNC_VX_IMPL (wcscat); IFUNC_VX_IMPL (wcsncat); |