diff options
| author | Stefan Liebler <stli@linux.ibm.com> | 2018-12-18 13:57:06 +0100 |
|---|---|---|
| committer | Stefan Liebler <stli@linux.ibm.com> | 2018-12-18 13:57:06 +0100 |
| commit | 18eb862d454a41012ccdd5127715ef7cd2a711ec (patch) | |
| tree | 5fce6b472460c66b3f5acafb90a9e87e04b92422 /sysdeps/s390/multiarch/ifunc-impl-list.c | |
| parent | df3eb8de31a530f285f54f3c41cd7b636816c062 (diff) | |
| download | glibc-18eb862d454a41012ccdd5127715ef7cd2a711ec.tar.gz glibc-18eb862d454a41012ccdd5127715ef7cd2a711ec.tar.xz glibc-18eb862d454a41012ccdd5127715ef7cd2a711ec.zip | |
S390: Refactor memcpy/mempcpy ifunc handling.
This patch moves all ifunc variants for memcpy/mempcpy to sysdeps/s390/memcpy-z900.S. The configure-check/preprocessor logic in sysdeps/s390/ifunc-memcpy.h decides if ifunc is needed at all and which ifunc variants should be available. E.g. if the compiler/assembler already supports z196 by default, the older ifunc variants are not included. If we only need the newest ifunc variant, then we can skip ifunc at all. Therefore the ifunc-resolvers and __libc_ifunc_impl_list are adjusted in order to handle only the available ifunc variants. ChangeLog: * sysdeps/s390/ifunc-memcpy.h: New File. * sysdeps/s390/memcpy.S: Move to ... * sysdeps/s390/memcpy-z900.S ... here. Move implementations from memcpy-s390x.s to here. * sysdeps/s390/multiarch/memcpy-s390x.S: Delete File. * sysdeps/s390/multiarch/Makefile (sysdep_routines): Remove memcpy/mempcpy variants. * sysdeps/s390/Makefile (sysdep_routines): Add memcpy/mempcpy variants. * sysdeps/s390/multiarch/ifunc-impl-list.c (__libc_ifunc_impl_list): Adjust ifunc variants for memcpy and mempcpy. * sysdeps/s390/multiarch/memcpy.c: Move ifunc resolver to ... * sysdeps/s390/memcpy.c: ... here. Adjust ifunc variants for memcpy. * sysdeps/s390/multiarch/mempcpy.c: Move to ... * sysdeps/s390/mempcpy.c: ... here. Adjust ifunc variants for mempcpy. * sysdeps/s390/mempcpy.S: Delete file.
Diffstat (limited to 'sysdeps/s390/multiarch/ifunc-impl-list.c')
| -rw-r--r-- | sysdeps/s390/multiarch/ifunc-impl-list.c | 33 |
1 files changed, 23 insertions, 10 deletions
diff --git a/sysdeps/s390/multiarch/ifunc-impl-list.c b/sysdeps/s390/multiarch/ifunc-impl-list.c index 2e57d01abc..6969c480cc 100644 --- a/sysdeps/s390/multiarch/ifunc-impl-list.c +++ b/sysdeps/s390/multiarch/ifunc-impl-list.c @@ -23,6 +23,7 @@ #include <ifunc-resolve.h> #include <ifunc-memset.h> #include <ifunc-memcmp.h> +#include <ifunc-memcpy.h> /* Maximum number of IFUNC implementations. */ #define MAX_IFUNC 3 @@ -95,23 +96,35 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, ) #endif /* HAVE_MEMCMP_IFUNC */ -#ifdef SHARED - +#if HAVE_MEMCPY_IFUNC IFUNC_IMPL (i, name, memcpy, +# if HAVE_MEMCPY_Z196 IFUNC_IMPL_ADD (array, i, memcpy, - S390_IS_Z196 (stfle_bits), __memcpy_z196) + S390_IS_Z196 (stfle_bits), MEMCPY_Z196) +# endif +# if HAVE_MEMCPY_Z10 IFUNC_IMPL_ADD (array, i, memcpy, - S390_IS_Z10 (stfle_bits), __memcpy_z10) - IFUNC_IMPL_ADD (array, i, memcpy, 1, __memcpy_default)) + S390_IS_Z10 (stfle_bits), MEMCPY_Z10) +# endif +# if HAVE_MEMCPY_Z900_G5 + IFUNC_IMPL_ADD (array, i, memcpy, 1, MEMCPY_Z900_G5) +# endif + ) IFUNC_IMPL (i, name, mempcpy, +# if HAVE_MEMCPY_Z196 IFUNC_IMPL_ADD (array, i, mempcpy, - S390_IS_Z196 (stfle_bits), ____mempcpy_z196) + S390_IS_Z196 (stfle_bits), MEMPCPY_Z196) +# endif +# if HAVE_MEMCPY_Z10 IFUNC_IMPL_ADD (array, i, mempcpy, - S390_IS_Z10 (stfle_bits), ____mempcpy_z10) - IFUNC_IMPL_ADD (array, i, mempcpy, 1, ____mempcpy_default)) - -#endif /* SHARED */ + S390_IS_Z10 (stfle_bits), MEMPCPY_Z10) +# endif +# if HAVE_MEMCPY_Z900_G5 + IFUNC_IMPL_ADD (array, i, mempcpy, 1, MEMPCPY_Z900_G5) +# endif + ) +#endif /* HAVE_MEMCPY_IFUNC */ #ifdef HAVE_S390_VX_ASM_SUPPORT |