1
0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-08 17:42:12 +03:00

S390: Refactor strrchr ifunc handling.

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

View File

@@ -38,6 +38,7 @@
#include <ifunc-strncmp.h>
#include <ifunc-strchr.h>
#include <ifunc-strchrnul.h>
#include <ifunc-strrchr.h>
/* Maximum number of IFUNC implementations. */
#define MAX_IFUNC 3
@@ -320,6 +321,18 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
)
#endif /* HAVE_STRCHRNUL_IFUNC */
#if HAVE_STRRCHR_IFUNC
IFUNC_IMPL (i, name, strrchr,
# if HAVE_STRRCHR_Z13
IFUNC_IMPL_ADD (array, i, strrchr,
dl_hwcap & HWCAP_S390_VX, STRRCHR_Z13)
# endif
# if HAVE_STRRCHR_C
IFUNC_IMPL_ADD (array, i, strrchr, 1, STRRCHR_C)
# endif
)
#endif /* HAVE_STRRCHR_IFUNC */
#ifdef HAVE_S390_VX_ASM_SUPPORT
# define IFUNC_VX_IMPL(FUNC) \
@@ -352,7 +365,6 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
IFUNC_VX_IMPL (wcschrnul);
IFUNC_VX_IMPL (strrchr);
IFUNC_VX_IMPL (wcsrchr);
IFUNC_VX_IMPL (strspn);