077c9d
commit de10e44dda686e3ed6a7a1463869df846ea39825
077c9d
Author: Stefan Liebler <stli@linux.ibm.com>
077c9d
Date:   Tue Dec 18 13:57:10 2018 +0100
077c9d
077c9d
    S390: Refactor strnlen ifunc handling.
077c9d
    
077c9d
    The ifunc handling for strnlen 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 strnlen variants.
077c9d
            * sysdeps/s390/Makefile (sysdep_routines): Add strnlen variants.
077c9d
            * sysdeps/s390/multiarch/ifunc-impl-list.c
077c9d
            (__libc_ifunc_impl_list): Refactor ifunc handling for strnlen.
077c9d
            * sysdeps/s390/multiarch/strnlen-c.c: Move to ...
077c9d
            * sysdeps/s390/strnlen-c.c: ... here and adjust ifunc handling.
077c9d
            * sysdeps/s390/multiarch/strnlen-vx.S: Move to ...
077c9d
            * sysdeps/s390/strnlen-vx.S: ... here and adjust ifunc handling.
077c9d
            * sysdeps/s390/multiarch/strnlen.c: Move to ...
077c9d
            * sysdeps/s390/strnlen.c: ... here and adjust ifunc handling.
077c9d
            * sysdeps/s390/ifunc-strnlen.h: New file.
077c9d
077c9d
diff --git a/sysdeps/s390/Makefile b/sysdeps/s390/Makefile
077c9d
index 600d8e629df7090e..f092355743e3908f 100644
077c9d
--- a/sysdeps/s390/Makefile
077c9d
+++ b/sysdeps/s390/Makefile
077c9d
@@ -37,5 +37,6 @@ sysdep_routines += bzero memset memset-z900 \
077c9d
 		   memmove memmove-c \
077c9d
 		   strstr strstr-vx strstr-c \
077c9d
 		   memmem memmem-vx memmem-c \
077c9d
-		   strlen strlen-vx strlen-c
077c9d
+		   strlen strlen-vx strlen-c \
077c9d
+		   strnlen strnlen-vx strnlen-c
077c9d
 endif
077c9d
diff --git a/sysdeps/s390/ifunc-strnlen.h b/sysdeps/s390/ifunc-strnlen.h
077c9d
new file mode 100644
077c9d
index 0000000000000000..e92329888773304d
077c9d
--- /dev/null
077c9d
+++ b/sysdeps/s390/ifunc-strnlen.h
077c9d
@@ -0,0 +1,52 @@
077c9d
+/* strnlen 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_STRNLEN_IFUNC	1
077c9d
+#else
077c9d
+# define HAVE_STRNLEN_IFUNC	0
077c9d
+#endif
077c9d
+
077c9d
+#ifdef HAVE_S390_VX_ASM_SUPPORT
077c9d
+# define HAVE_STRNLEN_IFUNC_AND_VX_SUPPORT HAVE_STRNLEN_IFUNC
077c9d
+#else
077c9d
+# define HAVE_STRNLEN_IFUNC_AND_VX_SUPPORT 0
077c9d
+#endif
077c9d
+
077c9d
+#if defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT
077c9d
+# define STRNLEN_DEFAULT	STRNLEN_Z13
077c9d
+# define HAVE_STRNLEN_C		0
077c9d
+# define HAVE_STRNLEN_Z13	1
077c9d
+#else
077c9d
+# define STRNLEN_DEFAULT	STRNLEN_C
077c9d
+# define HAVE_STRNLEN_C		1
077c9d
+# define HAVE_STRNLEN_Z13	HAVE_STRNLEN_IFUNC_AND_VX_SUPPORT
077c9d
+#endif
077c9d
+
077c9d
+#if HAVE_STRNLEN_C
077c9d
+# define STRNLEN_C		__strnlen_c
077c9d
+#else
077c9d
+# define STRNLEN_C		NULL
077c9d
+#endif
077c9d
+
077c9d
+#if HAVE_STRNLEN_Z13
077c9d
+# define STRNLEN_Z13		__strnlen_vx
077c9d
+#else
077c9d
+# define STRNLEN_Z13		NULL
077c9d
+#endif
077c9d
diff --git a/sysdeps/s390/multiarch/Makefile b/sysdeps/s390/multiarch/Makefile
077c9d
index 601523919c235f76..35ba223c5d4fb52f 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 += strnlen strnlen-vx strnlen-c \
077c9d
-		   strcpy strcpy-vx \
077c9d
+sysdep_routines += strcpy strcpy-vx \
077c9d
 		   stpcpy stpcpy-vx stpcpy-c \
077c9d
 		   strncpy strncpy-vx \
077c9d
 		   stpncpy stpncpy-vx stpncpy-c \
077c9d
diff --git a/sysdeps/s390/multiarch/ifunc-impl-list.c b/sysdeps/s390/multiarch/ifunc-impl-list.c
077c9d
index c531be4bc7eb3f55..680e5b738bfb7f32 100644
077c9d
--- a/sysdeps/s390/multiarch/ifunc-impl-list.c
077c9d
+++ b/sysdeps/s390/multiarch/ifunc-impl-list.c
077c9d
@@ -27,6 +27,7 @@
077c9d
 #include <ifunc-strstr.h>
077c9d
 #include <ifunc-memmem.h>
077c9d
 #include <ifunc-strlen.h>
077c9d
+#include <ifunc-strnlen.h>
077c9d
 
077c9d
 /* Maximum number of IFUNC implementations.  */
077c9d
 #define MAX_IFUNC	3
077c9d
@@ -177,6 +178,18 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
077c9d
 		)
077c9d
 #endif /* HAVE_STRLEN_IFUNC  */
077c9d
 
077c9d
+#if HAVE_STRNLEN_IFUNC
077c9d
+    IFUNC_IMPL (i, name, strnlen,
077c9d
+# if HAVE_STRNLEN_Z13
077c9d
+		IFUNC_IMPL_ADD (array, i, strnlen,
077c9d
+				dl_hwcap & HWCAP_S390_VX, STRNLEN_Z13)
077c9d
+# endif
077c9d
+# if HAVE_STRNLEN_C
077c9d
+		IFUNC_IMPL_ADD (array, i, strnlen, 1, STRNLEN_C)
077c9d
+# endif
077c9d
+		)
077c9d
+#endif /* HAVE_STRNLEN_IFUNC  */
077c9d
+
077c9d
 #ifdef HAVE_S390_VX_ASM_SUPPORT
077c9d
 
077c9d
 # define IFUNC_VX_IMPL(FUNC)						\
077c9d
@@ -187,7 +200,6 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
077c9d
 
077c9d
   IFUNC_VX_IMPL (wcslen);
077c9d
 
077c9d
-  IFUNC_VX_IMPL (strnlen);
077c9d
   IFUNC_VX_IMPL (wcsnlen);
077c9d
 
077c9d
   IFUNC_VX_IMPL (strcpy);
077c9d
diff --git a/sysdeps/s390/multiarch/strnlen-c.c b/sysdeps/s390/strnlen-c.c
077c9d
similarity index 81%
077c9d
rename from sysdeps/s390/multiarch/strnlen-c.c
077c9d
rename to sysdeps/s390/strnlen-c.c
077c9d
index 353e83ed356ca080..c2d887f1e4f504e8 100644
077c9d
--- a/sysdeps/s390/multiarch/strnlen-c.c
077c9d
+++ b/sysdeps/s390/strnlen-c.c
077c9d
@@ -16,15 +16,19 @@
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 STRNLEN  __strnlen_c
077c9d
-# ifdef SHARED
077c9d
-#  undef libc_hidden_def
077c9d
-#  define libc_hidden_def(name)					\
077c9d
+#include <ifunc-strnlen.h>
077c9d
+
077c9d
+#if HAVE_STRNLEN_C
077c9d
+# if HAVE_STRNLEN_IFUNC
077c9d
+#  define STRNLEN STRNLEN_C
077c9d
+#  if defined SHARED && IS_IN (libc)
077c9d
+#   undef libc_hidden_def
077c9d
+#   define libc_hidden_def(name)					\
077c9d
   __hidden_ver1 (__strnlen_c, __GI_strnlen, __strnlen_c);	\
077c9d
   strong_alias (__strnlen_c, __strnlen_c_1);			\
077c9d
   __hidden_ver1 (__strnlen_c_1, __GI___strnlen, __strnlen_c_1);
077c9d
-# endif /* SHARED */
077c9d
+#  endif
077c9d
+# endif
077c9d
 
077c9d
 # include <string/strnlen.c>
077c9d
-#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */
077c9d
+#endif
077c9d
diff --git a/sysdeps/s390/multiarch/strnlen-vx.S b/sysdeps/s390/strnlen-vx.S
077c9d
similarity index 90%
077c9d
rename from sysdeps/s390/multiarch/strnlen-vx.S
077c9d
rename to sysdeps/s390/strnlen-vx.S
077c9d
index fc659a956cfc1fa1..0b8fe3da342f6803 100644
077c9d
--- a/sysdeps/s390/multiarch/strnlen-vx.S
077c9d
+++ b/sysdeps/s390/strnlen-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-strnlen.h>
077c9d
+
077c9d
+#if HAVE_STRNLEN_Z13
077c9d
 
077c9d
 # include "sysdep.h"
077c9d
 # include "asm-syntax.h"
077c9d
@@ -34,7 +36,7 @@
077c9d
    -r5=current_len and return_value
077c9d
    -v16=part of s
077c9d
 */
077c9d
-ENTRY(__strnlen_vx)
077c9d
+ENTRY(STRNLEN_Z13)
077c9d
 	.machine "z13"
077c9d
 	.machinemode "zarch_nohighgprs"
077c9d
 
077c9d
@@ -130,5 +132,16 @@ ENTRY(__strnlen_vx)
077c9d
 	clgrjl	%r1,%r3,.Lloop64
077c9d
 
077c9d
 	j	.Llt64
077c9d
-END(__strnlen_vx)
077c9d
-#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */
077c9d
+END(STRNLEN_Z13)
077c9d
+
077c9d
+# if ! HAVE_STRNLEN_IFUNC
077c9d
+strong_alias (STRNLEN_Z13, __strnlen)
077c9d
+weak_alias (__strnlen, strnlen)
077c9d
+# endif
077c9d
+
077c9d
+# if ! HAVE_STRNLEN_C && defined SHARED && IS_IN (libc)
077c9d
+strong_alias (STRNLEN_Z13, __GI_strnlen)
077c9d
+strong_alias (STRNLEN_Z13, __GI___strnlen)
077c9d
+# endif
077c9d
+
077c9d
+#endif /* HAVE_STRNLEN_Z13  */
077c9d
diff --git a/sysdeps/s390/multiarch/strnlen.c b/sysdeps/s390/strnlen.c
077c9d
similarity index 69%
077c9d
rename from sysdeps/s390/multiarch/strnlen.c
077c9d
rename to sysdeps/s390/strnlen.c
077c9d
index 0f9cff5d69b017ae..aa4953d5035bc2fc 100644
077c9d
--- a/sysdeps/s390/multiarch/strnlen.c
077c9d
+++ b/sysdeps/s390/strnlen.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-strnlen.h>
077c9d
+
077c9d
+#if HAVE_STRNLEN_IFUNC
077c9d
 # define strnlen __redirect_strnlen
077c9d
 # define __strnlen __redirect___strnlen
077c9d
 # include <string.h>
077c9d
@@ -24,9 +26,18 @@
077c9d
 # undef __strnlen
077c9d
 # include <ifunc-resolve.h>
077c9d
 
077c9d
-s390_vx_libc_ifunc_redirected (__redirect___strnlen, __strnlen)
077c9d
-weak_alias (__strnlen, strnlen)
077c9d
+# if HAVE_STRNLEN_C
077c9d
+extern __typeof (__redirect_strnlen) STRNLEN_C attribute_hidden;
077c9d
+# endif
077c9d
 
077c9d
-#else
077c9d
-# include <string/strnlen.c>
077c9d
-#endif /* !(defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)) */
077c9d
+# if HAVE_STRNLEN_Z13
077c9d
+extern __typeof (__redirect_strnlen) STRNLEN_Z13 attribute_hidden;
077c9d
+# endif
077c9d
+
077c9d
+s390_libc_ifunc_expr (__redirect___strnlen, __strnlen,
077c9d
+		      (HAVE_STRNLEN_Z13 && (hwcap & HWCAP_S390_VX))
077c9d
+		      ? STRNLEN_Z13
077c9d
+		      : STRNLEN_DEFAULT
077c9d
+		      )
077c9d
+weak_alias (__strnlen, strnlen)
077c9d
+#endif /* HAVE_STRNLEN_IFUNC  */