From 25218822bdbfb49b8ea0f419e8a20d2b9bd47cd0 Mon Sep 17 00:00:00 2001 From: Stefan Liebler Date: Tue, 18 Dec 2018 13:57:11 +0100 Subject: S390: Refactor stpncpy ifunc handling. The ifunc handling for stpncpy 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 stpncpy variants. * sysdeps/s390/Makefile (sysdep_routines): Add stpncpy variants. * sysdeps/s390/multiarch/ifunc-impl-list.c (__libc_ifunc_impl_list): Refactor ifunc handling for stpncpy. * sysdeps/s390/multiarch/stpncpy-c.c: Move to ... * sysdeps/s390/stpncpy-c.c: ... here and adjust ifunc handling. * sysdeps/s390/multiarch/stpncpy-vx.S: Move to ... * sysdeps/s390/stpncpy-vx.S: ... here and adjust ifunc handling. * sysdeps/s390/multiarch/stpncpy.c: Move to ... * sysdeps/s390/stpncpy.c: ... here and adjust ifunc handling. * sysdeps/s390/ifunc-stpncpy.h: New file. --- sysdeps/s390/multiarch/ifunc-impl-list.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'sysdeps/s390/multiarch/ifunc-impl-list.c') diff --git a/sysdeps/s390/multiarch/ifunc-impl-list.c b/sysdeps/s390/multiarch/ifunc-impl-list.c index d598fc5c22..021e9f247f 100644 --- a/sysdeps/s390/multiarch/ifunc-impl-list.c +++ b/sysdeps/s390/multiarch/ifunc-impl-list.c @@ -31,6 +31,7 @@ #include #include #include +#include /* Maximum number of IFUNC implementations. */ #define MAX_IFUNC 3 @@ -229,6 +230,18 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, ) #endif /* HAVE_STRNCPY_IFUNC */ +#if HAVE_STPNCPY_IFUNC + IFUNC_IMPL (i, name, stpncpy, +# if HAVE_STPNCPY_Z13 + IFUNC_IMPL_ADD (array, i, stpncpy, + dl_hwcap & HWCAP_S390_VX, STPNCPY_Z13) +# endif +# if HAVE_STPNCPY_C + IFUNC_IMPL_ADD (array, i, stpncpy, 1, STPNCPY_C) +# endif + ) +#endif /* HAVE_STPNCPY_IFUNC */ + #ifdef HAVE_S390_VX_ASM_SUPPORT @@ -248,7 +261,6 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, IFUNC_VX_IMPL (wcsncpy); - IFUNC_VX_IMPL (stpncpy); IFUNC_VX_IMPL (wcpncpy); IFUNC_VX_IMPL (strcat); -- cgit 1.4.1