d8307d
commit cf3ccc31a3d76a9b4db410d3087055c3aff2b71b
d8307d
Author: Stefan Liebler <stli@linux.ibm.com>
d8307d
Date:   Tue Dec 18 13:57:22 2018 +0100
d8307d
d8307d
    S390: Refactor wcschr ifunc handling.
d8307d
    
d8307d
    The ifunc handling for wcschr is adjusted in order to omit ifunc
d8307d
    if the minimum architecture level already supports newer CPUs by default.
d8307d
    Unfortunately the c ifunc variant can't be omitted at all as it is used
d8307d
    by the z13 ifunc variant as fallback if the pointers are not 4-byte aligned.
d8307d
    Glibc internal calls will use the "newer" ifunc variant.
d8307d
    
d8307d
    ChangeLog:
d8307d
    
d8307d
            * sysdeps/s390/multiarch/Makefile
d8307d
            (sysdep_routines): Remove wcschr variants.
d8307d
            * sysdeps/s390/Makefile (sysdep_routines): Add wcschr variants.
d8307d
            * sysdeps/s390/multiarch/ifunc-impl-list.c
d8307d
            (__libc_ifunc_impl_list): Refactor ifunc handling for wcschr.
d8307d
            * sysdeps/s390/multiarch/wcschr-c.c: Move to ...
d8307d
            * sysdeps/s390/wcschr-c.c: ... here and adjust ifunc handling.
d8307d
            * sysdeps/s390/multiarch/wcschr-vx.S: Move to ...
d8307d
            * sysdeps/s390/wcschr-vx.S: ... here and adjust ifunc handling.
d8307d
            * sysdeps/s390/multiarch/wcschr.c: Move to ...
d8307d
            * sysdeps/s390/wcschr.c: ... here and adjust ifunc handling.
d8307d
            * sysdeps/s390/ifunc-wcschr.h: New file.
d8307d
d8307d
diff --git a/sysdeps/s390/Makefile b/sysdeps/s390/Makefile
d8307d
index 9146b32a939fd5bd..91ee84a54b713e4a 100644
d8307d
--- a/sysdeps/s390/Makefile
d8307d
+++ b/sysdeps/s390/Makefile
d8307d
@@ -69,5 +69,6 @@ sysdep_routines += wcslen wcslen-vx wcslen-c \
d8307d
 		   wcscat wcscat-vx wcscat-c \
d8307d
 		   wcsncat wcsncat-vx wcsncat-c \
d8307d
 		   wcscmp wcscmp-vx wcscmp-c \
d8307d
-		   wcsncmp wcsncmp-vx wcsncmp-c
d8307d
+		   wcsncmp wcsncmp-vx wcsncmp-c \
d8307d
+		   wcschr wcschr-vx wcschr-c
d8307d
 endif
d8307d
diff --git a/sysdeps/s390/ifunc-wcschr.h b/sysdeps/s390/ifunc-wcschr.h
d8307d
new file mode 100644
d8307d
index 0000000000000000..2fe9110f7c9564d2
d8307d
--- /dev/null
d8307d
+++ b/sysdeps/s390/ifunc-wcschr.h
d8307d
@@ -0,0 +1,53 @@
d8307d
+/* wcschr variant information on S/390 version.
d8307d
+   Copyright (C) 2018 Free Software Foundation, Inc.
d8307d
+   This file is part of the GNU C Library.
d8307d
+
d8307d
+   The GNU C Library is free software; you can redistribute it and/or
d8307d
+   modify it under the terms of the GNU Lesser General Public
d8307d
+   License as published by the Free Software Foundation; either
d8307d
+   version 2.1 of the License, or (at your option) any later version.
d8307d
+
d8307d
+   The GNU C Library is distributed in the hope that it will be useful,
d8307d
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
d8307d
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
d8307d
+   Lesser General Public License for more details.
d8307d
+
d8307d
+   You should have received a copy of the GNU Lesser General Public
d8307d
+   License along with the GNU C Library; if not, see
d8307d
+   <http://www.gnu.org/licenses/>.  */
d8307d
+
d8307d
+#if defined USE_MULTIARCH && IS_IN (libc)		\
d8307d
+  && ! defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT
d8307d
+# define HAVE_WCSCHR_IFUNC	1
d8307d
+#else
d8307d
+# define HAVE_WCSCHR_IFUNC	0
d8307d
+#endif
d8307d
+
d8307d
+#ifdef HAVE_S390_VX_ASM_SUPPORT
d8307d
+# define HAVE_WCSCHR_IFUNC_AND_VX_SUPPORT HAVE_WCSCHR_IFUNC
d8307d
+#else
d8307d
+# define HAVE_WCSCHR_IFUNC_AND_VX_SUPPORT 0
d8307d
+#endif
d8307d
+
d8307d
+#if defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT
d8307d
+# define WCSCHR_DEFAULT		WCSCHR_Z13
d8307d
+/* The z13 ifunc variant is using the common code variant as fallback!  */
d8307d
+# define HAVE_WCSCHR_C		1
d8307d
+# define HAVE_WCSCHR_Z13	1
d8307d
+#else
d8307d
+# define WCSCHR_DEFAULT		WCSCHR_C
d8307d
+# define HAVE_WCSCHR_C		1
d8307d
+# define HAVE_WCSCHR_Z13	HAVE_WCSCHR_IFUNC_AND_VX_SUPPORT
d8307d
+#endif
d8307d
+
d8307d
+#if HAVE_WCSCHR_C
d8307d
+# define WCSCHR_C		__wcschr_c
d8307d
+#else
d8307d
+# define WCSCHR_C		NULL
d8307d
+#endif
d8307d
+
d8307d
+#if HAVE_WCSCHR_Z13
d8307d
+# define WCSCHR_Z13		__wcschr_vx
d8307d
+#else
d8307d
+# define WCSCHR_Z13		NULL
d8307d
+#endif
d8307d
diff --git a/sysdeps/s390/multiarch/Makefile b/sysdeps/s390/multiarch/Makefile
d8307d
index d1740fa8e4f5faa8..b282613b4705bb14 100644
d8307d
--- a/sysdeps/s390/multiarch/Makefile
d8307d
+++ b/sysdeps/s390/multiarch/Makefile
d8307d
@@ -1,6 +1,5 @@
d8307d
 ifeq ($(subdir),wcsmbs)
d8307d
-sysdep_routines += wcschr wcschr-vx wcschr-c \
d8307d
-		   wcschrnul wcschrnul-vx wcschrnul-c \
d8307d
+sysdep_routines += wcschrnul wcschrnul-vx wcschrnul-c \
d8307d
 		   wcsrchr wcsrchr-vx wcsrchr-c \
d8307d
 		   wcsspn wcsspn-vx wcsspn-c \
d8307d
 		   wcspbrk wcspbrk-vx wcspbrk-c \
d8307d
diff --git a/sysdeps/s390/multiarch/ifunc-impl-list.c b/sysdeps/s390/multiarch/ifunc-impl-list.c
d8307d
index 8c9e788ae5962e2a..c69165465dc97111 100644
d8307d
--- a/sysdeps/s390/multiarch/ifunc-impl-list.c
d8307d
+++ b/sysdeps/s390/multiarch/ifunc-impl-list.c
d8307d
@@ -56,6 +56,7 @@
d8307d
 #include <ifunc-wcsncat.h>
d8307d
 #include <ifunc-wcscmp.h>
d8307d
 #include <ifunc-wcsncmp.h>
d8307d
+#include <ifunc-wcschr.h>
d8307d
 
d8307d
 /* Maximum number of IFUNC implementations.  */
d8307d
 #define MAX_IFUNC	3
d8307d
@@ -554,6 +555,18 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
d8307d
 		)
d8307d
 #endif /* HAVE_WCSNCMP_IFUNC  */
d8307d
 
d8307d
+#if HAVE_WCSCHR_IFUNC
d8307d
+    IFUNC_IMPL (i, name, wcschr,
d8307d
+# if HAVE_WCSCHR_Z13
d8307d
+		IFUNC_IMPL_ADD (array, i, wcschr,
d8307d
+				dl_hwcap & HWCAP_S390_VX, WCSCHR_Z13)
d8307d
+# endif
d8307d
+# if HAVE_WCSCHR_C
d8307d
+		IFUNC_IMPL_ADD (array, i, wcschr, 1, WCSCHR_C)
d8307d
+# endif
d8307d
+		)
d8307d
+#endif /* HAVE_WCSCHR_IFUNC  */
d8307d
+
d8307d
 #ifdef HAVE_S390_VX_ASM_SUPPORT
d8307d
 
d8307d
 # define IFUNC_VX_IMPL(FUNC)						\
d8307d
@@ -562,8 +575,6 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
d8307d
 			      __##FUNC##_vx)				\
d8307d
 	      IFUNC_IMPL_ADD (array, i, FUNC, 1, __##FUNC##_c))
d8307d
 
d8307d
-  IFUNC_VX_IMPL (wcschr);
d8307d
-
d8307d
   IFUNC_VX_IMPL (wcschrnul);
d8307d
 
d8307d
   IFUNC_VX_IMPL (wcsrchr);
d8307d
diff --git a/sysdeps/s390/multiarch/wcschr-c.c b/sysdeps/s390/wcschr-c.c
d8307d
similarity index 61%
d8307d
rename from sysdeps/s390/multiarch/wcschr-c.c
d8307d
rename to sysdeps/s390/wcschr-c.c
d8307d
index 8d6679c7f2f89864..4908492a0a72ed28 100644
d8307d
--- a/sysdeps/s390/multiarch/wcschr-c.c
d8307d
+++ b/sysdeps/s390/wcschr-c.c
d8307d
@@ -16,22 +16,29 @@
d8307d
    License along with the GNU C Library; if not, see
d8307d
    <http://www.gnu.org/licenses/>.  */
d8307d
 
d8307d
-#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)
d8307d
-# define WCSCHR  __wcschr_c
d8307d
-
d8307d
-# include <wchar.h>
d8307d
-extern __typeof (__wcschr) __wcschr_c;
d8307d
-# undef weak_alias
d8307d
-# define weak_alias(name, alias)
d8307d
-# ifdef SHARED
d8307d
-#  undef libc_hidden_def
d8307d
-#  define libc_hidden_def(name)					\
d8307d
-  __hidden_ver1 (__wcschr_c, __GI_wcschr, __wcschr_c);		\
d8307d
-  strong_alias (__wcschr_c, __wcschr_c_1);			\
d8307d
+#include <ifunc-wcschr.h>
d8307d
+
d8307d
+#if HAVE_WCSCHR_C
d8307d
+# if HAVE_WCSCHR_IFUNC || HAVE_WCSCHR_Z13
d8307d
+#  define WCSCHR WCSCHR_C
d8307d
+
d8307d
+#  undef weak_alias
d8307d
+#  define weak_alias(name, alias)
d8307d
+
d8307d
+#  if defined SHARED && IS_IN (libc)
d8307d
+#   undef libc_hidden_weak
d8307d
+#   define libc_hidden_weak(name)
d8307d
+#   undef libc_hidden_def
d8307d
+#   if ! defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT
d8307d
+#    define libc_hidden_def(name)					\
d8307d
+  __hidden_ver1 (__wcschr_c, __GI_wcschr, __wcschr_c)  __attribute__((weak)); \
d8307d
+  strong_alias (__wcschr_c, __wcschr_c_1);				\
d8307d
   __hidden_ver1 (__wcschr_c_1, __GI___wcschr, __wcschr_c_1);
d8307d
-#  undef libc_hidden_weak
d8307d
-#  define libc_hidden_weak(name)
d8307d
-# endif /* SHARED */
d8307d
+#   else
d8307d
+#    define libc_hidden_def(name)
d8307d
+#   endif
d8307d
+#  endif
d8307d
+# endif
d8307d
 
d8307d
 # include <wcsmbs/wcschr.c>
d8307d
-#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */
d8307d
+#endif
d8307d
diff --git a/sysdeps/s390/multiarch/wcschr-vx.S b/sysdeps/s390/wcschr-vx.S
d8307d
similarity index 88%
d8307d
rename from sysdeps/s390/multiarch/wcschr-vx.S
d8307d
rename to sysdeps/s390/wcschr-vx.S
d8307d
index 94e5df7f365aa361..dd24998390c7e2e6 100644
d8307d
--- a/sysdeps/s390/multiarch/wcschr-vx.S
d8307d
+++ b/sysdeps/s390/wcschr-vx.S
d8307d
@@ -16,7 +16,8 @@
d8307d
    License along with the GNU C Library; if not, see
d8307d
    <http://www.gnu.org/licenses/>.  */
d8307d
 
d8307d
-#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)
d8307d
+#include <ifunc-wcschr.h>
d8307d
+#if HAVE_WCSCHR_Z13
d8307d
 
d8307d
 # include "sysdep.h"
d8307d
 # include "asm-syntax.h"
d8307d
@@ -36,7 +37,7 @@
d8307d
    -v17=index of unequal
d8307d
    -v18=replicated c
d8307d
 */
d8307d
-ENTRY(__wcschr_vx)
d8307d
+ENTRY(WCSCHR_Z13)
d8307d
 	.machine "z13"
d8307d
 	.machinemode "zarch_nohighgprs"
d8307d
 
d8307d
@@ -98,6 +99,17 @@ ENTRY(__wcschr_vx)
d8307d
 	lghi	%r2,0		/* Return null if character not found.  */
d8307d
 	br	%r14
d8307d
 .Lfallback:
d8307d
-	jg	__wcschr_c
d8307d
-END(__wcschr_vx)
d8307d
-#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */
d8307d
+	jg	WCSCHR_C
d8307d
+END(WCSCHR_Z13)
d8307d
+
d8307d
+# if ! HAVE_WCSCHR_IFUNC
d8307d
+strong_alias (WCSCHR_Z13, __wcschr)
d8307d
+weak_alias (__wcschr, wcschr)
d8307d
+# endif
d8307d
+
d8307d
+# if defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT \
d8307d
+	&& defined SHARED && IS_IN (libc)
d8307d
+strong_alias (WCSCHR_Z13, __GI___wcschr)
d8307d
+weak_alias (WCSCHR_Z13, __GI_wcschr)
d8307d
+# endif
d8307d
+#endif
d8307d
diff --git a/sysdeps/s390/multiarch/wcschr.c b/sysdeps/s390/wcschr.c
d8307d
similarity index 71%
d8307d
rename from sysdeps/s390/multiarch/wcschr.c
d8307d
rename to sysdeps/s390/wcschr.c
d8307d
index f44138f771f9f9cb..9923864ff8f5ef1f 100644
d8307d
--- a/sysdeps/s390/multiarch/wcschr.c
d8307d
+++ b/sysdeps/s390/wcschr.c
d8307d
@@ -16,7 +16,9 @@
d8307d
    License along with the GNU C Library; if not, see
d8307d
    <http://www.gnu.org/licenses/>.  */
d8307d
 
d8307d
-#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)
d8307d
+#include <ifunc-wcschr.h>
d8307d
+
d8307d
+#if HAVE_WCSCHR_IFUNC
d8307d
 # define wcschr __redirect_wcschr
d8307d
 # define __wcschr __redirect___wcschr
d8307d
 # include <wchar.h>
d8307d
@@ -24,9 +26,18 @@
d8307d
 # undef __wcschr
d8307d
 # include <ifunc-resolve.h>
d8307d
 
d8307d
-s390_vx_libc_ifunc_redirected (__redirect___wcschr, __wcschr)
d8307d
-weak_alias (__wcschr, wcschr)
d8307d
+# if HAVE_WCSCHR_C
d8307d
+extern __typeof (__redirect___wcschr) WCSCHR_C attribute_hidden;
d8307d
+# endif
d8307d
 
d8307d
-#else
d8307d
-# include <wcsmbs/wcschr.c>
d8307d
-#endif /* !(defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)) */
d8307d
+# if HAVE_WCSCHR_Z13
d8307d
+extern __typeof (__redirect___wcschr) WCSCHR_Z13 attribute_hidden;
d8307d
+# endif
d8307d
+
d8307d
+s390_libc_ifunc_expr (__redirect___wcschr, __wcschr,
d8307d
+		      (HAVE_WCSCHR_Z13 && (hwcap & HWCAP_S390_VX))
d8307d
+		      ? WCSCHR_Z13
d8307d
+		      : WCSCHR_DEFAULT
d8307d
+		      )
d8307d
+weak_alias (__wcschr, wcschr)
d8307d
+#endif