077c9d
commit c7e7cd266ed123b6dfb722f599934ca5dcfd3e93
077c9d
Author: Stefan Liebler <stli@linux.ibm.com>
077c9d
Date:   Tue Dec 18 13:57:18 2018 +0100
077c9d
077c9d
    S390: Refactor wcsnlen ifunc handling.
077c9d
    
077c9d
    The ifunc handling for wcsnlen is adjusted in order to omit ifunc
077c9d
    if the minimum architecture level already supports newer CPUs by default.
077c9d
    Unfortunately the c ifunc variant can't be omitted at all as it is used
077c9d
    by the z13 ifunc variant as fallback if the pointers are not 4-byte aligned.
077c9d
    Glibc internal calls will use the "newer" ifunc variant.
077c9d
    
077c9d
    ChangeLog:
077c9d
    
077c9d
            * sysdeps/s390/multiarch/Makefile
077c9d
            (sysdep_routines): Remove wcsnlen variants.
077c9d
            * sysdeps/s390/Makefile (sysdep_routines): Add wcsnlen variants.
077c9d
            * sysdeps/s390/multiarch/ifunc-impl-list.c
077c9d
            (__libc_ifunc_impl_list): Refactor ifunc handling for wcsnlen.
077c9d
            * sysdeps/s390/multiarch/wcsnlen-c.c: Move to ...
077c9d
            * sysdeps/s390/wcsnlen-c.c: ... here and adjust ifunc handling.
077c9d
            * sysdeps/s390/multiarch/wcsnlen-vx.S: Move to ...
077c9d
            * sysdeps/s390/wcsnlen-vx.S: ... here and adjust ifunc handling.
077c9d
            * sysdeps/s390/multiarch/wcsnlen.c: Move to ...
077c9d
            * sysdeps/s390/wcsnlen.c: ... here and adjust ifunc handling.
077c9d
            * sysdeps/s390/ifunc-wcsnlen.h: New file.
077c9d
077c9d
diff --git a/sysdeps/s390/Makefile b/sysdeps/s390/Makefile
077c9d
index 65e89118936bb668..f5983815479a76da 100644
077c9d
--- a/sysdeps/s390/Makefile
077c9d
+++ b/sysdeps/s390/Makefile
077c9d
@@ -60,5 +60,6 @@ sysdep_routines += bzero memset memset-z900 \
077c9d
 endif
077c9d
 
077c9d
 ifeq ($(subdir),wcsmbs)
077c9d
-sysdep_routines += wcslen wcslen-vx wcslen-c
077c9d
+sysdep_routines += wcslen wcslen-vx wcslen-c \
077c9d
+		   wcsnlen wcsnlen-vx wcsnlen-c
077c9d
 endif
077c9d
diff --git a/sysdeps/s390/ifunc-wcsnlen.h b/sysdeps/s390/ifunc-wcsnlen.h
077c9d
new file mode 100644
077c9d
index 0000000000000000..b5b21da2f17d9cd9
077c9d
--- /dev/null
077c9d
+++ b/sysdeps/s390/ifunc-wcsnlen.h
077c9d
@@ -0,0 +1,53 @@
077c9d
+/* wcsnlen 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_WCSNLEN_IFUNC	1
077c9d
+#else
077c9d
+# define HAVE_WCSNLEN_IFUNC	0
077c9d
+#endif
077c9d
+
077c9d
+#ifdef HAVE_S390_VX_ASM_SUPPORT
077c9d
+# define HAVE_WCSNLEN_IFUNC_AND_VX_SUPPORT HAVE_WCSNLEN_IFUNC
077c9d
+#else
077c9d
+# define HAVE_WCSNLEN_IFUNC_AND_VX_SUPPORT 0
077c9d
+#endif
077c9d
+
077c9d
+#if defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT
077c9d
+# define WCSNLEN_DEFAULT	WCSNLEN_Z13
077c9d
+/* The z13 ifunc variant is using the common code variant as fallback!  */
077c9d
+# define HAVE_WCSNLEN_C		1
077c9d
+# define HAVE_WCSNLEN_Z13	1
077c9d
+#else
077c9d
+# define WCSNLEN_DEFAULT	WCSNLEN_C
077c9d
+# define HAVE_WCSNLEN_C		1
077c9d
+# define HAVE_WCSNLEN_Z13	HAVE_WCSNLEN_IFUNC_AND_VX_SUPPORT
077c9d
+#endif
077c9d
+
077c9d
+#if HAVE_WCSNLEN_C
077c9d
+# define WCSNLEN_C		__wcsnlen_c
077c9d
+#else
077c9d
+# define WCSNLEN_C		NULL
077c9d
+#endif
077c9d
+
077c9d
+#if HAVE_WCSNLEN_Z13
077c9d
+# define WCSNLEN_Z13		__wcsnlen_vx
077c9d
+#else
077c9d
+# define WCSNLEN_Z13		NULL
077c9d
+#endif
077c9d
diff --git a/sysdeps/s390/multiarch/Makefile b/sysdeps/s390/multiarch/Makefile
077c9d
index 421d40d020b81560..ce2e7ce5f4eef0fa 100644
077c9d
--- a/sysdeps/s390/multiarch/Makefile
077c9d
+++ b/sysdeps/s390/multiarch/Makefile
077c9d
@@ -1,6 +1,5 @@
077c9d
 ifeq ($(subdir),wcsmbs)
077c9d
-sysdep_routines += wcsnlen wcsnlen-vx wcsnlen-c \
077c9d
-		   wcscpy wcscpy-vx wcscpy-c \
077c9d
+sysdep_routines += wcscpy wcscpy-vx wcscpy-c \
077c9d
 		   wcpcpy wcpcpy-vx wcpcpy-c \
077c9d
 		   wcsncpy wcsncpy-vx wcsncpy-c \
077c9d
 		   wcpncpy wcpncpy-vx wcpncpy-c \
077c9d
diff --git a/sysdeps/s390/multiarch/ifunc-impl-list.c b/sysdeps/s390/multiarch/ifunc-impl-list.c
077c9d
index 7bf5f14c015b54fe..c199fd0e0b43e4b4 100644
077c9d
--- a/sysdeps/s390/multiarch/ifunc-impl-list.c
077c9d
+++ b/sysdeps/s390/multiarch/ifunc-impl-list.c
077c9d
@@ -47,6 +47,7 @@
077c9d
 #include <ifunc-memccpy.h>
077c9d
 #include <ifunc-memrchr.h>
077c9d
 #include <ifunc-wcslen.h>
077c9d
+#include <ifunc-wcsnlen.h>
077c9d
 
077c9d
 /* Maximum number of IFUNC implementations.  */
077c9d
 #define MAX_IFUNC	3
077c9d
@@ -437,6 +438,18 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
077c9d
 		)
077c9d
 #endif /* HAVE_WCSLEN_IFUNC  */
077c9d
 
077c9d
+#if HAVE_WCSNLEN_IFUNC
077c9d
+    IFUNC_IMPL (i, name, wcsnlen,
077c9d
+# if HAVE_WCSNLEN_Z13
077c9d
+		IFUNC_IMPL_ADD (array, i, wcsnlen,
077c9d
+				dl_hwcap & HWCAP_S390_VX, WCSNLEN_Z13)
077c9d
+# endif
077c9d
+# if HAVE_WCSNLEN_C
077c9d
+		IFUNC_IMPL_ADD (array, i, wcsnlen, 1, WCSNLEN_C)
077c9d
+# endif
077c9d
+		)
077c9d
+#endif /* HAVE_WCSNLEN_IFUNC  */
077c9d
+
077c9d
 #ifdef HAVE_S390_VX_ASM_SUPPORT
077c9d
 
077c9d
 # define IFUNC_VX_IMPL(FUNC)						\
077c9d
@@ -445,8 +458,6 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
077c9d
 			      __##FUNC##_vx)				\
077c9d
 	      IFUNC_IMPL_ADD (array, i, FUNC, 1, __##FUNC##_c))
077c9d
 
077c9d
-  IFUNC_VX_IMPL (wcsnlen);
077c9d
-
077c9d
   IFUNC_VX_IMPL (wcscpy);
077c9d
 
077c9d
   IFUNC_VX_IMPL (wcpcpy);
077c9d
diff --git a/sysdeps/s390/multiarch/wcsnlen-c.c b/sysdeps/s390/wcsnlen-c.c
077c9d
similarity index 85%
077c9d
rename from sysdeps/s390/multiarch/wcsnlen-c.c
077c9d
rename to sysdeps/s390/wcsnlen-c.c
077c9d
index 8f43f5104f2eab3f..7495a6f97cfeca62 100644
077c9d
--- a/sysdeps/s390/multiarch/wcsnlen-c.c
077c9d
+++ b/sysdeps/s390/wcsnlen-c.c
077c9d
@@ -16,10 +16,12 @@
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 WCSNLEN  __wcsnlen_c
077c9d
+#include <ifunc-wcsnlen.h>
077c9d
+
077c9d
+#if HAVE_WCSNLEN_C
077c9d
+# if HAVE_WCSNLEN_IFUNC || HAVE_WCSNLEN_Z13
077c9d
+#  define WCSNLEN WCSNLEN_C
077c9d
+# endif
077c9d
 
077c9d
-# include <wchar.h>
077c9d
-extern __typeof (__wcsnlen) __wcsnlen_c;
077c9d
 # include <wcsmbs/wcsnlen.c>
077c9d
 #endif
077c9d
diff --git a/sysdeps/s390/multiarch/wcsnlen-vx.S b/sysdeps/s390/wcsnlen-vx.S
077c9d
similarity index 95%
077c9d
rename from sysdeps/s390/multiarch/wcsnlen-vx.S
077c9d
rename to sysdeps/s390/wcsnlen-vx.S
077c9d
index 420f29fbc0d2965a..47f4ca82840538d9 100644
077c9d
--- a/sysdeps/s390/multiarch/wcsnlen-vx.S
077c9d
+++ b/sysdeps/s390/wcsnlen-vx.S
077c9d
@@ -16,7 +16,8 @@
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-wcsnlen.h>
077c9d
+#if HAVE_WCSNLEN_Z13
077c9d
 
077c9d
 # include "sysdep.h"
077c9d
 # include "asm-syntax.h"
077c9d
@@ -34,7 +35,7 @@
077c9d
    -r5=current_len and return_value
077c9d
    -v16=part of s
077c9d
 */
077c9d
-ENTRY(__wcsnlen_vx)
077c9d
+ENTRY(WCSNLEN_Z13)
077c9d
 
077c9d
 	.machine "z13"
077c9d
 	.machinemode "zarch_nohighgprs"
077c9d
@@ -146,6 +147,11 @@ ENTRY(__wcsnlen_vx)
077c9d
 	j	.Llt64
077c9d
 
077c9d
 .Lfallback:
077c9d
-	jg	__wcsnlen_c
077c9d
-END(__wcsnlen_vx)
077c9d
-#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */
077c9d
+	jg	WCSNLEN_C
077c9d
+END(WCSNLEN_Z13)
077c9d
+
077c9d
+# if ! HAVE_WCSNLEN_IFUNC
077c9d
+strong_alias (WCSNLEN_Z13, __wcsnlen)
077c9d
+weak_alias (__wcsnlen, wcsnlen)
077c9d
+# endif
077c9d
+#endif
077c9d
diff --git a/sysdeps/s390/multiarch/wcsnlen.c b/sysdeps/s390/wcsnlen.c
077c9d
similarity index 70%
077c9d
rename from sysdeps/s390/multiarch/wcsnlen.c
077c9d
rename to sysdeps/s390/wcsnlen.c
077c9d
index 5234074b1fce8ca1..b5c8ad9fde5a9752 100644
077c9d
--- a/sysdeps/s390/multiarch/wcsnlen.c
077c9d
+++ b/sysdeps/s390/wcsnlen.c
077c9d
@@ -16,13 +16,24 @@
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-wcsnlen.h>
077c9d
+
077c9d
+#if HAVE_WCSNLEN_IFUNC
077c9d
 # include <wchar.h>
077c9d
 # include <ifunc-resolve.h>
077c9d
 
077c9d
-s390_vx_libc_ifunc (__wcsnlen)
077c9d
-weak_alias (__wcsnlen, wcsnlen)
077c9d
+# if HAVE_WCSNLEN_C
077c9d
+extern __typeof (__wcsnlen) WCSNLEN_C attribute_hidden;
077c9d
+# endif
077c9d
 
077c9d
-#else
077c9d
-# include <wcsmbs/wcsnlen.c>
077c9d
-#endif /* !(defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)) */
077c9d
+# if HAVE_WCSNLEN_Z13
077c9d
+extern __typeof (__wcsnlen) WCSNLEN_Z13 attribute_hidden;
077c9d
+# endif
077c9d
+
077c9d
+s390_libc_ifunc_expr (__wcsnlen, __wcsnlen,
077c9d
+		      (HAVE_WCSNLEN_Z13 && (hwcap & HWCAP_S390_VX))
077c9d
+		      ? WCSNLEN_Z13
077c9d
+		      : WCSNLEN_DEFAULT
077c9d
+		      )
077c9d
+weak_alias (__wcsnlen, wcsnlen)
077c9d
+#endif