|
 |
bdc76f |
commit 8e87c1f6d45a63dc2175825c2dc5d66192a13aab
|
|
|
bdc76f |
Author: Stefan Liebler <stli@linux.ibm.com>
|
|
|
bdc76f |
Date: Tue Dec 18 13:57:23 2018 +0100
|
|
|
bdc76f |
|
|
|
bdc76f |
S390: Refactor wcspbrk ifunc handling.
|
|
|
bdc76f |
|
|
|
bdc76f |
The ifunc handling for wcspbrk 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 |
Glibc internal calls will use the "newer" ifunc variant.
|
|
|
bdc76f |
|
|
|
bdc76f |
ChangeLog:
|
|
|
bdc76f |
|
|
|
bdc76f |
* sysdeps/s390/multiarch/Makefile
|
|
|
bdc76f |
(sysdep_routines): Remove wcspbrk variants.
|
|
|
bdc76f |
* sysdeps/s390/Makefile (sysdep_routines): Add wcspbrk variants.
|
|
|
bdc76f |
* sysdeps/s390/multiarch/ifunc-impl-list.c
|
|
|
bdc76f |
(__libc_ifunc_impl_list): Refactor ifunc handling for wcspbrk.
|
|
|
bdc76f |
* sysdeps/s390/multiarch/wcspbrk-c.c: Move to ...
|
|
|
bdc76f |
* sysdeps/s390/wcspbrk-c.c: ... here and adjust ifunc handling.
|
|
|
bdc76f |
* sysdeps/s390/multiarch/wcspbrk-vx.S: Move to ...
|
|
|
bdc76f |
* sysdeps/s390/wcspbrk-vx.S: ... here and adjust ifunc handling.
|
|
|
bdc76f |
* sysdeps/s390/multiarch/wcspbrk.c: Move to ...
|
|
|
bdc76f |
* sysdeps/s390/wcspbrk.c: ... here and adjust ifunc handling.
|
|
|
bdc76f |
* sysdeps/s390/ifunc-wcspbrk.h: New file.
|
|
|
bdc76f |
|
|
|
bdc76f |
diff --git a/sysdeps/s390/Makefile b/sysdeps/s390/Makefile
|
|
|
bdc76f |
index 38dbba8ccfd3cd66..af595050d43c63ed 100644
|
|
|
bdc76f |
--- a/sysdeps/s390/Makefile
|
|
|
bdc76f |
+++ b/sysdeps/s390/Makefile
|
|
|
bdc76f |
@@ -73,5 +73,6 @@ sysdep_routines += wcslen wcslen-vx wcslen-c \
|
|
|
bdc76f |
wcschr wcschr-vx wcschr-c \
|
|
|
bdc76f |
wcschrnul wcschrnul-vx wcschrnul-c \
|
|
|
bdc76f |
wcsrchr wcsrchr-vx wcsrchr-c \
|
|
|
bdc76f |
- wcsspn wcsspn-vx wcsspn-c
|
|
|
bdc76f |
+ wcsspn wcsspn-vx wcsspn-c \
|
|
|
bdc76f |
+ wcspbrk wcspbrk-vx wcspbrk-c
|
|
|
bdc76f |
endif
|
|
|
bdc76f |
diff --git a/sysdeps/s390/ifunc-wcspbrk.h b/sysdeps/s390/ifunc-wcspbrk.h
|
|
|
bdc76f |
new file mode 100644
|
|
|
bdc76f |
index 0000000000000000..d3b9b7363a73fab0
|
|
|
bdc76f |
--- /dev/null
|
|
|
bdc76f |
+++ b/sysdeps/s390/ifunc-wcspbrk.h
|
|
|
bdc76f |
@@ -0,0 +1,53 @@
|
|
|
bdc76f |
+/* wcspbrk 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_WCSPBRK_IFUNC 1
|
|
|
bdc76f |
+#else
|
|
|
bdc76f |
+# define HAVE_WCSPBRK_IFUNC 0
|
|
|
bdc76f |
+#endif
|
|
|
bdc76f |
+
|
|
|
bdc76f |
+#ifdef HAVE_S390_VX_ASM_SUPPORT
|
|
|
bdc76f |
+# define HAVE_WCSPBRK_IFUNC_AND_VX_SUPPORT HAVE_WCSPBRK_IFUNC
|
|
|
bdc76f |
+#else
|
|
|
bdc76f |
+# define HAVE_WCSPBRK_IFUNC_AND_VX_SUPPORT 0
|
|
|
bdc76f |
+#endif
|
|
|
bdc76f |
+
|
|
|
bdc76f |
+#if defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT
|
|
|
bdc76f |
+# define WCSPBRK_DEFAULT WCSPBRK_Z13
|
|
|
bdc76f |
+/* The z13 ifunc variant is using the common code variant as fallback! */
|
|
|
bdc76f |
+# define HAVE_WCSPBRK_C 1
|
|
|
bdc76f |
+# define HAVE_WCSPBRK_Z13 1
|
|
|
bdc76f |
+#else
|
|
|
bdc76f |
+# define WCSPBRK_DEFAULT WCSPBRK_C
|
|
|
bdc76f |
+# define HAVE_WCSPBRK_C 1
|
|
|
bdc76f |
+# define HAVE_WCSPBRK_Z13 HAVE_WCSPBRK_IFUNC_AND_VX_SUPPORT
|
|
|
bdc76f |
+#endif
|
|
|
bdc76f |
+
|
|
|
bdc76f |
+#if HAVE_WCSPBRK_C
|
|
|
bdc76f |
+# define WCSPBRK_C __wcspbrk_c
|
|
|
bdc76f |
+#else
|
|
|
bdc76f |
+# define WCSPBRK_C NULL
|
|
|
bdc76f |
+#endif
|
|
|
bdc76f |
+
|
|
|
bdc76f |
+#if HAVE_WCSPBRK_Z13
|
|
|
bdc76f |
+# define WCSPBRK_Z13 __wcspbrk_vx
|
|
|
bdc76f |
+#else
|
|
|
bdc76f |
+# define WCSPBRK_Z13 NULL
|
|
|
bdc76f |
+#endif
|
|
|
bdc76f |
diff --git a/sysdeps/s390/multiarch/Makefile b/sysdeps/s390/multiarch/Makefile
|
|
|
bdc76f |
index 091f5150847a404a..e1e2d9dc7495ebdc 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 += wcspbrk wcspbrk-vx wcspbrk-c \
|
|
|
bdc76f |
- wcscspn wcscspn-vx wcscspn-c \
|
|
|
bdc76f |
+sysdep_routines += wcscspn wcscspn-vx wcscspn-c \
|
|
|
bdc76f |
wmemchr wmemchr-vx wmemchr-c \
|
|
|
bdc76f |
wmemset wmemset-vx wmemset-c \
|
|
|
bdc76f |
wmemcmp wmemcmp-vx wmemcmp-c
|
|
|
bdc76f |
diff --git a/sysdeps/s390/multiarch/ifunc-impl-list.c b/sysdeps/s390/multiarch/ifunc-impl-list.c
|
|
|
bdc76f |
index 6f4de2845ba0a378..89d6e8ad7e323fec 100644
|
|
|
bdc76f |
--- a/sysdeps/s390/multiarch/ifunc-impl-list.c
|
|
|
bdc76f |
+++ b/sysdeps/s390/multiarch/ifunc-impl-list.c
|
|
|
bdc76f |
@@ -60,6 +60,7 @@
|
|
|
bdc76f |
#include <ifunc-wcschrnul.h>
|
|
|
bdc76f |
#include <ifunc-wcsrchr.h>
|
|
|
bdc76f |
#include <ifunc-wcsspn.h>
|
|
|
bdc76f |
+#include <ifunc-wcspbrk.h>
|
|
|
bdc76f |
|
|
|
bdc76f |
/* Maximum number of IFUNC implementations. */
|
|
|
bdc76f |
#define MAX_IFUNC 3
|
|
|
bdc76f |
@@ -606,6 +607,18 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
|
|
|
bdc76f |
)
|
|
|
bdc76f |
#endif /* HAVE_WCSSPN_IFUNC */
|
|
|
bdc76f |
|
|
|
bdc76f |
+#if HAVE_WCSPBRK_IFUNC
|
|
|
bdc76f |
+ IFUNC_IMPL (i, name, wcspbrk,
|
|
|
bdc76f |
+# if HAVE_WCSPBRK_Z13
|
|
|
bdc76f |
+ IFUNC_IMPL_ADD (array, i, wcspbrk,
|
|
|
bdc76f |
+ dl_hwcap & HWCAP_S390_VX, WCSPBRK_Z13)
|
|
|
bdc76f |
+# endif
|
|
|
bdc76f |
+# if HAVE_WCSPBRK_C
|
|
|
bdc76f |
+ IFUNC_IMPL_ADD (array, i, wcspbrk, 1, WCSPBRK_C)
|
|
|
bdc76f |
+# endif
|
|
|
bdc76f |
+ )
|
|
|
bdc76f |
+#endif /* HAVE_WCSPBRK_IFUNC */
|
|
|
bdc76f |
+
|
|
|
bdc76f |
#ifdef HAVE_S390_VX_ASM_SUPPORT
|
|
|
bdc76f |
|
|
|
bdc76f |
# define IFUNC_VX_IMPL(FUNC) \
|
|
|
bdc76f |
@@ -614,8 +627,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 (wcspbrk);
|
|
|
bdc76f |
-
|
|
|
bdc76f |
IFUNC_VX_IMPL (wcscspn);
|
|
|
bdc76f |
|
|
|
bdc76f |
IFUNC_VX_IMPL (wmemchr);
|
|
|
bdc76f |
diff --git a/sysdeps/s390/multiarch/wcspbrk-c.c b/sysdeps/s390/wcspbrk-c.c
|
|
|
bdc76f |
similarity index 72%
|
|
|
bdc76f |
rename from sysdeps/s390/multiarch/wcspbrk-c.c
|
|
|
bdc76f |
rename to sysdeps/s390/wcspbrk-c.c
|
|
|
bdc76f |
index 6b6e7aade46942ed..e79c6a85503dc32b 100644
|
|
|
bdc76f |
--- a/sysdeps/s390/multiarch/wcspbrk-c.c
|
|
|
bdc76f |
+++ b/sysdeps/s390/wcspbrk-c.c
|
|
|
bdc76f |
@@ -16,16 +16,22 @@
|
|
|
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 WCSPBRK __wcspbrk_c
|
|
|
bdc76f |
+#include <ifunc-wcspbrk.h>
|
|
|
bdc76f |
|
|
|
bdc76f |
-# include <wchar.h>
|
|
|
bdc76f |
-extern __typeof (wcspbrk) __wcspbrk_c;
|
|
|
bdc76f |
-# ifdef SHARED
|
|
|
bdc76f |
-# undef libc_hidden_def
|
|
|
bdc76f |
-# define libc_hidden_def(name) \
|
|
|
bdc76f |
+#if HAVE_WCSPBRK_C
|
|
|
bdc76f |
+# if HAVE_WCSPBRK_IFUNC || HAVE_WCSPBRK_Z13
|
|
|
bdc76f |
+# define WCSPBRK WCSPBRK_C
|
|
|
bdc76f |
+
|
|
|
bdc76f |
+# if defined SHARED && IS_IN (libc)
|
|
|
bdc76f |
+# undef libc_hidden_def
|
|
|
bdc76f |
+# if ! defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT
|
|
|
bdc76f |
+# define libc_hidden_def(name) \
|
|
|
bdc76f |
__hidden_ver1 (__wcspbrk_c, __GI_wcspbrk, __wcspbrk_c);
|
|
|
bdc76f |
-# endif /* SHARED */
|
|
|
bdc76f |
+# else
|
|
|
bdc76f |
+# define libc_hidden_def(name)
|
|
|
bdc76f |
+# endif
|
|
|
bdc76f |
+# endif
|
|
|
bdc76f |
+# endif
|
|
|
bdc76f |
|
|
|
bdc76f |
# include <wcsmbs/wcspbrk.c>
|
|
|
bdc76f |
-#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */
|
|
|
bdc76f |
+#endif
|
|
|
bdc76f |
diff --git a/sysdeps/s390/multiarch/wcspbrk-vx.S b/sysdeps/s390/wcspbrk-vx.S
|
|
|
bdc76f |
similarity index 97%
|
|
|
bdc76f |
rename from sysdeps/s390/multiarch/wcspbrk-vx.S
|
|
|
bdc76f |
rename to sysdeps/s390/wcspbrk-vx.S
|
|
|
bdc76f |
index 5c89ec5d336c1acd..5870c4684d140ab0 100644
|
|
|
bdc76f |
--- a/sysdeps/s390/multiarch/wcspbrk-vx.S
|
|
|
bdc76f |
+++ b/sysdeps/s390/wcspbrk-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-wcspbrk.h>
|
|
|
bdc76f |
+#if HAVE_WCSPBRK_Z13
|
|
|
bdc76f |
|
|
|
bdc76f |
# include "sysdep.h"
|
|
|
bdc76f |
# include "asm-syntax.h"
|
|
|
bdc76f |
@@ -59,7 +60,7 @@
|
|
|
bdc76f |
otherwise =0;
|
|
|
bdc76f |
r9: loaded byte count of vlbb accept-string
|
|
|
bdc76f |
*/
|
|
|
bdc76f |
-ENTRY(__wcspbrk_vx)
|
|
|
bdc76f |
+ENTRY(WCSPBRK_Z13)
|
|
|
bdc76f |
.machine "z13"
|
|
|
bdc76f |
.machinemode "zarch_nohighgprs"
|
|
|
bdc76f |
|
|
|
bdc76f |
@@ -310,6 +311,15 @@ ENTRY(__wcspbrk_vx)
|
|
|
bdc76f |
lgr %r2,%r1
|
|
|
bdc76f |
br %r14
|
|
|
bdc76f |
.Lfallback:
|
|
|
bdc76f |
- jg __wcspbrk_c
|
|
|
bdc76f |
-END(__wcspbrk_vx)
|
|
|
bdc76f |
-#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */
|
|
|
bdc76f |
+ jg WCSPBRK_C
|
|
|
bdc76f |
+END(WCSPBRK_Z13)
|
|
|
bdc76f |
+
|
|
|
bdc76f |
+# if ! HAVE_WCSPBRK_IFUNC
|
|
|
bdc76f |
+strong_alias (WCSPBRK_Z13, wcspbrk)
|
|
|
bdc76f |
+# endif
|
|
|
bdc76f |
+
|
|
|
bdc76f |
+# if defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT \
|
|
|
bdc76f |
+ && defined SHARED && IS_IN (libc)
|
|
|
bdc76f |
+strong_alias (WCSPBRK_Z13, __GI_wcspbrk)
|
|
|
bdc76f |
+# endif
|
|
|
bdc76f |
+#endif
|
|
|
bdc76f |
diff --git a/sysdeps/s390/multiarch/wcspbrk.c b/sysdeps/s390/wcspbrk.c
|
|
|
bdc76f |
similarity index 69%
|
|
|
bdc76f |
rename from sysdeps/s390/multiarch/wcspbrk.c
|
|
|
bdc76f |
rename to sysdeps/s390/wcspbrk.c
|
|
|
bdc76f |
index 97876328b5ad9425..84ab911a24fba3c4 100644
|
|
|
bdc76f |
--- a/sysdeps/s390/multiarch/wcspbrk.c
|
|
|
bdc76f |
+++ b/sysdeps/s390/wcspbrk.c
|
|
|
bdc76f |
@@ -16,14 +16,24 @@
|
|
|
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-wcspbrk.h>
|
|
|
bdc76f |
+
|
|
|
bdc76f |
+#if HAVE_WCSPBRK_IFUNC
|
|
|
bdc76f |
# define wcspbrk __redirect_wcspbrk
|
|
|
bdc76f |
# include <wchar.h>
|
|
|
bdc76f |
# undef wcspbrk
|
|
|
bdc76f |
# include <ifunc-resolve.h>
|
|
|
bdc76f |
+# if HAVE_WCSPBRK_C
|
|
|
bdc76f |
+extern __typeof (__redirect_wcspbrk) WCSPBRK_C attribute_hidden;
|
|
|
bdc76f |
+# endif
|
|
|
bdc76f |
|
|
|
bdc76f |
-s390_vx_libc_ifunc2_redirected (__redirect_wcspbrk, __wcspbrk, wcspbrk)
|
|
|
bdc76f |
+# if HAVE_WCSPBRK_Z13
|
|
|
bdc76f |
+extern __typeof (__redirect_wcspbrk) WCSPBRK_Z13 attribute_hidden;
|
|
|
bdc76f |
+# endif
|
|
|
bdc76f |
|
|
|
bdc76f |
-#else
|
|
|
bdc76f |
-# include <wcsmbs/wcspbrk.c>
|
|
|
bdc76f |
-#endif /* !(defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)) */
|
|
|
bdc76f |
+s390_libc_ifunc_expr (__redirect_wcspbrk, wcspbrk,
|
|
|
bdc76f |
+ (HAVE_WCSPBRK_Z13 && (hwcap & HWCAP_S390_VX))
|
|
|
bdc76f |
+ ? WCSPBRK_Z13
|
|
|
bdc76f |
+ : WCSPBRK_DEFAULT
|
|
|
bdc76f |
+ )
|
|
|
bdc76f |
+#endif
|