diff options
| author | Stefan Liebler <stli@linux.ibm.com> | 2018-12-18 13:57:10 +0100 |
|---|---|---|
| committer | Stefan Liebler <stli@linux.ibm.com> | 2018-12-18 13:57:10 +0100 |
| commit | 914a4e05572e108201d71dcd3e47da8aeeecd70d (patch) | |
| tree | 1c649803636c06ef474ddbe8909910dd128c9426 /sysdeps/s390/multiarch/ifunc-impl-list.c | |
| parent | de10e44dda686e3ed6a7a1463869df846ea39825 (diff) | |
| download | glibc-914a4e05572e108201d71dcd3e47da8aeeecd70d.tar.gz glibc-914a4e05572e108201d71dcd3e47da8aeeecd70d.tar.xz glibc-914a4e05572e108201d71dcd3e47da8aeeecd70d.zip | |
S390: Refactor strcpy ifunc handling.
The ifunc handling for strcpy is adjusted in order to omit ifunc variants if those will never be used as the minimum architecture level already supports newer CPUs by default. Glibc internal calls will then also use the "newer" ifunc variant. Note: The fallback s390-32/s390-64 ifunc variants with mvst instruction are now moved to the unified strcpy-z900.S file which can be used for 31/64bit. The s390-32/s390-64 files multiarch/strcpy.c and strcpy.S are deleted. ChangeLog: * sysdeps/s390/multiarch/Makefile (sysdep_routines): Remove strcpy variants. * sysdeps/s390/Makefile (sysdep_routines): Add strcpy variants. * sysdeps/s390/multiarch/ifunc-impl-list.c (__libc_ifunc_impl_list): Refactor ifunc handling for strcpy. * sysdeps/s390/multiarch/strcpy-vx.S: Move to ... * sysdeps/s390/strcpy-vx.S: ... here and adjust ifunc handling. * sysdeps/s390/multiarch/strcpy.c: Move to ... * sysdeps/s390/strcpy.c: ... here and adjust ifunc handling. * sysdeps/s390/ifunc-strcpy.h: New file. * sysdeps/s390/s390-64/strcpy.S: Move to ... * sysdeps/s390/strcpy-z900.S: ... here and adjust to be usable for 31/64bit and ifunc handling. * sysdeps/s390/s390-32/multiarch/strcpy.c: Delete file. * sysdeps/s390/s390-64/multiarch/strcpy.c: Likewise. * sysdeps/s390/s390-32/strcpy.S: Likewise.
Diffstat (limited to 'sysdeps/s390/multiarch/ifunc-impl-list.c')
| -rw-r--r-- | sysdeps/s390/multiarch/ifunc-impl-list.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/sysdeps/s390/multiarch/ifunc-impl-list.c b/sysdeps/s390/multiarch/ifunc-impl-list.c index 680e5b738b..1784372db9 100644 --- a/sysdeps/s390/multiarch/ifunc-impl-list.c +++ b/sysdeps/s390/multiarch/ifunc-impl-list.c @@ -28,6 +28,7 @@ #include <ifunc-memmem.h> #include <ifunc-strlen.h> #include <ifunc-strnlen.h> +#include <ifunc-strcpy.h> /* Maximum number of IFUNC implementations. */ #define MAX_IFUNC 3 @@ -190,6 +191,18 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, ) #endif /* HAVE_STRNLEN_IFUNC */ +#if HAVE_STRCPY_IFUNC + IFUNC_IMPL (i, name, strcpy, +# if HAVE_STRCPY_Z13 + IFUNC_IMPL_ADD (array, i, strcpy, + dl_hwcap & HWCAP_S390_VX, STRCPY_Z13) +# endif +# if HAVE_STRCPY_Z900_G5 + IFUNC_IMPL_ADD (array, i, strcpy, 1, STRCPY_Z900_G5) +# endif + ) +#endif /* HAVE_STRCPY_IFUNC */ + #ifdef HAVE_S390_VX_ASM_SUPPORT # define IFUNC_VX_IMPL(FUNC) \ @@ -202,7 +215,6 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, IFUNC_VX_IMPL (wcsnlen); - IFUNC_VX_IMPL (strcpy); IFUNC_VX_IMPL (wcscpy); IFUNC_VX_IMPL (stpcpy); |