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/memset.c | |
parent | 5f1743d118047ff1fbefe713f2397090e0418deb (diff) | |
download | glibc-712a254a97ade7f48fb7a434339faa05c048ce1f.zip glibc-712a254a97ade7f48fb7a434339faa05c048ce1f.tar.gz glibc-712a254a97ade7f48fb7a434339faa05c048ce1f.tar.bz2 |
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/memset.c')
-rw-r--r-- | sysdeps/s390/memset.c | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/sysdeps/s390/memset.c b/sysdeps/s390/memset.c new file mode 100644 index 0000000..57a35ae --- /dev/null +++ b/sysdeps/s390/memset.c @@ -0,0 +1,48 @@ +/* Multiple versions of memset. + Copyright (C) 2015-2018 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + +#include <ifunc-memset.h> +#if HAVE_MEMSET_IFUNC +# define memset __redirect_memset +# include <string.h> +# undef memset +# include <ifunc-resolve.h> + +# if HAVE_MEMSET_Z900_G5 +extern __typeof (__redirect_memset) MEMSET_Z900_G5 attribute_hidden; +# endif + +# if HAVE_MEMSET_Z10 +extern __typeof (__redirect_memset) MEMSET_Z10 attribute_hidden; +# endif + +# if HAVE_MEMSET_Z196 +extern __typeof (__redirect_memset) MEMSET_Z196 attribute_hidden; +# endif + +s390_libc_ifunc_expr (__redirect_memset, memset, + ({ + s390_libc_ifunc_init (); + (HAVE_MEMSET_Z196 && S390_IS_Z196 (stfle_bits)) + ? MEMSET_Z196 + : (HAVE_MEMSET_Z10 && S390_IS_Z10 (stfle_bits)) + ? MEMSET_Z10 + : MEMSET_DEFAULT; + }) + ) +#endif |