bdc76f
commit 316b88421993d540513a6b25b59ec16df267e9b4
bdc76f
Author: Stefan Liebler <stli@linux.ibm.com>
bdc76f
Date:   Tue Dec 18 13:57:13 2018 +0100
bdc76f
bdc76f
    S390: Refactor strncmp ifunc handling.
bdc76f
    
bdc76f
    The ifunc handling for strncmp is adjusted in order to omit ifunc
bdc76f
    variants if those will never be used as the minimum architecture level
bdc76f
    already supports newer CPUs by default.
bdc76f
    Glibc internal calls will then also use the "newer" ifunc variant.
bdc76f
    
bdc76f
    ChangeLog:
bdc76f
    
bdc76f
            * sysdeps/s390/multiarch/Makefile
bdc76f
            (sysdep_routines): Remove strncmp variants.
bdc76f
            * sysdeps/s390/Makefile (sysdep_routines): Add strncmp variants.
bdc76f
            * sysdeps/s390/multiarch/ifunc-impl-list.c
bdc76f
            (__libc_ifunc_impl_list): Refactor ifunc handling for strncmp.
bdc76f
            * sysdeps/s390/multiarch/strncmp-c.c: Move to ...
bdc76f
            * sysdeps/s390/strncmp-c.c: ... here and adjust ifunc handling.
bdc76f
            * sysdeps/s390/multiarch/strncmp-vx.S: Move to ...
bdc76f
            * sysdeps/s390/strncmp-vx.S: ... here and adjust ifunc handling.
bdc76f
            * sysdeps/s390/multiarch/strncmp.c: Move to ...
bdc76f
            * sysdeps/s390/strncmp.c: ... here and adjust ifunc handling.
bdc76f
            * sysdeps/s390/ifunc-strncmp.h: New file.
bdc76f
bdc76f
diff --git a/sysdeps/s390/Makefile b/sysdeps/s390/Makefile
bdc76f
index 71a4658b43aeb745..adf3521876725ac8 100644
bdc76f
--- a/sysdeps/s390/Makefile
bdc76f
+++ b/sysdeps/s390/Makefile
bdc76f
@@ -45,5 +45,6 @@ sysdep_routines += bzero memset memset-z900 \
bdc76f
 		   stpncpy stpncpy-vx stpncpy-c \
bdc76f
 		   strcat strcat-vx strcat-c \
bdc76f
 		   strncat strncat-vx strncat-c \
bdc76f
-		   strcmp strcmp-vx strcmp-z900
bdc76f
+		   strcmp strcmp-vx strcmp-z900 \
bdc76f
+		   strncmp strncmp-vx strncmp-c
bdc76f
 endif
bdc76f
diff --git a/sysdeps/s390/ifunc-strncmp.h b/sysdeps/s390/ifunc-strncmp.h
bdc76f
new file mode 100644
bdc76f
index 0000000000000000..511b3e9720520a0c
bdc76f
--- /dev/null
bdc76f
+++ b/sysdeps/s390/ifunc-strncmp.h
bdc76f
@@ -0,0 +1,52 @@
bdc76f
+/* strncmp variant information on S/390 version.
bdc76f
+   Copyright (C) 2018 Free Software Foundation, Inc.
bdc76f
+   This file is part of the GNU C Library.
bdc76f
+
bdc76f
+   The GNU C Library is free software; you can redistribute it and/or
bdc76f
+   modify it under the terms of the GNU Lesser General Public
bdc76f
+   License as published by the Free Software Foundation; either
bdc76f
+   version 2.1 of the License, or (at your option) any later version.
bdc76f
+
bdc76f
+   The GNU C Library is distributed in the hope that it will be useful,
bdc76f
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
bdc76f
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
bdc76f
+   Lesser General Public License for more details.
bdc76f
+
bdc76f
+   You should have received a copy of the GNU Lesser General Public
bdc76f
+   License along with the GNU C Library; if not, see
bdc76f
+   <http://www.gnu.org/licenses/>.  */
bdc76f
+
bdc76f
+#if defined USE_MULTIARCH && IS_IN (libc)		\
bdc76f
+  && ! defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT
bdc76f
+# define HAVE_STRNCMP_IFUNC	1
bdc76f
+#else
bdc76f
+# define HAVE_STRNCMP_IFUNC	0
bdc76f
+#endif
bdc76f
+
bdc76f
+#ifdef HAVE_S390_VX_ASM_SUPPORT
bdc76f
+# define HAVE_STRNCMP_IFUNC_AND_VX_SUPPORT HAVE_STRNCMP_IFUNC
bdc76f
+#else
bdc76f
+# define HAVE_STRNCMP_IFUNC_AND_VX_SUPPORT 0
bdc76f
+#endif
bdc76f
+
bdc76f
+#if defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT
bdc76f
+# define STRNCMP_DEFAULT	STRNCMP_Z13
bdc76f
+# define HAVE_STRNCMP_C		0
bdc76f
+# define HAVE_STRNCMP_Z13	1
bdc76f
+#else
bdc76f
+# define STRNCMP_DEFAULT	STRNCMP_C
bdc76f
+# define HAVE_STRNCMP_C		1
bdc76f
+# define HAVE_STRNCMP_Z13	HAVE_STRNCMP_IFUNC_AND_VX_SUPPORT
bdc76f
+#endif
bdc76f
+
bdc76f
+#if HAVE_STRNCMP_C
bdc76f
+# define STRNCMP_C		__strncmp_c
bdc76f
+#else
bdc76f
+# define STRNCMP_C		NULL
bdc76f
+#endif
bdc76f
+
bdc76f
+#if HAVE_STRNCMP_Z13
bdc76f
+# define STRNCMP_Z13		__strncmp_vx
bdc76f
+#else
bdc76f
+# define STRNCMP_Z13		NULL
bdc76f
+#endif
bdc76f
diff --git a/sysdeps/s390/multiarch/Makefile b/sysdeps/s390/multiarch/Makefile
bdc76f
index 97421a499625c7f2..381376bf9fcb0f58 100644
bdc76f
--- a/sysdeps/s390/multiarch/Makefile
bdc76f
+++ b/sysdeps/s390/multiarch/Makefile
bdc76f
@@ -1,6 +1,5 @@
bdc76f
 ifeq ($(subdir),string)
bdc76f
-sysdep_routines += strncmp strncmp-vx strncmp-c \
bdc76f
-		   strchr strchr-vx strchr-c \
bdc76f
+sysdep_routines += strchr strchr-vx strchr-c \
bdc76f
 		   strchrnul strchrnul-vx strchrnul-c \
bdc76f
 		   strrchr strrchr-vx strrchr-c \
bdc76f
 		   strspn strspn-vx strspn-c \
bdc76f
diff --git a/sysdeps/s390/multiarch/ifunc-impl-list.c b/sysdeps/s390/multiarch/ifunc-impl-list.c
bdc76f
index 44637c431b144c66..d982de5788c0b5d5 100644
bdc76f
--- a/sysdeps/s390/multiarch/ifunc-impl-list.c
bdc76f
+++ b/sysdeps/s390/multiarch/ifunc-impl-list.c
bdc76f
@@ -35,6 +35,7 @@
bdc76f
 #include <ifunc-strcat.h>
bdc76f
 #include <ifunc-strncat.h>
bdc76f
 #include <ifunc-strcmp.h>
bdc76f
+#include <ifunc-strncmp.h>
bdc76f
 
bdc76f
 /* Maximum number of IFUNC implementations.  */
bdc76f
 #define MAX_IFUNC	3
bdc76f
@@ -281,6 +282,18 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
bdc76f
 		)
bdc76f
 #endif /* HAVE_STRCMP_IFUNC  */
bdc76f
 
bdc76f
+#if HAVE_STRNCMP_IFUNC
bdc76f
+    IFUNC_IMPL (i, name, strncmp,
bdc76f
+# if HAVE_STRNCMP_Z13
bdc76f
+		IFUNC_IMPL_ADD (array, i, strncmp,
bdc76f
+				dl_hwcap & HWCAP_S390_VX, STRNCMP_Z13)
bdc76f
+# endif
bdc76f
+# if HAVE_STRNCMP_C
bdc76f
+		IFUNC_IMPL_ADD (array, i, strncmp, 1, STRNCMP_C)
bdc76f
+# endif
bdc76f
+		)
bdc76f
+#endif /* HAVE_STRNCMP_IFUNC  */
bdc76f
+
bdc76f
 #ifdef HAVE_S390_VX_ASM_SUPPORT
bdc76f
 
bdc76f
 # define IFUNC_VX_IMPL(FUNC)						\
bdc76f
@@ -307,7 +320,6 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
bdc76f
 
bdc76f
   IFUNC_VX_IMPL (wcscmp);
bdc76f
 
bdc76f
-  IFUNC_VX_IMPL (strncmp);
bdc76f
   IFUNC_VX_IMPL (wcsncmp);
bdc76f
 
bdc76f
   IFUNC_VX_IMPL (strchr);
bdc76f
diff --git a/sysdeps/s390/multiarch/strncmp-c.c b/sysdeps/s390/strncmp-c.c
bdc76f
similarity index 78%
bdc76f
rename from sysdeps/s390/multiarch/strncmp-c.c
bdc76f
rename to sysdeps/s390/strncmp-c.c
bdc76f
index e54277ec1b10f8d7..c7ffdb03e37dc8d8 100644
bdc76f
--- a/sysdeps/s390/multiarch/strncmp-c.c
bdc76f
+++ b/sysdeps/s390/strncmp-c.c
bdc76f
@@ -16,13 +16,17 @@
bdc76f
    License along with the GNU C Library; if not, see
bdc76f
    <http://www.gnu.org/licenses/>.  */
bdc76f
 
bdc76f
-#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)
bdc76f
-# define STRNCMP  __strncmp_c
bdc76f
-# ifdef SHARED
bdc76f
-#  undef libc_hidden_builtin_def
bdc76f
-#  define libc_hidden_builtin_def(name)			\
bdc76f
+#include <ifunc-strncmp.h>
bdc76f
+
bdc76f
+#if HAVE_STRNCMP_C
bdc76f
+# if HAVE_STRNCMP_IFUNC
bdc76f
+#  define STRNCMP STRNCMP_C
bdc76f
+#  if defined SHARED && IS_IN (libc)
bdc76f
+#   undef libc_hidden_builtin_def
bdc76f
+#   define libc_hidden_builtin_def(name)			\
bdc76f
   __hidden_ver1 (__strncmp_c, __GI_strncmp, __strncmp_c);
bdc76f
-# endif /* SHARED */
bdc76f
+#  endif
bdc76f
+# endif
bdc76f
 
bdc76f
 # include <string/strncmp.c>
bdc76f
-#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */
bdc76f
+#endif
bdc76f
diff --git a/sysdeps/s390/multiarch/strncmp-vx.S b/sysdeps/s390/strncmp-vx.S
bdc76f
similarity index 93%
bdc76f
rename from sysdeps/s390/multiarch/strncmp-vx.S
bdc76f
rename to sysdeps/s390/strncmp-vx.S
bdc76f
index 168fd657da2a1173..f557afb336d418ff 100644
bdc76f
--- a/sysdeps/s390/multiarch/strncmp-vx.S
bdc76f
+++ b/sysdeps/s390/strncmp-vx.S
bdc76f
@@ -16,7 +16,9 @@
bdc76f
    License along with the GNU C Library; if not, see
bdc76f
    <http://www.gnu.org/licenses/>.  */
bdc76f
 
bdc76f
-#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)
bdc76f
+#include <ifunc-strncmp.h>
bdc76f
+
bdc76f
+#if HAVE_STRNCMP_Z13
bdc76f
 
bdc76f
 # include "sysdep.h"
bdc76f
 # include "asm-syntax.h"
bdc76f
@@ -37,7 +39,7 @@
bdc76f
    -v17=part of s2
bdc76f
    -v18=index of unequal
bdc76f
 */
bdc76f
-ENTRY(__strncmp_vx)
bdc76f
+ENTRY(STRNCMP_Z13)
bdc76f
 	.machine "z13"
bdc76f
 	.machinemode "zarch_nohighgprs"
bdc76f
 
bdc76f
@@ -133,5 +135,14 @@ ENTRY(__strncmp_vx)
bdc76f
 .Lend_equal:
bdc76f
 	lghi	%r2,0
bdc76f
 	br	%r14
bdc76f
-END(__strncmp_vx)
bdc76f
-#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */
bdc76f
+END(STRNCMP_Z13)
bdc76f
+
bdc76f
+# if ! HAVE_STRNCMP_IFUNC
bdc76f
+strong_alias (STRNCMP_Z13, strncmp)
bdc76f
+# endif
bdc76f
+
bdc76f
+# if ! HAVE_STRNCMP_C && defined SHARED && IS_IN (libc)
bdc76f
+strong_alias (STRNCMP_Z13, __GI_strncmp)
bdc76f
+# endif
bdc76f
+
bdc76f
+#endif /* HAVE_STRNCMP_Z13  */
bdc76f
diff --git a/sysdeps/s390/multiarch/strncmp.c b/sysdeps/s390/strncmp.c
bdc76f
similarity index 70%
bdc76f
rename from sysdeps/s390/multiarch/strncmp.c
bdc76f
rename to sysdeps/s390/strncmp.c
bdc76f
index 0ec472c3b03419a3..71351273c4058129 100644
bdc76f
--- a/sysdeps/s390/multiarch/strncmp.c
bdc76f
+++ b/sysdeps/s390/strncmp.c
bdc76f
@@ -16,7 +16,9 @@
bdc76f
    License along with the GNU C Library; if not, see
bdc76f
    <http://www.gnu.org/licenses/>.  */
bdc76f
 
bdc76f
-#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)
bdc76f
+#include <ifunc-strncmp.h>
bdc76f
+
bdc76f
+#if HAVE_STRNCMP_IFUNC
bdc76f
 # define strncmp __redirect_strncmp
bdc76f
 /* Omit the strncmp inline definitions because it would redefine strncmp.  */
bdc76f
 # define __NO_STRING_INLINES
bdc76f
@@ -24,8 +26,17 @@
bdc76f
 # undef strncmp
bdc76f
 # include <ifunc-resolve.h>
bdc76f
 
bdc76f
-s390_vx_libc_ifunc2_redirected (__redirect_strncmp, __strncmp, strncmp)
bdc76f
+# if HAVE_STRNCMP_C
bdc76f
+extern __typeof (__redirect_strncmp) STRNCMP_C attribute_hidden;
bdc76f
+# endif
bdc76f
+
bdc76f
+# if HAVE_STRNCMP_Z13
bdc76f
+extern __typeof (__redirect_strncmp) STRNCMP_Z13 attribute_hidden;
bdc76f
+# endif
bdc76f
 
bdc76f
-#else
bdc76f
-# include <string/strncmp.c>
bdc76f
-#endif /* !(defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)) */
bdc76f
+s390_libc_ifunc_expr (__redirect_strncmp, strncmp,
bdc76f
+		      (HAVE_STRNCMP_Z13 && (hwcap & HWCAP_S390_VX))
bdc76f
+		      ? STRNCMP_Z13
bdc76f
+		      : STRNCMP_DEFAULT
bdc76f
+		      )
bdc76f
+#endif /* HAVE_STRNCMP_IFUNC  */