|
 |
bdc76f |
commit 814a76e1bcc59e6c4899279ede887bf9fecf5a40
|
|
|
bdc76f |
Author: Stefan Liebler <stli@linux.ibm.com>
|
|
|
bdc76f |
Date: Tue Dec 18 13:57:20 2018 +0100
|
|
|
bdc76f |
|
|
|
bdc76f |
S390: Refactor wcsncat ifunc handling.
|
|
|
bdc76f |
|
|
|
bdc76f |
The ifunc handling for wcsncat is adjusted in order to omit ifunc
|
|
|
bdc76f |
if the minimum architecture level already supports newer CPUs by default.
|
|
|
bdc76f |
Unfortunately the c ifunc variant can't be omitted at all as it is used
|
|
|
bdc76f |
by the z13 ifunc variant as fallback if the pointers are not 4-byte aligned.
|
|
|
bdc76f |
|
|
|
bdc76f |
ChangeLog:
|
|
|
bdc76f |
|
|
|
bdc76f |
* sysdeps/s390/multiarch/Makefile
|
|
|
bdc76f |
(sysdep_routines): Remove wcsncat variants.
|
|
|
bdc76f |
* sysdeps/s390/Makefile (sysdep_routines): Add wcsncat variants.
|
|
|
bdc76f |
* sysdeps/s390/multiarch/ifunc-impl-list.c
|
|
|
bdc76f |
(__libc_ifunc_impl_list): Refactor ifunc handling for wcsncat.
|
|
|
bdc76f |
* sysdeps/s390/multiarch/wcsncat-c.c: Move to ...
|
|
|
bdc76f |
* sysdeps/s390/wcsncat-c.c: ... here and adjust ifunc handling.
|
|
|
bdc76f |
* sysdeps/s390/multiarch/wcsncat-vx.S: Move to ...
|
|
|
bdc76f |
* sysdeps/s390/wcsncat-vx.S: ... here and adjust ifunc handling.
|
|
|
bdc76f |
* sysdeps/s390/multiarch/wcsncat.c: Move to ...
|
|
|
bdc76f |
* sysdeps/s390/wcsncat.c: ... here and adjust ifunc handling.
|
|
|
bdc76f |
* sysdeps/s390/ifunc-wcsncat.h: New file.
|
|
|
bdc76f |
|
|
|
bdc76f |
diff --git a/sysdeps/s390/Makefile b/sysdeps/s390/Makefile
|
|
|
bdc76f |
index 5fd00ad4a8661c4c..cafabe62165f0213 100644
|
|
|
bdc76f |
--- a/sysdeps/s390/Makefile
|
|
|
bdc76f |
+++ b/sysdeps/s390/Makefile
|
|
|
bdc76f |
@@ -66,5 +66,6 @@ sysdep_routines += wcslen wcslen-vx wcslen-c \
|
|
|
bdc76f |
wcpcpy wcpcpy-vx wcpcpy-c \
|
|
|
bdc76f |
wcsncpy wcsncpy-vx wcsncpy-c \
|
|
|
bdc76f |
wcpncpy wcpncpy-vx wcpncpy-c \
|
|
|
bdc76f |
- wcscat wcscat-vx wcscat-c
|
|
|
bdc76f |
+ wcscat wcscat-vx wcscat-c \
|
|
|
bdc76f |
+ wcsncat wcsncat-vx wcsncat-c
|
|
|
bdc76f |
endif
|
|
|
bdc76f |
diff --git a/sysdeps/s390/ifunc-wcsncat.h b/sysdeps/s390/ifunc-wcsncat.h
|
|
|
bdc76f |
new file mode 100644
|
|
|
bdc76f |
index 0000000000000000..99495e0e640611ca
|
|
|
bdc76f |
--- /dev/null
|
|
|
bdc76f |
+++ b/sysdeps/s390/ifunc-wcsncat.h
|
|
|
bdc76f |
@@ -0,0 +1,53 @@
|
|
|
bdc76f |
+/* wcsncat 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_WCSNCAT_IFUNC 1
|
|
|
bdc76f |
+#else
|
|
|
bdc76f |
+# define HAVE_WCSNCAT_IFUNC 0
|
|
|
bdc76f |
+#endif
|
|
|
bdc76f |
+
|
|
|
bdc76f |
+#ifdef HAVE_S390_VX_ASM_SUPPORT
|
|
|
bdc76f |
+# define HAVE_WCSNCAT_IFUNC_AND_VX_SUPPORT HAVE_WCSNCAT_IFUNC
|
|
|
bdc76f |
+#else
|
|
|
bdc76f |
+# define HAVE_WCSNCAT_IFUNC_AND_VX_SUPPORT 0
|
|
|
bdc76f |
+#endif
|
|
|
bdc76f |
+
|
|
|
bdc76f |
+#if defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT
|
|
|
bdc76f |
+# define WCSNCAT_DEFAULT WCSNCAT_Z13
|
|
|
bdc76f |
+/* The z13 ifunc variant is using the common code variant as fallback! */
|
|
|
bdc76f |
+# define HAVE_WCSNCAT_C 1
|
|
|
bdc76f |
+# define HAVE_WCSNCAT_Z13 1
|
|
|
bdc76f |
+#else
|
|
|
bdc76f |
+# define WCSNCAT_DEFAULT WCSNCAT_C
|
|
|
bdc76f |
+# define HAVE_WCSNCAT_C 1
|
|
|
bdc76f |
+# define HAVE_WCSNCAT_Z13 HAVE_WCSNCAT_IFUNC_AND_VX_SUPPORT
|
|
|
bdc76f |
+#endif
|
|
|
bdc76f |
+
|
|
|
bdc76f |
+#if HAVE_WCSNCAT_C
|
|
|
bdc76f |
+# define WCSNCAT_C __wcsncat_c
|
|
|
bdc76f |
+#else
|
|
|
bdc76f |
+# define WCSNCAT_C NULL
|
|
|
bdc76f |
+#endif
|
|
|
bdc76f |
+
|
|
|
bdc76f |
+#if HAVE_WCSNCAT_Z13
|
|
|
bdc76f |
+# define WCSNCAT_Z13 __wcsncat_vx
|
|
|
bdc76f |
+#else
|
|
|
bdc76f |
+# define WCSNCAT_Z13 NULL
|
|
|
bdc76f |
+#endif
|
|
|
bdc76f |
diff --git a/sysdeps/s390/multiarch/Makefile b/sysdeps/s390/multiarch/Makefile
|
|
|
bdc76f |
index 617017496c79e2ca..6cb75950c2c453f6 100644
|
|
|
bdc76f |
--- a/sysdeps/s390/multiarch/Makefile
|
|
|
bdc76f |
+++ b/sysdeps/s390/multiarch/Makefile
|
|
|
bdc76f |
@@ -1,6 +1,5 @@
|
|
|
bdc76f |
ifeq ($(subdir),wcsmbs)
|
|
|
bdc76f |
-sysdep_routines += wcsncat wcsncat-vx wcsncat-c \
|
|
|
bdc76f |
- wcscmp wcscmp-vx wcscmp-c \
|
|
|
bdc76f |
+sysdep_routines += wcscmp wcscmp-vx wcscmp-c \
|
|
|
bdc76f |
wcsncmp wcsncmp-vx wcsncmp-c \
|
|
|
bdc76f |
wcschr wcschr-vx wcschr-c \
|
|
|
bdc76f |
wcschrnul wcschrnul-vx wcschrnul-c \
|
|
|
bdc76f |
diff --git a/sysdeps/s390/multiarch/ifunc-impl-list.c b/sysdeps/s390/multiarch/ifunc-impl-list.c
|
|
|
bdc76f |
index b05bd35fd898d0a6..7b7b1e7497ec1a4f 100644
|
|
|
bdc76f |
--- a/sysdeps/s390/multiarch/ifunc-impl-list.c
|
|
|
bdc76f |
+++ b/sysdeps/s390/multiarch/ifunc-impl-list.c
|
|
|
bdc76f |
@@ -53,6 +53,7 @@
|
|
|
bdc76f |
#include <ifunc-wcsncpy.h>
|
|
|
bdc76f |
#include <ifunc-wcpncpy.h>
|
|
|
bdc76f |
#include <ifunc-wcscat.h>
|
|
|
bdc76f |
+#include <ifunc-wcsncat.h>
|
|
|
bdc76f |
|
|
|
bdc76f |
/* Maximum number of IFUNC implementations. */
|
|
|
bdc76f |
#define MAX_IFUNC 3
|
|
|
bdc76f |
@@ -515,6 +516,18 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
|
|
|
bdc76f |
)
|
|
|
bdc76f |
#endif /* HAVE_WCSCAT_IFUNC */
|
|
|
bdc76f |
|
|
|
bdc76f |
+#if HAVE_WCSNCAT_IFUNC
|
|
|
bdc76f |
+ IFUNC_IMPL (i, name, wcsncat,
|
|
|
bdc76f |
+# if HAVE_WCSNCAT_Z13
|
|
|
bdc76f |
+ IFUNC_IMPL_ADD (array, i, wcsncat,
|
|
|
bdc76f |
+ dl_hwcap & HWCAP_S390_VX, WCSNCAT_Z13)
|
|
|
bdc76f |
+# endif
|
|
|
bdc76f |
+# if HAVE_WCSNCAT_C
|
|
|
bdc76f |
+ IFUNC_IMPL_ADD (array, i, wcsncat, 1, WCSNCAT_C)
|
|
|
bdc76f |
+# endif
|
|
|
bdc76f |
+ )
|
|
|
bdc76f |
+#endif /* HAVE_WCSNCAT_IFUNC */
|
|
|
bdc76f |
+
|
|
|
bdc76f |
#ifdef HAVE_S390_VX_ASM_SUPPORT
|
|
|
bdc76f |
|
|
|
bdc76f |
# define IFUNC_VX_IMPL(FUNC) \
|
|
|
bdc76f |
@@ -523,8 +536,6 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
|
|
|
bdc76f |
__##FUNC##_vx) \
|
|
|
bdc76f |
IFUNC_IMPL_ADD (array, i, FUNC, 1, __##FUNC##_c))
|
|
|
bdc76f |
|
|
|
bdc76f |
- IFUNC_VX_IMPL (wcsncat);
|
|
|
bdc76f |
-
|
|
|
bdc76f |
IFUNC_VX_IMPL (wcscmp);
|
|
|
bdc76f |
|
|
|
bdc76f |
IFUNC_VX_IMPL (wcsncmp);
|
|
|
bdc76f |
diff --git a/sysdeps/s390/multiarch/wcsncat-c.c b/sysdeps/s390/wcsncat-c.c
|
|
|
bdc76f |
similarity index 85%
|
|
|
bdc76f |
rename from sysdeps/s390/multiarch/wcsncat-c.c
|
|
|
bdc76f |
rename to sysdeps/s390/wcsncat-c.c
|
|
|
bdc76f |
index 2cf1a76385932c64..5782d5cb28c9e7f6 100644
|
|
|
bdc76f |
--- a/sysdeps/s390/multiarch/wcsncat-c.c
|
|
|
bdc76f |
+++ b/sysdeps/s390/wcsncat-c.c
|
|
|
bdc76f |
@@ -16,10 +16,12 @@
|
|
|
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 WCSNCAT __wcsncat_c
|
|
|
bdc76f |
+#include <ifunc-wcsncat.h>
|
|
|
bdc76f |
+
|
|
|
bdc76f |
+#if HAVE_WCSNCAT_C
|
|
|
bdc76f |
+# if HAVE_WCSNCAT_IFUNC || HAVE_WCSNCAT_Z13
|
|
|
bdc76f |
+# define WCSNCAT WCSNCAT_C
|
|
|
bdc76f |
+# endif
|
|
|
bdc76f |
|
|
|
bdc76f |
-# include <wchar.h>
|
|
|
bdc76f |
-extern __typeof (wcsncat) __wcsncat_c;
|
|
|
bdc76f |
# include <wcsmbs/wcsncat.c>
|
|
|
bdc76f |
#endif
|
|
|
bdc76f |
diff --git a/sysdeps/s390/multiarch/wcsncat-vx.S b/sysdeps/s390/wcsncat-vx.S
|
|
|
bdc76f |
similarity index 97%
|
|
|
bdc76f |
rename from sysdeps/s390/multiarch/wcsncat-vx.S
|
|
|
bdc76f |
rename to sysdeps/s390/wcsncat-vx.S
|
|
|
bdc76f |
index 1d3935690d9f91a3..7c89d3d856faee24 100644
|
|
|
bdc76f |
--- a/sysdeps/s390/multiarch/wcsncat-vx.S
|
|
|
bdc76f |
+++ b/sysdeps/s390/wcsncat-vx.S
|
|
|
bdc76f |
@@ -16,7 +16,8 @@
|
|
|
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-wcsncat.h>
|
|
|
bdc76f |
+#if HAVE_WCSNCAT_Z13
|
|
|
bdc76f |
|
|
|
bdc76f |
# include "sysdep.h"
|
|
|
bdc76f |
# include "asm-syntax.h"
|
|
|
bdc76f |
@@ -40,7 +41,7 @@
|
|
|
bdc76f |
-v18=part of src
|
|
|
bdc76f |
-v31=register save area for r6, r7
|
|
|
bdc76f |
*/
|
|
|
bdc76f |
-ENTRY(__wcsncat_vx)
|
|
|
bdc76f |
+ENTRY(WCSNCAT_Z13)
|
|
|
bdc76f |
.machine "z13"
|
|
|
bdc76f |
.machinemode "zarch_nohighgprs"
|
|
|
bdc76f |
|
|
|
bdc76f |
@@ -260,6 +261,10 @@ ENTRY(__wcsncat_vx)
|
|
|
bdc76f |
j .Lcpy_lt64
|
|
|
bdc76f |
|
|
|
bdc76f |
.Lfallback:
|
|
|
bdc76f |
- jg __wcsncat_c
|
|
|
bdc76f |
-END(__wcsncat_vx)
|
|
|
bdc76f |
-#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */
|
|
|
bdc76f |
+ jg WCSNCAT_C
|
|
|
bdc76f |
+END(WCSNCAT_Z13)
|
|
|
bdc76f |
+
|
|
|
bdc76f |
+# if ! HAVE_WCSNCAT_IFUNC
|
|
|
bdc76f |
+strong_alias (WCSNCAT_Z13, wcsncat)
|
|
|
bdc76f |
+# endif
|
|
|
bdc76f |
+#endif
|
|
|
bdc76f |
diff --git a/sysdeps/s390/multiarch/wcsncat.c b/sysdeps/s390/wcsncat.c
|
|
|
bdc76f |
similarity index 69%
|
|
|
bdc76f |
rename from sysdeps/s390/multiarch/wcsncat.c
|
|
|
bdc76f |
rename to sysdeps/s390/wcsncat.c
|
|
|
bdc76f |
index c49b8ff78671cb99..722429fd5b5b4d9d 100644
|
|
|
bdc76f |
--- a/sysdeps/s390/multiarch/wcsncat.c
|
|
|
bdc76f |
+++ b/sysdeps/s390/wcsncat.c
|
|
|
bdc76f |
@@ -16,12 +16,23 @@
|
|
|
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-wcsncat.h>
|
|
|
bdc76f |
+
|
|
|
bdc76f |
+#if HAVE_WCSNCAT_IFUNC
|
|
|
bdc76f |
# include <wchar.h>
|
|
|
bdc76f |
# include <ifunc-resolve.h>
|
|
|
bdc76f |
|
|
|
bdc76f |
-s390_vx_libc_ifunc2 (__wcsncat, wcsncat)
|
|
|
bdc76f |
+# if HAVE_WCSNCAT_C
|
|
|
bdc76f |
+extern __typeof (wcsncat) WCSNCAT_C attribute_hidden;
|
|
|
bdc76f |
+# endif
|
|
|
bdc76f |
+
|
|
|
bdc76f |
+# if HAVE_WCSNCAT_Z13
|
|
|
bdc76f |
+extern __typeof (wcsncat) WCSNCAT_Z13 attribute_hidden;
|
|
|
bdc76f |
+# endif
|
|
|
bdc76f |
|
|
|
bdc76f |
-#else
|
|
|
bdc76f |
-# include <wcsmbs/wcsncat.c>
|
|
|
bdc76f |
-#endif /* !(defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)) */
|
|
|
bdc76f |
+s390_libc_ifunc_expr (wcsncat, wcsncat,
|
|
|
bdc76f |
+ (HAVE_WCSNCAT_Z13 && (hwcap & HWCAP_S390_VX))
|
|
|
bdc76f |
+ ? WCSNCAT_Z13
|
|
|
bdc76f |
+ : WCSNCAT_DEFAULT
|
|
|
bdc76f |
+ )
|
|
|
bdc76f |
+#endif
|