diff options
| author | Stefan Liebler <stli@linux.ibm.com> | 2018-12-18 13:57:25 +0100 |
|---|---|---|
| committer | Stefan Liebler <stli@linux.ibm.com> | 2018-12-18 13:57:25 +0100 |
| commit | 25654a8c74dce51e162c29749c6bd6d2a67490e6 (patch) | |
| tree | 023e70d07af765f3cb72af8a741a681b985f5ae0 /sysdeps/s390/multiarch/ifunc-impl-list.c | |
| parent | d2a7436c1c6144bbba2eb2a7b25db9b90515f0e6 (diff) | |
| download | glibc-25654a8c74dce51e162c29749c6bd6d2a67490e6.tar.gz glibc-25654a8c74dce51e162c29749c6bd6d2a67490e6.tar.xz glibc-25654a8c74dce51e162c29749c6bd6d2a67490e6.zip | |
S390: Refactor wmemcmp ifunc handling.
The ifunc handling for wmemcmp 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. ChangeLog: * sysdeps/s390/multiarch/Makefile (sysdep_routines): Remove wmemcmp variants. * sysdeps/s390/Makefile (sysdep_routines): Add wmemcmp variants. * sysdeps/s390/multiarch/ifunc-impl-list.c (__libc_ifunc_impl_list): Refactor ifunc handling for wmemcmp. * sysdeps/s390/multiarch/wmemcmp-c.c: Move to ... * sysdeps/s390/wmemcmp-c.c: ... here and adjust ifunc handling. * sysdeps/s390/multiarch/wmemcmp-vx.S: Move to ... * sysdeps/s390/wmemcmp-vx.S: ... here and adjust ifunc handling. * sysdeps/s390/multiarch/wmemcmp.c: Move to ... * sysdeps/s390/wmemcmp.c: ... here and adjust ifunc handling. * sysdeps/s390/ifunc-wmemcmp.h: New file.
Diffstat (limited to 'sysdeps/s390/multiarch/ifunc-impl-list.c')
| -rw-r--r-- | sysdeps/s390/multiarch/ifunc-impl-list.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/sysdeps/s390/multiarch/ifunc-impl-list.c b/sysdeps/s390/multiarch/ifunc-impl-list.c index 7040959269..177c5fd6fe 100644 --- a/sysdeps/s390/multiarch/ifunc-impl-list.c +++ b/sysdeps/s390/multiarch/ifunc-impl-list.c @@ -64,6 +64,7 @@ #include <ifunc-wcscspn.h> #include <ifunc-wmemchr.h> #include <ifunc-wmemset.h> +#include <ifunc-wmemcmp.h> /* Maximum number of IFUNC implementations. */ #define MAX_IFUNC 3 @@ -658,17 +659,17 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, ) #endif /* HAVE_WMEMSET_IFUNC */ -#ifdef HAVE_S390_VX_ASM_SUPPORT - -# define IFUNC_VX_IMPL(FUNC) \ - IFUNC_IMPL (i, name, FUNC, \ - IFUNC_IMPL_ADD (array, i, FUNC, dl_hwcap & HWCAP_S390_VX, \ - __##FUNC##_vx) \ - IFUNC_IMPL_ADD (array, i, FUNC, 1, __##FUNC##_c)) - - IFUNC_VX_IMPL (wmemcmp); - -#endif /* HAVE_S390_VX_ASM_SUPPORT */ +#if HAVE_WMEMCMP_IFUNC + IFUNC_IMPL (i, name, wmemcmp, +# if HAVE_WMEMCMP_Z13 + IFUNC_IMPL_ADD (array, i, wmemcmp, + dl_hwcap & HWCAP_S390_VX, WMEMCMP_Z13) +# endif +# if HAVE_WMEMCMP_C + IFUNC_IMPL_ADD (array, i, wmemcmp, 1, WMEMCMP_C) +# endif + ) +#endif /* HAVE_WMEMCMP_IFUNC */ return i; } |