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 | 970449311ded3cacb6058c96143dd4c057900589 (patch) | |
| tree | 565f010707283e91e3f4ddec367b900a374682b1 /sysdeps/s390/multiarch/ifunc-impl-list.c | |
| parent | 914a4e05572e108201d71dcd3e47da8aeeecd70d (diff) | |
| download | glibc-970449311ded3cacb6058c96143dd4c057900589.tar.gz glibc-970449311ded3cacb6058c96143dd4c057900589.tar.xz glibc-970449311ded3cacb6058c96143dd4c057900589.zip | |
S390: Refactor stpcpy ifunc handling.
The ifunc handling for stpcpy 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. ChangeLog: * sysdeps/s390/multiarch/Makefile (sysdep_routines): Remove stpcpy variants. * sysdeps/s390/Makefile (sysdep_routines): Add stpcpy variants. * sysdeps/s390/multiarch/ifunc-impl-list.c (__libc_ifunc_impl_list): Refactor ifunc handling for stpcpy. * sysdeps/s390/multiarch/stpcpy-c.c: Move to ... * sysdeps/s390/stpcpy-c.c: ... here and adjust ifunc handling. * sysdeps/s390/multiarch/stpcpy-vx.S: Move to ... * sysdeps/s390/stpcpy-vx.S: ... here and adjust ifunc handling. * sysdeps/s390/multiarch/stpcpy.c: Move to ... * sysdeps/s390/stpcpy.c: ... here and adjust ifunc handling. * sysdeps/s390/ifunc-stpcpy.h: New file.
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 1784372db9..678ed13833 100644 --- a/sysdeps/s390/multiarch/ifunc-impl-list.c +++ b/sysdeps/s390/multiarch/ifunc-impl-list.c @@ -29,6 +29,7 @@ #include <ifunc-strlen.h> #include <ifunc-strnlen.h> #include <ifunc-strcpy.h> +#include <ifunc-stpcpy.h> /* Maximum number of IFUNC implementations. */ #define MAX_IFUNC 3 @@ -203,6 +204,18 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, ) #endif /* HAVE_STRCPY_IFUNC */ +#if HAVE_STPCPY_IFUNC + IFUNC_IMPL (i, name, stpcpy, +# if HAVE_STPCPY_Z13 + IFUNC_IMPL_ADD (array, i, stpcpy, + dl_hwcap & HWCAP_S390_VX, STPCPY_Z13) +# endif +# if HAVE_STPCPY_C + IFUNC_IMPL_ADD (array, i, stpcpy, 1, STPCPY_C) +# endif + ) +#endif /* HAVE_STPCPY_IFUNC */ + #ifdef HAVE_S390_VX_ASM_SUPPORT # define IFUNC_VX_IMPL(FUNC) \ @@ -217,7 +230,6 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, IFUNC_VX_IMPL (wcscpy); - IFUNC_VX_IMPL (stpcpy); IFUNC_VX_IMPL (wcpcpy); IFUNC_VX_IMPL (strncpy); |