about summary refs log tree commit diff
path: root/sysdeps/s390/wcsnlen-c.c
diff options
context:
space:
mode:
authorStefan Liebler <stli@linux.ibm.com>2018-12-18 13:57:18 +0100
committerStefan Liebler <stli@linux.ibm.com>2018-12-18 13:57:18 +0100
commitc7e7cd266ed123b6dfb722f599934ca5dcfd3e93 (patch)
tree7ef5ef26b7fbed31024f59cefa691369968eea19 /sysdeps/s390/wcsnlen-c.c
parent2e02d0b7a9bf3421638d2d0f2526275a1df5c0da (diff)
downloadglibc-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/wcsnlen-c.c')
-rw-r--r--sysdeps/s390/wcsnlen-c.c27
1 files changed, 27 insertions, 0 deletions
diff --git a/sysdeps/s390/wcsnlen-c.c b/sysdeps/s390/wcsnlen-c.c
new file mode 100644
index 0000000000..7495a6f97c
--- /dev/null
+++ b/sysdeps/s390/wcsnlen-c.c
@@ -0,0 +1,27 @@
+/* Default wcsnlen implementation for S/390.
+   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-wcsnlen.h>
+
+#if HAVE_WCSNLEN_C
+# if HAVE_WCSNLEN_IFUNC || HAVE_WCSNLEN_Z13
+#  define WCSNLEN WCSNLEN_C
+# endif
+
+# include <wcsmbs/wcsnlen.c>
+#endif