S390: Refactor strchr ifunc handling.

The ifunc handling for strchr is adjusted in order to omit ifunc
variants if those will never be used as the minimum architecture level
already supports newer CPUs by default.
Glibc internal calls will then also use the "newer" ifunc variant.

ChangeLog:

	* sysdeps/s390/multiarch/Makefile
	(sysdep_routines): Remove strchr variants.
	* sysdeps/s390/Makefile (sysdep_routines): Add strchr variants.
	* sysdeps/s390/multiarch/ifunc-impl-list.c
	(__libc_ifunc_impl_list): Refactor ifunc handling for strchr.
	* sysdeps/s390/multiarch/strchr-c.c: Move to ...
	* sysdeps/s390/strchr-c.c: ... here and adjust ifunc handling.
	* sysdeps/s390/multiarch/strchr-vx.S: Move to ...
	* sysdeps/s390/strchr-vx.S: ... here and adjust ifunc handling.
	* sysdeps/s390/multiarch/strchr.c: Move to ...
	* sysdeps/s390/strchr.c: ... here and adjust ifunc handling.
	* sysdeps/s390/ifunc-strchr.h: New file.

5 files changed, 14 insertions, 164 deletions

diff --git a/sysdeps/s390/multiarch/Makefile b/sysdeps/s390/multiarch/Makefile
index 381376bf9f..a8e9d0acd9 100644
--- a/sysdeps/s390/multiarch/Makefile
+++ b/sysdeps/s390/multiarch/Makefile
@@ -1,6 +1,5 @@
 ifeq ($(subdir),string)
-sysdep_routines += strchr strchr-vx strchr-c \
-		   strchrnul strchrnul-vx strchrnul-c \
+sysdep_routines += strchrnul strchrnul-vx strchrnul-c \
 		   strrchr strrchr-vx strrchr-c \
 		   strspn strspn-vx strspn-c \
 		   strpbrk strpbrk-vx strpbrk-c \
diff --git a/sysdeps/s390/multiarch/ifunc-impl-list.c b/sysdeps/s390/multiarch/ifunc-impl-list.c
index d982de5788..e809ca3bac 100644
--- a/sysdeps/s390/multiarch/ifunc-impl-list.c
+++ b/sysdeps/s390/multiarch/ifunc-impl-list.c
@@ -36,6 +36,7 @@
 #include <ifunc-strncat.h>
 #include <ifunc-strcmp.h>
 #include <ifunc-strncmp.h>
+#include <ifunc-strchr.h>
 
 /* Maximum number of IFUNC implementations.  */
 #define MAX_IFUNC	3
@@ -294,6 +295,18 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
 		)
 #endif /* HAVE_STRNCMP_IFUNC  */
 
+#if HAVE_STRCHR_IFUNC
+    IFUNC_IMPL (i, name, strchr,
+# if HAVE_STRCHR_Z13
+		IFUNC_IMPL_ADD (array, i, strchr,
+				dl_hwcap & HWCAP_S390_VX, STRCHR_Z13)
+# endif
+# if HAVE_STRCHR_C
+		IFUNC_IMPL_ADD (array, i, strchr, 1, STRCHR_C)
+# endif
+		)
+#endif /* HAVE_STRCHR_IFUNC  */
+
 #ifdef HAVE_S390_VX_ASM_SUPPORT
 
 # define IFUNC_VX_IMPL(FUNC)						\
@@ -322,7 +335,6 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
 
   IFUNC_VX_IMPL (wcsncmp);
 
-  IFUNC_VX_IMPL (strchr);
   IFUNC_VX_IMPL (wcschr);
 
   IFUNC_VX_IMPL (strchrnul);
diff --git a/sysdeps/s390/multiarch/strchr-c.c b/sysdeps/s390/multiarch/strchr-c.c
deleted file mode 100644
index 606cb56788..0000000000
--- a/sysdeps/s390/multiarch/strchr-c.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Default strchr 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 STRCHR  __strchr_c
-# undef weak_alias
-# ifdef SHARED
-#  undef libc_hidden_builtin_def
-#  define libc_hidden_builtin_def(name)				\
-     __hidden_ver1 (__strchr_c, __GI_strchr, __strchr_c);
-# endif /* SHARED */
-
-# include <string/strchr.c>
-#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */
diff --git a/sysdeps/s390/multiarch/strchr-vx.S b/sysdeps/s390/multiarch/strchr-vx.S
deleted file mode 100644
index 6e744fb82f..0000000000
--- a/sysdeps/s390/multiarch/strchr-vx.S
+++ /dev/null
@@ -1,100 +0,0 @@
-/* Vector optimized 32/64 bit S/390 version of strchr.
-   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
-
-/* char *strchr (const char *s, int c)
-   Locate character in string.
-
-   Register usage:
-   -r1=tmp
-   -r2=s
-   -r3=c
-   -r4=tmp
-   -r5=current_len
-   -v16=part of s
-   -v17=index of unequal
-   -v18=replicated c
-*/
-ENTRY(__strchr_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.  */
-
-	lghi	%r5,0		/* current_len = 0.  */
-
-	vlvgb	%v18,%r3,0	/* Generate vector which elements are all c.
-				   If c > 255, c will be truncated.  */
-	vrepb	%v18,%v18,0
-
-	vfeezbs	%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 16 byte aligned loop */
-.Lloop:
-	vl	%v16,0(%r5,%r2) /* Load s.  */
-	vfeezbs	%v16,%v16,%v18	/* Find element equal with zero search.  */
-	jno	.Lfound		/* Found c/zero (cc=0|1|2).  */
-	vl	%v16,16(%r5,%r2)
-	vfeezbs	%v16,%v16,%v18
-	jno	.Lfound16
-	vl	%v16,32(%r5,%r2)
-	vfeezbs	%v16,%v16,%v18
-	jno	.Lfound32
-	vl	%v16,48(%r5,%r2)
-	vfeezbs	%v16,%v16,%v18
-	jno	.Lfound48
-
-	aghi	%r5,64
-	j	.Lloop		/* No character and no zero -> loop.  */
-
-.Lfound48:
-	la	%r5,16(%r5)	/* Use la since aghi would clobber cc.  */
-.Lfound32:
-	la	%r5,16(%r5)
-.Lfound16:
-	la	%r5,16(%r5)
-.Lfound:
-	je	.Lzero		/* Found zero, but no c before that zero.  */
-
-.Lcharacter:
-	vlgvb	%r4,%v16,7	/* Load byte index of character.  */
-	algr	%r5,%r4
-	la	%r2,0(%r5,%r2)	/* Return pointer to character.  */
-	br	%r14
-
-.Lzero:
-	llgcr	%r3,%r3		/* char c_char = (char) c.  */
-	clije	%r3,0,.Lcharacter /* Found zero and c is zero.  */
-	lghi	%r2,0		/* Return null if character not found.  */
-	br	%r14
-END(__strchr_vx)
-#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */
diff --git a/sysdeps/s390/multiarch/strchr.c b/sysdeps/s390/multiarch/strchr.c
deleted file mode 100644
index 8aa33a51cc..0000000000
--- a/sysdeps/s390/multiarch/strchr.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Multiple versions of strchr.
-   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 strchr __redirect_strchr
-/* Omit the strchr inline definitions because it would redefine strchr.  */
-# define __NO_STRING_INLINES
-# include <string.h>
-# undef strchr
-# include <ifunc-resolve.h>
-
-s390_vx_libc_ifunc2_redirected (__redirect_strchr, __strchr, strchr)
-weak_alias (strchr, index)
-
-#else
-# include <string/strchr.c>
-#endif /* !(defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)) */