1
0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-07 06:43:00 +03:00

S390: Refactor strpbrk ifunc handling.

The ifunc handling for strpbrk 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 strpbrk variants.
	* sysdeps/s390/Makefile (sysdep_routines): Add strpbrk variants.
	* sysdeps/s390/multiarch/ifunc-impl-list.c
	(__libc_ifunc_impl_list): Refactor ifunc handling for strpbrk.
	* sysdeps/s390/multiarch/strpbrk-c.c: Move to ...
	* sysdeps/s390/strpbrk-c.c: ... here and adjust ifunc handling.
	* sysdeps/s390/multiarch/strpbrk-vx.S: Move to ...
	* sysdeps/s390/strpbrk-vx.S: ... here and adjust ifunc handling.
	* sysdeps/s390/multiarch/strpbrk.c: Move to ...
	* sysdeps/s390/strpbrk.c: ... here and adjust ifunc handling.
	* sysdeps/s390/ifunc-strpbrk.h: New file.
This commit is contained in:
Stefan Liebler
2018-12-18 13:57:15 +01:00
parent 483fc56978
commit 572cca93fa
8 changed files with 126 additions and 21 deletions

View File

@@ -40,6 +40,7 @@
#include <ifunc-strchrnul.h>
#include <ifunc-strrchr.h>
#include <ifunc-strspn.h>
#include <ifunc-strpbrk.h>
/* Maximum number of IFUNC implementations. */
#define MAX_IFUNC 3
@@ -346,6 +347,18 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
)
#endif /* HAVE_STRSPN_IFUNC */
#if HAVE_STRPBRK_IFUNC
IFUNC_IMPL (i, name, strpbrk,
# if HAVE_STRPBRK_Z13
IFUNC_IMPL_ADD (array, i, strpbrk,
dl_hwcap & HWCAP_S390_VX, STRPBRK_Z13)
# endif
# if HAVE_STRPBRK_C
IFUNC_IMPL_ADD (array, i, strpbrk, 1, STRPBRK_C)
# endif
)
#endif /* HAVE_STRPBRK_IFUNC */
#ifdef HAVE_S390_VX_ASM_SUPPORT
# define IFUNC_VX_IMPL(FUNC) \
@@ -382,7 +395,6 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
IFUNC_VX_IMPL (wcsspn);
IFUNC_VX_IMPL (strpbrk);
IFUNC_VX_IMPL (wcspbrk);
IFUNC_VX_IMPL (strcspn);