077c9d
commit 32f12653d4ea2fbff409351bf8067f9a0b4a3963
077c9d
Author: Stefan Liebler <stli@linux.ibm.com>
077c9d
Date:   Tue Dec 18 13:57:14 2018 +0100
077c9d
077c9d
    S390: Refactor strchr ifunc handling.
077c9d
    
077c9d
    The ifunc handling for strchr is adjusted in order to omit ifunc
077c9d
    variants if those will never be used as the minimum architecture level
077c9d
    already supports newer CPUs by default.
077c9d
    Glibc internal calls will then also use the "newer" ifunc variant.
077c9d
    
077c9d
    ChangeLog:
077c9d
    
077c9d
            * sysdeps/s390/multiarch/Makefile
077c9d
            (sysdep_routines): Remove strchr variants.
077c9d
            * sysdeps/s390/Makefile (sysdep_routines): Add strchr variants.
077c9d
            * sysdeps/s390/multiarch/ifunc-impl-list.c
077c9d
            (__libc_ifunc_impl_list): Refactor ifunc handling for strchr.
077c9d
            * sysdeps/s390/multiarch/strchr-c.c: Move to ...
077c9d
            * sysdeps/s390/strchr-c.c: ... here and adjust ifunc handling.
077c9d
            * sysdeps/s390/multiarch/strchr-vx.S: Move to ...
077c9d
            * sysdeps/s390/strchr-vx.S: ... here and adjust ifunc handling.
077c9d
            * sysdeps/s390/multiarch/strchr.c: Move to ...
077c9d
            * sysdeps/s390/strchr.c: ... here and adjust ifunc handling.
077c9d
            * sysdeps/s390/ifunc-strchr.h: New file.
077c9d
077c9d
diff --git a/sysdeps/s390/Makefile b/sysdeps/s390/Makefile
077c9d
index adf3521876725ac8..8bb396f498e0b0b0 100644
077c9d
--- a/sysdeps/s390/Makefile
077c9d
+++ b/sysdeps/s390/Makefile
077c9d
@@ -46,5 +46,6 @@ sysdep_routines += bzero memset memset-z900 \
077c9d
 		   strcat strcat-vx strcat-c \
077c9d
 		   strncat strncat-vx strncat-c \
077c9d
 		   strcmp strcmp-vx strcmp-z900 \
077c9d
-		   strncmp strncmp-vx strncmp-c
077c9d
+		   strncmp strncmp-vx strncmp-c \
077c9d
+		   strchr strchr-vx strchr-c
077c9d
 endif
077c9d
diff --git a/sysdeps/s390/ifunc-strchr.h b/sysdeps/s390/ifunc-strchr.h
077c9d
new file mode 100644
077c9d
index 0000000000000000..cfeb00eeda890512
077c9d
--- /dev/null
077c9d
+++ b/sysdeps/s390/ifunc-strchr.h
077c9d
@@ -0,0 +1,52 @@
077c9d
+/* strchr variant information on S/390 version.
077c9d
+   Copyright (C) 2018 Free Software Foundation, Inc.
077c9d
+   This file is part of the GNU C Library.
077c9d
+
077c9d
+   The GNU C Library is free software; you can redistribute it and/or
077c9d
+   modify it under the terms of the GNU Lesser General Public
077c9d
+   License as published by the Free Software Foundation; either
077c9d
+   version 2.1 of the License, or (at your option) any later version.
077c9d
+
077c9d
+   The GNU C Library is distributed in the hope that it will be useful,
077c9d
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
077c9d
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
077c9d
+   Lesser General Public License for more details.
077c9d
+
077c9d
+   You should have received a copy of the GNU Lesser General Public
077c9d
+   License along with the GNU C Library; if not, see
077c9d
+   <http://www.gnu.org/licenses/>.  */
077c9d
+
077c9d
+#if defined USE_MULTIARCH && IS_IN (libc)		\
077c9d
+  && ! defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT
077c9d
+# define HAVE_STRCHR_IFUNC	1
077c9d
+#else
077c9d
+# define HAVE_STRCHR_IFUNC	0
077c9d
+#endif
077c9d
+
077c9d
+#ifdef HAVE_S390_VX_ASM_SUPPORT
077c9d
+# define HAVE_STRCHR_IFUNC_AND_VX_SUPPORT HAVE_STRCHR_IFUNC
077c9d
+#else
077c9d
+# define HAVE_STRCHR_IFUNC_AND_VX_SUPPORT 0
077c9d
+#endif
077c9d
+
077c9d
+#if defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT
077c9d
+# define STRCHR_DEFAULT		STRCHR_Z13
077c9d
+# define HAVE_STRCHR_C		0
077c9d
+# define HAVE_STRCHR_Z13	1
077c9d
+#else
077c9d
+# define STRCHR_DEFAULT		STRCHR_C
077c9d
+# define HAVE_STRCHR_C		1
077c9d
+# define HAVE_STRCHR_Z13	HAVE_STRCHR_IFUNC_AND_VX_SUPPORT
077c9d
+#endif
077c9d
+
077c9d
+#if HAVE_STRCHR_C
077c9d
+# define STRCHR_C		__strchr_c
077c9d
+#else
077c9d
+# define STRCHR_C		NULL
077c9d
+#endif
077c9d
+
077c9d
+#if HAVE_STRCHR_Z13
077c9d
+# define STRCHR_Z13		__strchr_vx
077c9d
+#else
077c9d
+# define STRCHR_Z13		NULL
077c9d
+#endif
077c9d
diff --git a/sysdeps/s390/multiarch/Makefile b/sysdeps/s390/multiarch/Makefile
077c9d
index 381376bf9fcb0f58..a8e9d0acd9ebf986 100644
077c9d
--- a/sysdeps/s390/multiarch/Makefile
077c9d
+++ b/sysdeps/s390/multiarch/Makefile
077c9d
@@ -1,6 +1,5 @@
077c9d
 ifeq ($(subdir),string)
077c9d
-sysdep_routines += strchr strchr-vx strchr-c \
077c9d
-		   strchrnul strchrnul-vx strchrnul-c \
077c9d
+sysdep_routines += strchrnul strchrnul-vx strchrnul-c \
077c9d
 		   strrchr strrchr-vx strrchr-c \
077c9d
 		   strspn strspn-vx strspn-c \
077c9d
 		   strpbrk strpbrk-vx strpbrk-c \
077c9d
diff --git a/sysdeps/s390/multiarch/ifunc-impl-list.c b/sysdeps/s390/multiarch/ifunc-impl-list.c
077c9d
index d982de5788c0b5d5..e809ca3bacb18aa9 100644
077c9d
--- a/sysdeps/s390/multiarch/ifunc-impl-list.c
077c9d
+++ b/sysdeps/s390/multiarch/ifunc-impl-list.c
077c9d
@@ -36,6 +36,7 @@
077c9d
 #include <ifunc-strncat.h>
077c9d
 #include <ifunc-strcmp.h>
077c9d
 #include <ifunc-strncmp.h>
077c9d
+#include <ifunc-strchr.h>
077c9d
 
077c9d
 /* Maximum number of IFUNC implementations.  */
077c9d
 #define MAX_IFUNC	3
077c9d
@@ -294,6 +295,18 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
077c9d
 		)
077c9d
 #endif /* HAVE_STRNCMP_IFUNC  */
077c9d
 
077c9d
+#if HAVE_STRCHR_IFUNC
077c9d
+    IFUNC_IMPL (i, name, strchr,
077c9d
+# if HAVE_STRCHR_Z13
077c9d
+		IFUNC_IMPL_ADD (array, i, strchr,
077c9d
+				dl_hwcap & HWCAP_S390_VX, STRCHR_Z13)
077c9d
+# endif
077c9d
+# if HAVE_STRCHR_C
077c9d
+		IFUNC_IMPL_ADD (array, i, strchr, 1, STRCHR_C)
077c9d
+# endif
077c9d
+		)
077c9d
+#endif /* HAVE_STRCHR_IFUNC  */
077c9d
+
077c9d
 #ifdef HAVE_S390_VX_ASM_SUPPORT
077c9d
 
077c9d
 # define IFUNC_VX_IMPL(FUNC)						\
077c9d
@@ -322,7 +335,6 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
077c9d
 
077c9d
   IFUNC_VX_IMPL (wcsncmp);
077c9d
 
077c9d
-  IFUNC_VX_IMPL (strchr);
077c9d
   IFUNC_VX_IMPL (wcschr);
077c9d
 
077c9d
   IFUNC_VX_IMPL (strchrnul);
077c9d
diff --git a/sysdeps/s390/multiarch/strchr-c.c b/sysdeps/s390/strchr-c.c
077c9d
similarity index 77%
077c9d
rename from sysdeps/s390/multiarch/strchr-c.c
077c9d
rename to sysdeps/s390/strchr-c.c
077c9d
index 606cb56788966153..3d3579a1d3bc06d0 100644
077c9d
--- a/sysdeps/s390/multiarch/strchr-c.c
077c9d
+++ b/sysdeps/s390/strchr-c.c
077c9d
@@ -16,14 +16,18 @@
077c9d
    License along with the GNU C Library; if not, see
077c9d
    <http://www.gnu.org/licenses/>.  */
077c9d
 
077c9d
-#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)
077c9d
-# define STRCHR  __strchr_c
077c9d
-# undef weak_alias
077c9d
-# ifdef SHARED
077c9d
-#  undef libc_hidden_builtin_def
077c9d
-#  define libc_hidden_builtin_def(name)				\
077c9d
+#include <ifunc-strchr.h>
077c9d
+
077c9d
+#if HAVE_STRCHR_C
077c9d
+# if HAVE_STRCHR_IFUNC
077c9d
+#  define STRCHR STRCHR_C
077c9d
+#  undef weak_alias
077c9d
+#  if defined SHARED && IS_IN (libc)
077c9d
+#   undef libc_hidden_builtin_def
077c9d
+#   define libc_hidden_builtin_def(name)			\
077c9d
      __hidden_ver1 (__strchr_c, __GI_strchr, __strchr_c);
077c9d
-# endif /* SHARED */
077c9d
+#  endif
077c9d
+# endif
077c9d
 
077c9d
 # include <string/strchr.c>
077c9d
-#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */
077c9d
+#endif
077c9d
diff --git a/sysdeps/s390/multiarch/strchr-vx.S b/sysdeps/s390/strchr-vx.S
077c9d
similarity index 90%
077c9d
rename from sysdeps/s390/multiarch/strchr-vx.S
077c9d
rename to sysdeps/s390/strchr-vx.S
077c9d
index 6e744fb82f3249a6..6ffa06f78c14c8da 100644
077c9d
--- a/sysdeps/s390/multiarch/strchr-vx.S
077c9d
+++ b/sysdeps/s390/strchr-vx.S
077c9d
@@ -16,7 +16,9 @@
077c9d
    License along with the GNU C Library; if not, see
077c9d
    <http://www.gnu.org/licenses/>.  */
077c9d
 
077c9d
-#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)
077c9d
+#include <ifunc-strchr.h>
077c9d
+
077c9d
+#if HAVE_STRCHR_Z13
077c9d
 
077c9d
 # include "sysdep.h"
077c9d
 # include "asm-syntax.h"
077c9d
@@ -36,7 +38,7 @@
077c9d
    -v17=index of unequal
077c9d
    -v18=replicated c
077c9d
 */
077c9d
-ENTRY(__strchr_vx)
077c9d
+ENTRY(STRCHR_Z13)
077c9d
 	.machine "z13"
077c9d
 	.machinemode "zarch_nohighgprs"
077c9d
 
077c9d
@@ -96,5 +98,15 @@ ENTRY(__strchr_vx)
077c9d
 	clije	%r3,0,.Lcharacter /* Found zero and c is zero.  */
077c9d
 	lghi	%r2,0		/* Return null if character not found.  */
077c9d
 	br	%r14
077c9d
-END(__strchr_vx)
077c9d
-#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */
077c9d
+END(STRCHR_Z13)
077c9d
+
077c9d
+# if ! HAVE_STRCHR_IFUNC
077c9d
+strong_alias (STRCHR_Z13, strchr)
077c9d
+weak_alias (strchr, index)
077c9d
+# endif
077c9d
+
077c9d
+# if ! HAVE_STRCHR_C && defined SHARED && IS_IN (libc)
077c9d
+strong_alias (STRCHR_Z13, __GI_strchr)
077c9d
+# endif
077c9d
+
077c9d
+#endif /* HAVE_STRCHR_Z13  */
077c9d
diff --git a/sysdeps/s390/multiarch/strchr.c b/sysdeps/s390/strchr.c
077c9d
similarity index 71%
077c9d
rename from sysdeps/s390/multiarch/strchr.c
077c9d
rename to sysdeps/s390/strchr.c
077c9d
index 8aa33a51cc7e91de..a106c6106dcd5307 100644
077c9d
--- a/sysdeps/s390/multiarch/strchr.c
077c9d
+++ b/sysdeps/s390/strchr.c
077c9d
@@ -16,7 +16,9 @@
077c9d
    License along with the GNU C Library; if not, see
077c9d
    <http://www.gnu.org/licenses/>.  */
077c9d
 
077c9d
-#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)
077c9d
+#include <ifunc-strchr.h>
077c9d
+
077c9d
+#if HAVE_STRCHR_IFUNC
077c9d
 # define strchr __redirect_strchr
077c9d
 /* Omit the strchr inline definitions because it would redefine strchr.  */
077c9d
 # define __NO_STRING_INLINES
077c9d
@@ -24,9 +26,18 @@
077c9d
 # undef strchr
077c9d
 # include <ifunc-resolve.h>
077c9d
 
077c9d
-s390_vx_libc_ifunc2_redirected (__redirect_strchr, __strchr, strchr)
077c9d
-weak_alias (strchr, index)
077c9d
+# if HAVE_STRCHR_C
077c9d
+extern __typeof (__redirect_strchr) STRCHR_C attribute_hidden;
077c9d
+# endif
077c9d
 
077c9d
-#else
077c9d
-# include <string/strchr.c>
077c9d
-#endif /* !(defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)) */
077c9d
+# if HAVE_STRCHR_Z13
077c9d
+extern __typeof (__redirect_strchr) STRCHR_Z13 attribute_hidden;
077c9d
+# endif
077c9d
+
077c9d
+s390_libc_ifunc_expr (__redirect_strchr, strchr,
077c9d
+		      (HAVE_STRCHR_Z13 && (hwcap & HWCAP_S390_VX))
077c9d
+		      ? STRCHR_Z13
077c9d
+		      : STRCHR_DEFAULT
077c9d
+		      )
077c9d
+weak_alias (strchr, index)
077c9d
+#endif /* HAVE_STRCHR_IFUNC  */