diff options
| author | Stefan Liebler <stli@linux.ibm.com> | 2018-12-18 13:57:11 +0100 |
|---|---|---|
| committer | Stefan Liebler <stli@linux.ibm.com> | 2018-12-18 13:57:11 +0100 |
| commit | d1bdbf380908c34f31ba145ec9afebade3f1418f (patch) | |
| tree | 5b67b9d19909a6dbfbbd3fc9e01a447c83513de6 /sysdeps/s390/multiarch/ifunc-impl-list.c | |
| parent | 970449311ded3cacb6058c96143dd4c057900589 (diff) | |
| download | glibc-d1bdbf380908c34f31ba145ec9afebade3f1418f.tar.gz glibc-d1bdbf380908c34f31ba145ec9afebade3f1418f.tar.xz glibc-d1bdbf380908c34f31ba145ec9afebade3f1418f.zip | |
S390: Refactor strncpy ifunc handling.
The ifunc handling for strncpy 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 are now moved to the strncpy-z900.S files. The s390-32/s390-64 files multiarch/strncpy.c and strncpy.S are deleted. ChangeLog: * sysdeps/s390/multiarch/Makefile (sysdep_routines): Remove strncpy variants. * sysdeps/s390/Makefile (sysdep_routines): Add strncpy variants. * sysdeps/s390/multiarch/ifunc-impl-list.c (__libc_ifunc_impl_list): Refactor ifunc handling for strncpy. * sysdeps/s390/multiarch/strncpy-vx.S: Move to ... * sysdeps/s390/strncpy-vx.S: ... here and adjust ifunc handling. * sysdeps/s390/multiarch/strncpy.c: Move to ... * sysdeps/s390/strncpy.c: ... here and adjust ifunc handling. * sysdeps/s390/ifunc-strncpy.h: New file. * sysdeps/s390/s390-64/strncpy.S: Move to ... * sysdeps/s390/s390-64/strncpy-z900.S: ... here and adjust ifunc handling. * sysdeps/s390/s390-32/strncpy.S: Move to ... * sysdeps/s390/s390-32/strncpy-z900.S: ... here and adjust ifunc handling. * sysdeps/s390/s390-32/multiarch/strncpy.c: Delete file. * sysdeps/s390/s390-64/multiarch/strncpy.c: Likewise.
Diffstat (limited to 'sysdeps/s390/multiarch/ifunc-impl-list.c')
| -rw-r--r-- | sysdeps/s390/multiarch/ifunc-impl-list.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/sysdeps/s390/multiarch/ifunc-impl-list.c b/sysdeps/s390/multiarch/ifunc-impl-list.c index 678ed13833..d598fc5c22 100644 --- a/sysdeps/s390/multiarch/ifunc-impl-list.c +++ b/sysdeps/s390/multiarch/ifunc-impl-list.c @@ -30,6 +30,7 @@ #include <ifunc-strnlen.h> #include <ifunc-strcpy.h> #include <ifunc-stpcpy.h> +#include <ifunc-strncpy.h> /* Maximum number of IFUNC implementations. */ #define MAX_IFUNC 3 @@ -216,6 +217,19 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, ) #endif /* HAVE_STPCPY_IFUNC */ +#if HAVE_STRNCPY_IFUNC + IFUNC_IMPL (i, name, strncpy, +# if HAVE_STRNCPY_Z13 + IFUNC_IMPL_ADD (array, i, strncpy, + dl_hwcap & HWCAP_S390_VX, STRNCPY_Z13) +# endif +# if HAVE_STRNCPY_Z900_G5 + IFUNC_IMPL_ADD (array, i, strncpy, 1, STRNCPY_Z900_G5) +# endif + ) +#endif /* HAVE_STRNCPY_IFUNC */ + + #ifdef HAVE_S390_VX_ASM_SUPPORT # define IFUNC_VX_IMPL(FUNC) \ @@ -232,7 +246,6 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, IFUNC_VX_IMPL (wcpcpy); - IFUNC_VX_IMPL (strncpy); IFUNC_VX_IMPL (wcsncpy); IFUNC_VX_IMPL (stpncpy); |