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.

5 files changed, 14 insertions, 154 deletions

diff --git a/sysdeps/s390/multiarch/Makefile b/sysdeps/s390/multiarch/Makefile
index b282613b47..0eb01d5d84 100644
--- a/sysdeps/s390/multiarch/Makefile
+++ b/sysdeps/s390/multiarch/Makefile
@@ -1,6 +1,5 @@
 ifeq ($(subdir),wcsmbs)
-sysdep_routines += wcschrnul wcschrnul-vx wcschrnul-c \
-		   wcsrchr wcsrchr-vx wcsrchr-c \
+sysdep_routines += wcsrchr wcsrchr-vx wcsrchr-c \
 		   wcsspn wcsspn-vx wcsspn-c \
 		   wcspbrk wcspbrk-vx wcspbrk-c \
 		   wcscspn wcscspn-vx wcscspn-c \
diff --git a/sysdeps/s390/multiarch/ifunc-impl-list.c b/sysdeps/s390/multiarch/ifunc-impl-list.c
index c69165465d..553a76c39e 100644
--- a/sysdeps/s390/multiarch/ifunc-impl-list.c
+++ b/sysdeps/s390/multiarch/ifunc-impl-list.c
@@ -57,6 +57,7 @@
 #include <ifunc-wcscmp.h>
 #include <ifunc-wcsncmp.h>
 #include <ifunc-wcschr.h>
+#include <ifunc-wcschrnul.h>
 
 /* Maximum number of IFUNC implementations.  */
 #define MAX_IFUNC	3
@@ -567,6 +568,18 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
 		)
 #endif /* HAVE_WCSCHR_IFUNC  */
 
+#if HAVE_WCSCHRNUL_IFUNC
+    IFUNC_IMPL (i, name, wcschrnul,
+# if HAVE_WCSCHRNUL_Z13
+		IFUNC_IMPL_ADD (array, i, wcschrnul,
+				dl_hwcap & HWCAP_S390_VX, WCSCHRNUL_Z13)
+# endif
+# if HAVE_WCSCHRNUL_C
+		IFUNC_IMPL_ADD (array, i, wcschrnul, 1, WCSCHRNUL_C)
+# endif
+		)
+#endif /* HAVE_WCSCHRNUL_IFUNC  */
+
 #ifdef HAVE_S390_VX_ASM_SUPPORT
 
 # define IFUNC_VX_IMPL(FUNC)						\
@@ -575,8 +588,6 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
 			      __##FUNC##_vx)				\
 	      IFUNC_IMPL_ADD (array, i, FUNC, 1, __##FUNC##_c))
 
-  IFUNC_VX_IMPL (wcschrnul);
-
   IFUNC_VX_IMPL (wcsrchr);
 
   IFUNC_VX_IMPL (wcsspn);
diff --git a/sysdeps/s390/multiarch/wcschrnul-c.c b/sysdeps/s390/multiarch/wcschrnul-c.c
deleted file mode 100644
index 00e776a3ad..0000000000
--- a/sysdeps/s390/multiarch/wcschrnul-c.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Default wcschrnul 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/>.  */
-
-#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)
-# define WCSCHRNUL  __wcschrnul_c
-
-# include <wchar.h>
-extern __typeof (__wcschrnul) __wcschrnul_c;
-# include <wcsmbs/wcschrnul.c>
-#endif
diff --git a/sysdeps/s390/multiarch/wcschrnul-vx.S b/sysdeps/s390/multiarch/wcschrnul-vx.S
deleted file mode 100644
index ebcd32b870..0000000000
--- a/sysdeps/s390/multiarch/wcschrnul-vx.S
+++ /dev/null
@@ -1,97 +0,0 @@
-/* Vector optimized 32/64 bit S/390 version 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
-   <http://www.gnu.org/licenses/>.  */
-
-#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)
-
-# include "sysdep.h"
-# include "asm-syntax.h"
-
-	.text
-
-/* wchar_t* wcschrnul (const wchar_t *s, wchar_t c)
-   Returns pointer to first c or to \0 if c not found.
-
-   Register usage:
-   -r1=tmp
-   -r2=s and return pointer
-   -r3=c
-   -r4=tmp
-   -r5=current_len
-   -v16=part of s
-   -v18=vector with c replicated in every byte
-*/
-ENTRY(__wcschrnul_vx)
-	.machine "z13"
-	.machinemode "zarch_nohighgprs"
-
-	vlbb	%v16,0(%r2),6	/* Load s until next 4k-byte boundary.  */
-	lcbb	%r1,0(%r2),6	/* Get bytes to 4k-byte boundary or 16.  */
-
-	tmll	%r2,3		/* Test if s is 4-byte aligned?   */
-	jne	.Lfallback	/* And use common-code variant if not.  */
-
-	lghi	%r5,0		/* current_len = 0.  */
-
-	vlvgf	%v18,%r3,0	/* Generate vector which elements are all c.  */
-	vrepf	%v18,%v18,0
-
-	vfeezfs	%v16,%v16,%v18	/* Find element equal with zero search.  */
-	vlgvb	%r4,%v16,7	/* Load byte index of character or zero.  */
-	clrjl	%r4,%r1,.Lfound /* Return if c/zero is in loaded bytes.  */
-
-	/* Align s to 16 byte.  */
-	risbgn	%r4,%r2,60,128+63,0 /* %r3 = bits 60-63 of %r2 'and' 15.  */
-	lghi	%r5,16		/* current_len = 16.  */
-	slr	%r5,%r4		/* Compute bytes to 16bytes boundary.  */
-
-	/* Find c/zero in 16byte aligned loop */
-.Lloop:
-	vl	%v16,0(%r5,%r2) /* Load s.  */
-	vfeezfs	%v16,%v16,%v18	/* Find element equal with zero search.  */
-	jno	.Lfound		/* Found c/zero (cc=0|1|2).  */
-	vl	%v16,16(%r5,%r2)
-	vfeezfs	%v16,%v16,%v18
-	jno	.Lfound16
-	vl	%v16,32(%r5,%r2)
-	vfeezfs	%v16,%v16,%v18
-	jno	.Lfound32
-	vl	%v16,48(%r5,%r2)
-	vfeezfs	%v16,%v16,%v18
-	jno	.Lfound48
-
-	aghi	%r5,64
-	j	.Lloop		/* No character and no zero -> loop.  */
-
-	/* Found character or zero */
-.Lfound48:
-	aghi	%r5,16
-.Lfound32:
-	aghi	%r5,16
-.Lfound16:
-	aghi	%r5,16
-.Lfound:
-	vlgvb	%r1,%v16,7	/* Load byte index of character.  */
-	algr	%r5,%r1
-	la	%r2,0(%r5,%r2)	/* Return pointer to character.  */
-
-.Lend:
-	br	%r14
-.Lfallback:
-	jg	__wcschrnul_c
-END(__wcschrnul_vx)
-#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */
diff --git a/sysdeps/s390/multiarch/wcschrnul.c b/sysdeps/s390/multiarch/wcschrnul.c
deleted file mode 100644
index 807d7ee089..0000000000
--- a/sysdeps/s390/multiarch/wcschrnul.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* 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
-   <http://www.gnu.org/licenses/>.  */
-
-#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)
-# include <wchar.h>
-# include <ifunc-resolve.h>
-
-s390_vx_libc_ifunc (__wcschrnul)
-weak_alias (__wcschrnul, wcschrnul)
-
-#else
-# include <wcsmbs/wcschrnul.c>
-#endif /* !(defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)) */