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 | 0966dd86896d7cd6c107c751ba7d3b69542ca11d (patch) | |
| tree | 80402d2a77a37e4e2ec69be0d3f75b3978409dc8 /sysdeps/s390/multiarch/ifunc-impl-list.c | |
| parent | 0582e4284529b4ea0fcd1a8973ccab7d95ec0e87 (diff) | |
| download | glibc-0966dd86896d7cd6c107c751ba7d3b69542ca11d.tar.gz glibc-0966dd86896d7cd6c107c751ba7d3b69542ca11d.tar.xz glibc-0966dd86896d7cd6c107c751ba7d3b69542ca11d.zip | |
S390: Refactor wcsncpy ifunc handling.
The ifunc handling for wcsncpy 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 wcsncpy variants. * sysdeps/s390/Makefile (sysdep_routines): Add wcsncpy variants. * sysdeps/s390/multiarch/ifunc-impl-list.c (__libc_ifunc_impl_list): Refactor ifunc handling for wcsncpy. * sysdeps/s390/multiarch/wcsncpy-c.c: Move to ... * sysdeps/s390/wcsncpy-c.c: ... here and adjust ifunc handling. * sysdeps/s390/multiarch/wcsncpy-vx.S: Move to ... * sysdeps/s390/wcsncpy-vx.S: ... here and adjust ifunc handling. * sysdeps/s390/multiarch/wcsncpy.c: Move to ... * sysdeps/s390/wcsncpy.c: ... here and adjust ifunc handling. * sysdeps/s390/ifunc-wcsncpy.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 656ab59db6..9ebaf4de6f 100644 --- a/sysdeps/s390/multiarch/ifunc-impl-list.c +++ b/sysdeps/s390/multiarch/ifunc-impl-list.c @@ -50,6 +50,7 @@ #include <ifunc-wcsnlen.h> #include <ifunc-wcscpy.h> #include <ifunc-wcpcpy.h> +#include <ifunc-wcsncpy.h> /* Maximum number of IFUNC implementations. */ #define MAX_IFUNC 3 @@ -476,6 +477,18 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, ) #endif /* HAVE_WCPCPY_IFUNC */ +#if HAVE_WCSNCPY_IFUNC + IFUNC_IMPL (i, name, wcsncpy, +# if HAVE_WCSNCPY_Z13 + IFUNC_IMPL_ADD (array, i, wcsncpy, + dl_hwcap & HWCAP_S390_VX, WCSNCPY_Z13) +# endif +# if HAVE_WCSNCPY_C + IFUNC_IMPL_ADD (array, i, wcsncpy, 1, WCSNCPY_C) +# endif + ) +#endif /* HAVE_WCSNCPY_IFUNC */ + #ifdef HAVE_S390_VX_ASM_SUPPORT # define IFUNC_VX_IMPL(FUNC) \ @@ -484,8 +497,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 (wcsncpy); - IFUNC_VX_IMPL (wcpncpy); IFUNC_VX_IMPL (wcscat); |