about summary refs log tree commit diff
path: root/sysdeps/s390/wcsncat.c
diff options
context:
space:
mode:
authorStefan Liebler <stli@linux.ibm.com>2018-12-18 13:57:20 +0100
committerStefan Liebler <stli@linux.ibm.com>2018-12-18 13:57:20 +0100
commit814a76e1bcc59e6c4899279ede887bf9fecf5a40 (patch)
tree8dd3160e2dcdbd4cbce3d044dcf7c52be0131ca0 /sysdeps/s390/wcsncat.c
parent3389cae427b4032c3a991cb32b5178a85a652d84 (diff)
downloadglibc-814a76e1bcc59e6c4899279ede887bf9fecf5a40.tar.gz
glibc-814a76e1bcc59e6c4899279ede887bf9fecf5a40.tar.xz
glibc-814a76e1bcc59e6c4899279ede887bf9fecf5a40.zip
S390: Refactor wcsncat ifunc handling.
The ifunc handling for wcsncat 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 wcsncat variants.
	* sysdeps/s390/Makefile (sysdep_routines): Add wcsncat variants.
	* sysdeps/s390/multiarch/ifunc-impl-list.c
	(__libc_ifunc_impl_list): Refactor ifunc handling for wcsncat.
	* sysdeps/s390/multiarch/wcsncat-c.c: Move to ...
	* sysdeps/s390/wcsncat-c.c: ... here and adjust ifunc handling.
	* sysdeps/s390/multiarch/wcsncat-vx.S: Move to ...
	* sysdeps/s390/wcsncat-vx.S: ... here and adjust ifunc handling.
	* sysdeps/s390/multiarch/wcsncat.c: Move to ...
	* sysdeps/s390/wcsncat.c: ... here and adjust ifunc handling.
	* sysdeps/s390/ifunc-wcsncat.h: New file.
Diffstat (limited to 'sysdeps/s390/wcsncat.c')
-rw-r--r--sysdeps/s390/wcsncat.c38
1 files changed, 38 insertions, 0 deletions
diff --git a/sysdeps/s390/wcsncat.c b/sysdeps/s390/wcsncat.c
new file mode 100644
index 0000000000..722429fd5b
--- /dev/null
+++ b/sysdeps/s390/wcsncat.c
@@ -0,0 +1,38 @@
+/* Multiple versions of wcsncat.
+   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-wcsncat.h>
+
+#if HAVE_WCSNCAT_IFUNC
+# include <wchar.h>
+# include <ifunc-resolve.h>
+
+# if HAVE_WCSNCAT_C
+extern __typeof (wcsncat) WCSNCAT_C attribute_hidden;
+# endif
+
+# if HAVE_WCSNCAT_Z13
+extern __typeof (wcsncat) WCSNCAT_Z13 attribute_hidden;
+# endif
+
+s390_libc_ifunc_expr (wcsncat, wcsncat,
+		      (HAVE_WCSNCAT_Z13 && (hwcap & HWCAP_S390_VX))
+		      ? WCSNCAT_Z13
+		      : WCSNCAT_DEFAULT
+		      )
+#endif