diff options
| author | Stefan Liebler <stli@linux.ibm.com> | 2018-12-18 13:57:18 +0100 |
|---|---|---|
| committer | Stefan Liebler <stli@linux.ibm.com> | 2018-12-18 13:57:18 +0100 |
| commit | 804f2e5c73b1363836ce5db29a0abb3d36e1286a (patch) | |
| tree | 7856f98333f25755a59d689883b8a0df8a0c4e7e /sysdeps/s390/multiarch/ifunc-impl-list.c | |
| parent | c7e7cd266ed123b6dfb722f599934ca5dcfd3e93 (diff) | |
| download | glibc-804f2e5c73b1363836ce5db29a0abb3d36e1286a.tar.gz | |
S390: Refactor wcscpy ifunc handling.
The ifunc handling for wcscpy 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 wcscpy variants.
* sysdeps/s390/Makefile (sysdep_routines): Add wcscpy variants.
* sysdeps/s390/multiarch/ifunc-impl-list.c
(__libc_ifunc_impl_list): Refactor ifunc handling for wcscpy.
* sysdeps/s390/multiarch/wcscpy-c.c: Move to ...
* sysdeps/s390/wcscpy-c.c: ... here and adjust ifunc handling.
* sysdeps/s390/multiarch/wcscpy-vx.S: Move to ...
* sysdeps/s390/wcscpy-vx.S: ... here and adjust ifunc handling.
* sysdeps/s390/multiarch/wcscpy.c: Move to ...
* sysdeps/s390/wcscpy.c: ... here and adjust ifunc handling.
* sysdeps/s390/ifunc-wcscpy.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 c199fd0e0b..aac8f4ea46 100644 --- a/sysdeps/s390/multiarch/ifunc-impl-list.c +++ b/sysdeps/s390/multiarch/ifunc-impl-list.c @@ -48,6 +48,7 @@ #include <ifunc-memrchr.h> #include <ifunc-wcslen.h> #include <ifunc-wcsnlen.h> +#include <ifunc-wcscpy.h> /* Maximum number of IFUNC implementations. */ #define MAX_IFUNC 3 @@ -450,6 +451,18 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, ) #endif /* HAVE_WCSNLEN_IFUNC */ +#if HAVE_WCSCPY_IFUNC + IFUNC_IMPL (i, name, wcscpy, +# if HAVE_WCSCPY_Z13 + IFUNC_IMPL_ADD (array, i, wcscpy, + dl_hwcap & HWCAP_S390_VX, WCSCPY_Z13) +# endif +# if HAVE_WCSCPY_C + IFUNC_IMPL_ADD (array, i, wcscpy, 1, WCSCPY_C) +# endif + ) +#endif /* HAVE_WCSCPY_IFUNC */ + #ifdef HAVE_S390_VX_ASM_SUPPORT # define IFUNC_VX_IMPL(FUNC) \ @@ -458,8 +471,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 (wcscpy); - IFUNC_VX_IMPL (wcpcpy); IFUNC_VX_IMPL (wcsncpy); |