From c09c1b6f014a45f6c4ba189f5ae94b1fb1a2982a Mon Sep 17 00:00:00 2001 From: Stefan Liebler Date: Tue, 18 Dec 2018 13:57:22 +0100 Subject: S390: Refactor wcschrnul ifunc handling. The ifunc handling for wcschrnul 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 wcschrnul variants. * sysdeps/s390/Makefile (sysdep_routines): Add wcschrnul variants. * sysdeps/s390/multiarch/ifunc-impl-list.c (__libc_ifunc_impl_list): Refactor ifunc handling for wcschrnul. * sysdeps/s390/multiarch/wcschrnul-c.c: Move to ... * sysdeps/s390/wcschrnul-c.c: ... here and adjust ifunc handling. * sysdeps/s390/multiarch/wcschrnul-vx.S: Move to ... * sysdeps/s390/wcschrnul-vx.S: ... here and adjust ifunc handling. * sysdeps/s390/multiarch/wcschrnul.c: Move to ... * sysdeps/s390/wcschrnul.c: ... here and adjust ifunc handling. * sysdeps/s390/ifunc-wcschrnul.h: New file. --- sysdeps/s390/wcschrnul.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 sysdeps/s390/wcschrnul.c (limited to 'sysdeps/s390/wcschrnul.c') diff --git a/sysdeps/s390/wcschrnul.c b/sysdeps/s390/wcschrnul.c new file mode 100644 index 0000000000..ab5aaf0402 --- /dev/null +++ b/sysdeps/s390/wcschrnul.c @@ -0,0 +1,39 @@ +/* Multiple versions of wcschrnul. + 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 + . */ + +#include + +#if HAVE_WCSCHRNUL_IFUNC +# include +# include + +# if HAVE_WCSCHRNUL_C +extern __typeof (__wcschrnul) WCSCHRNUL_C attribute_hidden; +# endif + +# if HAVE_WCSCHRNUL_Z13 +extern __typeof (__wcschrnul) WCSCHRNUL_Z13 attribute_hidden; +# endif + +s390_libc_ifunc_expr (__wcschrnul, __wcschrnul, + (HAVE_WCSCHRNUL_Z13 && (hwcap & HWCAP_S390_VX)) + ? WCSCHRNUL_Z13 + : WCSCHRNUL_DEFAULT + ) +weak_alias (__wcschrnul, wcschrnul) +#endif -- cgit 1.4.1