diff options
| author | Stefan Liebler <stli@linux.ibm.com> | 2018-12-18 13:57:04 +0100 |
|---|---|---|
| committer | Stefan Liebler <stli@linux.ibm.com> | 2018-12-18 13:57:04 +0100 |
| commit | 712a254a97ade7f48fb7a434339faa05c048ce1f (patch) | |
| tree | 153012dd1894c69785c4b841533bcb5fb35426c1 /sysdeps/s390/multiarch/ifunc-impl-list.c | |
| parent | 5f1743d118047ff1fbefe713f2397090e0418deb (diff) | |
| download | glibc-712a254a97ade7f48fb7a434339faa05c048ce1f.tar glibc-712a254a97ade7f48fb7a434339faa05c048ce1f.tar.gz glibc-712a254a97ade7f48fb7a434339faa05c048ce1f.tar.bz2 glibc-712a254a97ade7f48fb7a434339faa05c048ce1f.zip | |
S390: Refactor memset ifunc handling.
This patch moves all ifunc variants for memset
to sysdeps/s390/memset-z900.S. The configure-check/preprocessor logic
in sysdeps/s390/ifunc-memset.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-memset.h: New File.
* sysdeps/s390/memset.S: Move to ...
* sysdeps/s390/memset-z900.S ... here.
Move implementations from memset-s390x.s to here.
* sysdeps/s390/multiarch/memset-s390x.S: Delete File.
* sysdeps/s390/multiarch/Makefile (sysdep_routines):
Remove memset variants.
* sysdeps/s390/Makefile (sysdep_routines):
Add memset variants.
* sysdeps/s390/multiarch/ifunc-impl-list.c
(__libc_ifunc_impl_list): Adjust ifunc variants for
memset.
* sysdeps/s390/multiarch/memset.c: Move ifunc resolver
to ...
* sysdeps/s390/memset.c: ... here.
Adjust ifunc variants for memset.
Diffstat (limited to 'sysdeps/s390/multiarch/ifunc-impl-list.c')
| -rw-r--r-- | sysdeps/s390/multiarch/ifunc-impl-list.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/sysdeps/s390/multiarch/ifunc-impl-list.c b/sysdeps/s390/multiarch/ifunc-impl-list.c index ec3373ae26..2f671eac1f 100644 --- a/sysdeps/s390/multiarch/ifunc-impl-list.c +++ b/sysdeps/s390/multiarch/ifunc-impl-list.c @@ -21,6 +21,7 @@ #include <wchar.h> #include <ifunc-impl-list.h> #include <ifunc-resolve.h> +#include <ifunc-memset.h> /* Maximum number of IFUNC implementations. */ #define MAX_IFUNC 3 @@ -46,12 +47,21 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, S390_STORE_STFLE (stfle_bits); } +#if HAVE_MEMSET_IFUNC IFUNC_IMPL (i, name, memset, +# if HAVE_MEMSET_Z196 IFUNC_IMPL_ADD (array, i, memset, - S390_IS_Z196 (stfle_bits), __memset_z196) + S390_IS_Z196 (stfle_bits), MEMSET_Z196) +# endif +# if HAVE_MEMSET_Z10 IFUNC_IMPL_ADD (array, i, memset, - S390_IS_Z10 (stfle_bits), __memset_z10) - IFUNC_IMPL_ADD (array, i, memset, 1, __memset_default)) + S390_IS_Z10 (stfle_bits), MEMSET_Z10) +# endif +# if HAVE_MEMSET_Z900_G5 + IFUNC_IMPL_ADD (array, i, memset, 1, MEMSET_Z900_G5) +# endif + ) +#endif /* HAVE_MEMSET_IFUNC */ IFUNC_IMPL (i, name, memcmp, IFUNC_IMPL_ADD (array, i, memcmp, |