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 | 0582e4284529b4ea0fcd1a8973ccab7d95ec0e87 (patch) | |
| tree | 08dd0fbd46d8468091946bcfeb4e91ea1abdd50d /sysdeps/s390/multiarch/ifunc-impl-list.c | |
| parent | 804f2e5c73b1363836ce5db29a0abb3d36e1286a (diff) | |
| download | glibc-0582e4284529b4ea0fcd1a8973ccab7d95ec0e87.tar.gz glibc-0582e4284529b4ea0fcd1a8973ccab7d95ec0e87.tar.xz glibc-0582e4284529b4ea0fcd1a8973ccab7d95ec0e87.zip | |
S390: Refactor wcpcpy ifunc handling.
The ifunc handling for wcpcpy 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 wcpcpy variants. * sysdeps/s390/Makefile (sysdep_routines): Add wcpcpy variants. * sysdeps/s390/multiarch/ifunc-impl-list.c (__libc_ifunc_impl_list): Refactor ifunc handling for wcpcpy. * sysdeps/s390/multiarch/wcpcpy-c.c: Move to ... * sysdeps/s390/wcpcpy-c.c: ... here and adjust ifunc handling. * sysdeps/s390/multiarch/wcpcpy-vx.S: Move to ... * sysdeps/s390/wcpcpy-vx.S: ... here and adjust ifunc handling. * sysdeps/s390/multiarch/wcpcpy.c: Move to ... * sysdeps/s390/wcpcpy.c: ... here and adjust ifunc handling. * sysdeps/s390/ifunc-wcpcpy.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 aac8f4ea46..656ab59db6 100644 --- a/sysdeps/s390/multiarch/ifunc-impl-list.c +++ b/sysdeps/s390/multiarch/ifunc-impl-list.c @@ -49,6 +49,7 @@ #include <ifunc-wcslen.h> #include <ifunc-wcsnlen.h> #include <ifunc-wcscpy.h> +#include <ifunc-wcpcpy.h> /* Maximum number of IFUNC implementations. */ #define MAX_IFUNC 3 @@ -463,6 +464,18 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, ) #endif /* HAVE_WCSCPY_IFUNC */ +#if HAVE_WCPCPY_IFUNC + IFUNC_IMPL (i, name, wcpcpy, +# if HAVE_WCPCPY_Z13 + IFUNC_IMPL_ADD (array, i, wcpcpy, + dl_hwcap & HWCAP_S390_VX, WCPCPY_Z13) +# endif +# if HAVE_WCPCPY_C + IFUNC_IMPL_ADD (array, i, wcpcpy, 1, WCPCPY_C) +# endif + ) +#endif /* HAVE_WCPCPY_IFUNC */ + #ifdef HAVE_S390_VX_ASM_SUPPORT # define IFUNC_VX_IMPL(FUNC) \ @@ -471,8 +484,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 (wcpcpy); - IFUNC_VX_IMPL (wcsncpy); IFUNC_VX_IMPL (wcpncpy); |