From 0966dd86896d7cd6c107c751ba7d3b69542ca11d Mon Sep 17 00:00:00 2001 From: Stefan Liebler Date: Tue, 18 Dec 2018 13:57:19 +0100 Subject: S390: Refactor wcsncpy ifunc handling. The ifunc handling for wcsncpy 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. ChangeLog: * sysdeps/s390/multiarch/Makefile (sysdep_routines): Remove wcsncpy variants. * sysdeps/s390/Makefile (sysdep_routines): Add wcsncpy variants. * sysdeps/s390/multiarch/ifunc-impl-list.c (__libc_ifunc_impl_list): Refactor ifunc handling for wcsncpy. * sysdeps/s390/multiarch/wcsncpy-c.c: Move to ... * sysdeps/s390/wcsncpy-c.c: ... here and adjust ifunc handling. * sysdeps/s390/multiarch/wcsncpy-vx.S: Move to ... * sysdeps/s390/wcsncpy-vx.S: ... here and adjust ifunc handling. * sysdeps/s390/multiarch/wcsncpy.c: Move to ... * sysdeps/s390/wcsncpy.c: ... here and adjust ifunc handling. * sysdeps/s390/ifunc-wcsncpy.h: New file. --- sysdeps/s390/ifunc-wcsncpy.h | 53 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 sysdeps/s390/ifunc-wcsncpy.h (limited to 'sysdeps/s390/ifunc-wcsncpy.h') diff --git a/sysdeps/s390/ifunc-wcsncpy.h b/sysdeps/s390/ifunc-wcsncpy.h new file mode 100644 index 0000000000..d7beca128a --- /dev/null +++ b/sysdeps/s390/ifunc-wcsncpy.h @@ -0,0 +1,53 @@ +/* wcsncpy 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 + . */ + +#if defined USE_MULTIARCH && IS_IN (libc) \ + && ! defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT +# define HAVE_WCSNCPY_IFUNC 1 +#else +# define HAVE_WCSNCPY_IFUNC 0 +#endif + +#ifdef HAVE_S390_VX_ASM_SUPPORT +# define HAVE_WCSNCPY_IFUNC_AND_VX_SUPPORT HAVE_WCSNCPY_IFUNC +#else +# define HAVE_WCSNCPY_IFUNC_AND_VX_SUPPORT 0 +#endif + +#if defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT +# define WCSNCPY_DEFAULT WCSNCPY_Z13 +/* The z13 ifunc variant is using the common code variant as fallback! */ +# define HAVE_WCSNCPY_C 1 +# define HAVE_WCSNCPY_Z13 1 +#else +# define WCSNCPY_DEFAULT WCSNCPY_C +# define HAVE_WCSNCPY_C 1 +# define HAVE_WCSNCPY_Z13 HAVE_WCSNCPY_IFUNC_AND_VX_SUPPORT +#endif + +#if HAVE_WCSNCPY_C +# define WCSNCPY_C __wcsncpy_c +#else +# define WCSNCPY_C NULL +#endif + +#if HAVE_WCSNCPY_Z13 +# define WCSNCPY_Z13 __wcsncpy_vx +#else +# define WCSNCPY_Z13 NULL +#endif -- cgit v1.2.3-70-g09d2