diff options
| author | Stefan Liebler <stli@linux.ibm.com> | 2018-12-18 13:57:18 +0100 |
|---|---|---|
| committer | Stefan Liebler <stli@linux.ibm.com> | 2018-12-18 13:57:18 +0100 |
| commit | c7e7cd266ed123b6dfb722f599934ca5dcfd3e93 (patch) | |
| tree | 7ef5ef26b7fbed31024f59cefa691369968eea19 /sysdeps/s390/ifunc-wcsnlen.h | |
| parent | 2e02d0b7a9bf3421638d2d0f2526275a1df5c0da (diff) | |
| download | glibc-c7e7cd266ed123b6dfb722f599934ca5dcfd3e93.tar.gz glibc-c7e7cd266ed123b6dfb722f599934ca5dcfd3e93.tar.xz glibc-c7e7cd266ed123b6dfb722f599934ca5dcfd3e93.zip | |
S390: Refactor wcsnlen ifunc handling.
The ifunc handling for wcsnlen is adjusted in order to omit ifunc if the minimum architecture level already supports newer CPUs by default. Unfortunately the c ifunc variant can't be omitted at all as it is used by the z13 ifunc variant as fallback if the pointers are not 4-byte aligned. Glibc internal calls will use the "newer" ifunc variant. ChangeLog: * sysdeps/s390/multiarch/Makefile (sysdep_routines): Remove wcsnlen variants. * sysdeps/s390/Makefile (sysdep_routines): Add wcsnlen variants. * sysdeps/s390/multiarch/ifunc-impl-list.c (__libc_ifunc_impl_list): Refactor ifunc handling for wcsnlen. * sysdeps/s390/multiarch/wcsnlen-c.c: Move to ... * sysdeps/s390/wcsnlen-c.c: ... here and adjust ifunc handling. * sysdeps/s390/multiarch/wcsnlen-vx.S: Move to ... * sysdeps/s390/wcsnlen-vx.S: ... here and adjust ifunc handling. * sysdeps/s390/multiarch/wcsnlen.c: Move to ... * sysdeps/s390/wcsnlen.c: ... here and adjust ifunc handling. * sysdeps/s390/ifunc-wcsnlen.h: New file.
Diffstat (limited to 'sysdeps/s390/ifunc-wcsnlen.h')
| -rw-r--r-- | sysdeps/s390/ifunc-wcsnlen.h | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/sysdeps/s390/ifunc-wcsnlen.h b/sysdeps/s390/ifunc-wcsnlen.h new file mode 100644 index 0000000000..b5b21da2f1 --- /dev/null +++ b/sysdeps/s390/ifunc-wcsnlen.h @@ -0,0 +1,53 @@ +/* wcsnlen 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_WCSNLEN_IFUNC 1 +#else +# define HAVE_WCSNLEN_IFUNC 0 +#endif + +#ifdef HAVE_S390_VX_ASM_SUPPORT +# define HAVE_WCSNLEN_IFUNC_AND_VX_SUPPORT HAVE_WCSNLEN_IFUNC +#else +# define HAVE_WCSNLEN_IFUNC_AND_VX_SUPPORT 0 +#endif + +#if defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT +# define WCSNLEN_DEFAULT WCSNLEN_Z13 +/* The z13 ifunc variant is using the common code variant as fallback! */ +# define HAVE_WCSNLEN_C 1 +# define HAVE_WCSNLEN_Z13 1 +#else +# define WCSNLEN_DEFAULT WCSNLEN_C +# define HAVE_WCSNLEN_C 1 +# define HAVE_WCSNLEN_Z13 HAVE_WCSNLEN_IFUNC_AND_VX_SUPPORT +#endif + +#if HAVE_WCSNLEN_C +# define WCSNLEN_C __wcsnlen_c +#else +# define WCSNLEN_C NULL +#endif + +#if HAVE_WCSNLEN_Z13 +# define WCSNLEN_Z13 __wcsnlen_vx +#else +# define WCSNLEN_Z13 NULL +#endif |