diff options
| author | Stefan Liebler <stli@linux.ibm.com> | 2018-12-18 13:57:16 +0100 |
|---|---|---|
| committer | Stefan Liebler <stli@linux.ibm.com> | 2018-12-18 13:57:16 +0100 |
| commit | 581a051c2e09a847332d4750f6132de0f0ad15b6 (patch) | |
| tree | e7af4c3d013ad521f8f7824277fe606632bf20e9 /sysdeps/s390/ifunc-memchr.h | |
| parent | 5d2ec20a997b87c1667e0e71b3ff1e9df96eac15 (diff) | |
| download | glibc-581a051c2e09a847332d4750f6132de0f0ad15b6.tar.gz glibc-581a051c2e09a847332d4750f6132de0f0ad15b6.tar.xz glibc-581a051c2e09a847332d4750f6132de0f0ad15b6.zip | |
S390: Refactor memchr ifunc handling.
The ifunc handling for memchr 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. Note: The fallback s390-32/s390-64 ifunc variants with srst instruction are now moved to the unified memchr-z900.S file which can be used for 31/64bit. The s390-32/s390-64 files multiarch/memchr.c and memchr.S are deleted. ChangeLog: * sysdeps/s390/multiarch/Makefile (sysdep_routines): Remove memchr variants. * sysdeps/s390/Makefile (sysdep_routines): Add memchr variants. * sysdeps/s390/multiarch/ifunc-impl-list.c (__libc_ifunc_impl_list): Refactor ifunc handling for memchr. * sysdeps/s390/multiarch/memchr-vx.S: Move to ... * sysdeps/s390/memchr-vx.S: ... here and adjust ifunc handling. * sysdeps/s390/multiarch/memchr.c: Move to ... * sysdeps/s390/memchr.c: ... here and adjust ifunc handling. * sysdeps/s390/ifunc-memchr.h: New file. * sysdeps/s390/s390-64/memchr.S: Move to ... * sysdeps/s390/memchr-z900.S: ... here and adjust to be usable for 31/64bit and ifunc handling. * sysdeps/s390/s390-32/multiarch/memchr.c: Delete file. * sysdeps/s390/s390-64/multiarch/memchr.c: Likewise. * sysdeps/s390/s390-32/memchr.S: Likewise.
Diffstat (limited to 'sysdeps/s390/ifunc-memchr.h')
| -rw-r--r-- | sysdeps/s390/ifunc-memchr.h | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/sysdeps/s390/ifunc-memchr.h b/sysdeps/s390/ifunc-memchr.h new file mode 100644 index 0000000000..5d1327b453 --- /dev/null +++ b/sysdeps/s390/ifunc-memchr.h @@ -0,0 +1,52 @@ +/* memchr variant information on S/390 version. + Copyright (C) 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/>. */ + +#if defined USE_MULTIARCH && IS_IN (libc) \ + && ! defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT +# define HAVE_MEMCHR_IFUNC 1 +#else +# define HAVE_MEMCHR_IFUNC 0 +#endif + +#ifdef HAVE_S390_VX_ASM_SUPPORT +# define HAVE_MEMCHR_IFUNC_AND_VX_SUPPORT HAVE_MEMCHR_IFUNC +#else +# define HAVE_MEMCHR_IFUNC_AND_VX_SUPPORT 0 +#endif + +#if defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT +# define MEMCHR_DEFAULT MEMCHR_Z13 +# define HAVE_MEMCHR_Z900_G5 0 +# define HAVE_MEMCHR_Z13 1 +#else +# define MEMCHR_DEFAULT MEMCHR_Z900_G5 +# define HAVE_MEMCHR_Z900_G5 1 +# define HAVE_MEMCHR_Z13 HAVE_MEMCHR_IFUNC_AND_VX_SUPPORT +#endif + +#if HAVE_MEMCHR_Z900_G5 +# define MEMCHR_Z900_G5 __memchr_default +#else +# define MEMCHR_Z900_G5 NULL +#endif + +#if HAVE_MEMCHR_Z13 +# define MEMCHR_Z13 __memchr_vx +#else +# define MEMCHR_Z13 NULL +#endif |