about summary refs log tree commit diff
path: root/sysdeps/s390/wcsspn.c
diff options
context:
space:
mode:
authorStefan Liebler <stli@linux.ibm.com>2018-12-18 13:57:23 +0100
committerStefan Liebler <stli@linux.ibm.com>2018-12-18 13:57:23 +0100
commit8507e831907ff46d06382fe453c6832db2594e0b (patch)
treebbd4dfec5613ae9cf8001c9274efe150e8c5b1c5 /sysdeps/s390/wcsspn.c
parent4753713aaed400d88cfc598e25d504478120b065 (diff)
downloadglibc-8507e831907ff46d06382fe453c6832db2594e0b.tar.gz
glibc-8507e831907ff46d06382fe453c6832db2594e0b.tar.xz
glibc-8507e831907ff46d06382fe453c6832db2594e0b.zip
S390: Refactor wcsspn ifunc handling.
The ifunc handling for wcsspn 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 wcsspn variants.
	* sysdeps/s390/Makefile (sysdep_routines): Add wcsspn variants.
	* sysdeps/s390/multiarch/ifunc-impl-list.c
	(__libc_ifunc_impl_list): Refactor ifunc handling for wcsspn.
	* sysdeps/s390/multiarch/wcsspn-c.c: Move to ...
	* sysdeps/s390/wcsspn-c.c: ... here and adjust ifunc handling.
	* sysdeps/s390/multiarch/wcsspn-vx.S: Move to ...
	* sysdeps/s390/wcsspn-vx.S: ... here and adjust ifunc handling.
	* sysdeps/s390/multiarch/wcsspn.c: Move to ...
	* sysdeps/s390/wcsspn.c: ... here and adjust ifunc handling.
	* sysdeps/s390/ifunc-wcsspn.h: New file.
Diffstat (limited to 'sysdeps/s390/wcsspn.c')
-rw-r--r--sysdeps/s390/wcsspn.c39
1 files changed, 39 insertions, 0 deletions
diff --git a/sysdeps/s390/wcsspn.c b/sysdeps/s390/wcsspn.c
new file mode 100644
index 0000000000..e916b1e441
--- /dev/null
+++ b/sysdeps/s390/wcsspn.c
@@ -0,0 +1,39 @@
+/* Multiple versions of wcsspn.
+   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-wcsspn.h>
+
+#if HAVE_WCSSPN_IFUNC
+# define wcsspn __redirect_wcsspn
+# include <wchar.h>
+# undef wcsspn
+# include <ifunc-resolve.h>
+# if HAVE_WCSSPN_C
+extern __typeof (__redirect_wcsspn) WCSSPN_C attribute_hidden;
+# endif
+
+# if HAVE_WCSSPN_Z13
+extern __typeof (__redirect_wcsspn) WCSSPN_Z13 attribute_hidden;
+# endif
+
+s390_libc_ifunc_expr (__redirect_wcsspn, wcsspn,
+		      (HAVE_WCSSPN_Z13 && (hwcap & HWCAP_S390_VX))
+		      ? WCSSPN_Z13
+		      : WCSSPN_DEFAULT
+		      )
+#endif