|
 |
d8307d |
commit 4c7b3cec113d9bb7dfc004e22c7a98e310ab9bcc
|
|
|
d8307d |
Author: Stefan Liebler <stli@linux.ibm.com>
|
|
|
d8307d |
Date: Tue Dec 18 13:57:16 2018 +0100
|
|
|
d8307d |
|
|
|
d8307d |
S390: Refactor rawmemchr ifunc handling.
|
|
|
d8307d |
|
|
|
d8307d |
The ifunc handling for rawmemchr is adjusted in order to omit ifunc
|
|
|
d8307d |
variants if those will never be used as the minimum architecture level
|
|
|
d8307d |
already supports newer CPUs by default.
|
|
|
d8307d |
Glibc internal calls will then also use the "newer" ifunc variant.
|
|
|
d8307d |
|
|
|
d8307d |
ChangeLog:
|
|
|
d8307d |
|
|
|
d8307d |
* sysdeps/s390/multiarch/Makefile
|
|
|
d8307d |
(sysdep_routines): Remove rawmemchr variants.
|
|
|
d8307d |
* sysdeps/s390/Makefile (sysdep_routines): Add rawmemchr variants.
|
|
|
d8307d |
* sysdeps/s390/multiarch/ifunc-impl-list.c
|
|
|
d8307d |
(__libc_ifunc_impl_list): Refactor ifunc handling for rawmemchr.
|
|
|
d8307d |
* sysdeps/s390/multiarch/rawmemchr-c.c: Move to ...
|
|
|
d8307d |
* sysdeps/s390/rawmemchr-c.c: ... here and adjust ifunc handling.
|
|
|
d8307d |
* sysdeps/s390/multiarch/rawmemchr-vx.S: Move to ...
|
|
|
d8307d |
* sysdeps/s390/rawmemchr-vx.S: ... here and adjust ifunc handling.
|
|
|
d8307d |
* sysdeps/s390/multiarch/rawmemchr.c: Move to ...
|
|
|
d8307d |
* sysdeps/s390/rawmemchr.c: ... here and adjust ifunc handling.
|
|
|
d8307d |
* sysdeps/s390/ifunc-rawmemchr.h: New file.
|
|
|
d8307d |
|
|
|
d8307d |
diff --git a/sysdeps/s390/Makefile b/sysdeps/s390/Makefile
|
|
|
d8307d |
index 816b2fccdc75e4cf..9b38b461b34176b0 100644
|
|
|
d8307d |
--- a/sysdeps/s390/Makefile
|
|
|
d8307d |
+++ b/sysdeps/s390/Makefile
|
|
|
d8307d |
@@ -53,5 +53,6 @@ sysdep_routines += bzero memset memset-z900 \
|
|
|
d8307d |
strspn strspn-vx strspn-c \
|
|
|
d8307d |
strpbrk strpbrk-vx strpbrk-c \
|
|
|
d8307d |
strcspn strcspn-vx strcspn-c \
|
|
|
d8307d |
- memchr memchr-vx memchr-z900
|
|
|
d8307d |
+ memchr memchr-vx memchr-z900 \
|
|
|
d8307d |
+ rawmemchr rawmemchr-vx rawmemchr-c
|
|
|
d8307d |
endif
|
|
|
d8307d |
diff --git a/sysdeps/s390/ifunc-rawmemchr.h b/sysdeps/s390/ifunc-rawmemchr.h
|
|
|
d8307d |
new file mode 100644
|
|
|
d8307d |
index 0000000000000000..bfcbeae802fb372e
|
|
|
d8307d |
--- /dev/null
|
|
|
d8307d |
+++ b/sysdeps/s390/ifunc-rawmemchr.h
|
|
|
d8307d |
@@ -0,0 +1,52 @@
|
|
|
d8307d |
+/* rawmemchr variant information on S/390 version.
|
|
|
d8307d |
+ Copyright (C) 2018 Free Software Foundation, Inc.
|
|
|
d8307d |
+ This file is part of the GNU C Library.
|
|
|
d8307d |
+
|
|
|
d8307d |
+ The GNU C Library is free software; you can redistribute it and/or
|
|
|
d8307d |
+ modify it under the terms of the GNU Lesser General Public
|
|
|
d8307d |
+ License as published by the Free Software Foundation; either
|
|
|
d8307d |
+ version 2.1 of the License, or (at your option) any later version.
|
|
|
d8307d |
+
|
|
|
d8307d |
+ The GNU C Library is distributed in the hope that it will be useful,
|
|
|
d8307d |
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
d8307d |
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
d8307d |
+ Lesser General Public License for more details.
|
|
|
d8307d |
+
|
|
|
d8307d |
+ You should have received a copy of the GNU Lesser General Public
|
|
|
d8307d |
+ License along with the GNU C Library; if not, see
|
|
|
d8307d |
+ <http://www.gnu.org/licenses/>. */
|
|
|
d8307d |
+
|
|
|
d8307d |
+#if defined USE_MULTIARCH && IS_IN (libc) \
|
|
|
d8307d |
+ && ! defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT
|
|
|
d8307d |
+# define HAVE_RAWMEMCHR_IFUNC 1
|
|
|
d8307d |
+#else
|
|
|
d8307d |
+# define HAVE_RAWMEMCHR_IFUNC 0
|
|
|
d8307d |
+#endif
|
|
|
d8307d |
+
|
|
|
d8307d |
+#ifdef HAVE_S390_VX_ASM_SUPPORT
|
|
|
d8307d |
+# define HAVE_RAWMEMCHR_IFUNC_AND_VX_SUPPORT HAVE_RAWMEMCHR_IFUNC
|
|
|
d8307d |
+#else
|
|
|
d8307d |
+# define HAVE_RAWMEMCHR_IFUNC_AND_VX_SUPPORT 0
|
|
|
d8307d |
+#endif
|
|
|
d8307d |
+
|
|
|
d8307d |
+#if defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT
|
|
|
d8307d |
+# define RAWMEMCHR_DEFAULT RAWMEMCHR_Z13
|
|
|
d8307d |
+# define HAVE_RAWMEMCHR_C 0
|
|
|
d8307d |
+# define HAVE_RAWMEMCHR_Z13 1
|
|
|
d8307d |
+#else
|
|
|
d8307d |
+# define RAWMEMCHR_DEFAULT RAWMEMCHR_C
|
|
|
d8307d |
+# define HAVE_RAWMEMCHR_C 1
|
|
|
d8307d |
+# define HAVE_RAWMEMCHR_Z13 HAVE_RAWMEMCHR_IFUNC_AND_VX_SUPPORT
|
|
|
d8307d |
+#endif
|
|
|
d8307d |
+
|
|
|
d8307d |
+#if HAVE_RAWMEMCHR_C
|
|
|
d8307d |
+# define RAWMEMCHR_C __rawmemchr_c
|
|
|
d8307d |
+#else
|
|
|
d8307d |
+# define RAWMEMCHR_C NULL
|
|
|
d8307d |
+#endif
|
|
|
d8307d |
+
|
|
|
d8307d |
+#if HAVE_RAWMEMCHR_Z13
|
|
|
d8307d |
+# define RAWMEMCHR_Z13 __rawmemchr_vx
|
|
|
d8307d |
+#else
|
|
|
d8307d |
+# define RAWMEMCHR_Z13 NULL
|
|
|
d8307d |
+#endif
|
|
|
d8307d |
diff --git a/sysdeps/s390/multiarch/Makefile b/sysdeps/s390/multiarch/Makefile
|
|
|
d8307d |
index fa1f7b81db912be0..ac6cfcf9c7dbbc3a 100644
|
|
|
d8307d |
--- a/sysdeps/s390/multiarch/Makefile
|
|
|
d8307d |
+++ b/sysdeps/s390/multiarch/Makefile
|
|
|
d8307d |
@@ -1,6 +1,5 @@
|
|
|
d8307d |
ifeq ($(subdir),string)
|
|
|
d8307d |
-sysdep_routines += rawmemchr rawmemchr-vx rawmemchr-c \
|
|
|
d8307d |
- memccpy memccpy-vx memccpy-c \
|
|
|
d8307d |
+sysdep_routines += memccpy memccpy-vx memccpy-c \
|
|
|
d8307d |
memrchr memrchr-vx memrchr-c
|
|
|
d8307d |
endif
|
|
|
d8307d |
|
|
|
d8307d |
diff --git a/sysdeps/s390/multiarch/ifunc-impl-list.c b/sysdeps/s390/multiarch/ifunc-impl-list.c
|
|
|
d8307d |
index b4be0140424aed69..bf3b40e111a6bd31 100644
|
|
|
d8307d |
--- a/sysdeps/s390/multiarch/ifunc-impl-list.c
|
|
|
d8307d |
+++ b/sysdeps/s390/multiarch/ifunc-impl-list.c
|
|
|
d8307d |
@@ -43,6 +43,7 @@
|
|
|
d8307d |
#include <ifunc-strpbrk.h>
|
|
|
d8307d |
#include <ifunc-strcspn.h>
|
|
|
d8307d |
#include <ifunc-memchr.h>
|
|
|
d8307d |
+#include <ifunc-rawmemchr.h>
|
|
|
d8307d |
|
|
|
d8307d |
/* Maximum number of IFUNC implementations. */
|
|
|
d8307d |
#define MAX_IFUNC 3
|
|
|
d8307d |
@@ -385,6 +386,18 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
|
|
|
d8307d |
)
|
|
|
d8307d |
#endif /* HAVE_MEMCHR_IFUNC */
|
|
|
d8307d |
|
|
|
d8307d |
+#if HAVE_RAWMEMCHR_IFUNC
|
|
|
d8307d |
+ IFUNC_IMPL (i, name, rawmemchr,
|
|
|
d8307d |
+# if HAVE_RAWMEMCHR_Z13
|
|
|
d8307d |
+ IFUNC_IMPL_ADD (array, i, rawmemchr,
|
|
|
d8307d |
+ dl_hwcap & HWCAP_S390_VX, RAWMEMCHR_Z13)
|
|
|
d8307d |
+# endif
|
|
|
d8307d |
+# if HAVE_RAWMEMCHR_C
|
|
|
d8307d |
+ IFUNC_IMPL_ADD (array, i, rawmemchr, 1, RAWMEMCHR_C)
|
|
|
d8307d |
+# endif
|
|
|
d8307d |
+ )
|
|
|
d8307d |
+#endif /* HAVE_RAWMEMCHR_IFUNC */
|
|
|
d8307d |
+
|
|
|
d8307d |
#ifdef HAVE_S390_VX_ASM_SUPPORT
|
|
|
d8307d |
|
|
|
d8307d |
# define IFUNC_VX_IMPL(FUNC) \
|
|
|
d8307d |
@@ -426,7 +439,6 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
|
|
|
d8307d |
IFUNC_VX_IMPL (wcscspn);
|
|
|
d8307d |
|
|
|
d8307d |
IFUNC_VX_IMPL (wmemchr);
|
|
|
d8307d |
- IFUNC_VX_IMPL (rawmemchr);
|
|
|
d8307d |
|
|
|
d8307d |
IFUNC_VX_IMPL (memccpy);
|
|
|
d8307d |
|
|
|
d8307d |
diff --git a/sysdeps/s390/multiarch/rawmemchr.c b/sysdeps/s390/rawmemchr-c.c
|
|
|
d8307d |
similarity index 67%
|
|
|
d8307d |
rename from sysdeps/s390/multiarch/rawmemchr.c
|
|
|
d8307d |
rename to sysdeps/s390/rawmemchr-c.c
|
|
|
d8307d |
index 5fdb2252df7f8fa1..8b8208e542092383 100644
|
|
|
d8307d |
--- a/sysdeps/s390/multiarch/rawmemchr.c
|
|
|
d8307d |
+++ b/sysdeps/s390/rawmemchr-c.c
|
|
|
d8307d |
@@ -1,4 +1,4 @@
|
|
|
d8307d |
-/* Multiple versions of rawmemchr.
|
|
|
d8307d |
+/* Default rawmemchr implementation for S/390.
|
|
|
d8307d |
Copyright (C) 2015-2018 Free Software Foundation, Inc.
|
|
|
d8307d |
This file is part of the GNU C Library.
|
|
|
d8307d |
|
|
|
d8307d |
@@ -16,16 +16,19 @@
|
|
|
d8307d |
License along with the GNU C Library; if not, see
|
|
|
d8307d |
<http://www.gnu.org/licenses/>. */
|
|
|
d8307d |
|
|
|
d8307d |
-#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)
|
|
|
d8307d |
-# define __rawmemchr __redirect___rawmemchr
|
|
|
d8307d |
-# include <string.h>
|
|
|
d8307d |
-# undef __rawmemchr
|
|
|
d8307d |
-# include <ifunc-resolve.h>
|
|
|
d8307d |
+#include <ifunc-rawmemchr.h>
|
|
|
d8307d |
|
|
|
d8307d |
-s390_vx_libc_ifunc2_redirected (__redirect___rawmemchr, __rawmemchr
|
|
|
d8307d |
- , __rawmemchr)
|
|
|
d8307d |
-weak_alias (__rawmemchr, rawmemchr)
|
|
|
d8307d |
+#if HAVE_RAWMEMCHR_C
|
|
|
d8307d |
+# if HAVE_RAWMEMCHR_IFUNC
|
|
|
d8307d |
+# define RAWMEMCHR RAWMEMCHR_C
|
|
|
d8307d |
+# undef weak_alias
|
|
|
d8307d |
+# define weak_alias(a, b)
|
|
|
d8307d |
+# if defined SHARED && IS_IN (libc)
|
|
|
d8307d |
+# undef libc_hidden_def
|
|
|
d8307d |
+# define libc_hidden_def(name) \
|
|
|
d8307d |
+ __hidden_ver1 (__rawmemchr_c, __GI___rawmemchr, __rawmemchr_c);
|
|
|
d8307d |
+# endif
|
|
|
d8307d |
+# endif
|
|
|
d8307d |
|
|
|
d8307d |
-#else
|
|
|
d8307d |
# include <string/rawmemchr.c>
|
|
|
d8307d |
-#endif /* !(defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)) */
|
|
|
d8307d |
+#endif
|
|
|
d8307d |
diff --git a/sysdeps/s390/multiarch/rawmemchr-vx.S b/sysdeps/s390/rawmemchr-vx.S
|
|
|
d8307d |
similarity index 87%
|
|
|
d8307d |
rename from sysdeps/s390/multiarch/rawmemchr-vx.S
|
|
|
d8307d |
rename to sysdeps/s390/rawmemchr-vx.S
|
|
|
d8307d |
index d5778be068394394..f04c0e8b616a76ea 100644
|
|
|
d8307d |
--- a/sysdeps/s390/multiarch/rawmemchr-vx.S
|
|
|
d8307d |
+++ b/sysdeps/s390/rawmemchr-vx.S
|
|
|
d8307d |
@@ -16,7 +16,9 @@
|
|
|
d8307d |
License along with the GNU C Library; if not, see
|
|
|
d8307d |
<http://www.gnu.org/licenses/>. */
|
|
|
d8307d |
|
|
|
d8307d |
-#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)
|
|
|
d8307d |
+#include <ifunc-rawmemchr.h>
|
|
|
d8307d |
+
|
|
|
d8307d |
+#if HAVE_RAWMEMCHR_Z13
|
|
|
d8307d |
|
|
|
d8307d |
# include "sysdep.h"
|
|
|
d8307d |
# include "asm-syntax.h"
|
|
|
d8307d |
@@ -37,7 +39,7 @@
|
|
|
d8307d |
-v17=index of unequal
|
|
|
d8307d |
-v18=c replicated
|
|
|
d8307d |
*/
|
|
|
d8307d |
-ENTRY(__rawmemchr_vx)
|
|
|
d8307d |
+ENTRY(RAWMEMCHR_Z13)
|
|
|
d8307d |
.machine "z13"
|
|
|
d8307d |
.machinemode "zarch_nohighgprs"
|
|
|
d8307d |
|
|
|
d8307d |
@@ -88,5 +90,15 @@ ENTRY(__rawmemchr_vx)
|
|
|
d8307d |
.Lend_found:
|
|
|
d8307d |
la %r2,0(%r5,%r2) /* Return pointer to character. */
|
|
|
d8307d |
br %r14
|
|
|
d8307d |
-END(__rawmemchr_vx)
|
|
|
d8307d |
-#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */
|
|
|
d8307d |
+END(RAWMEMCHR_Z13)
|
|
|
d8307d |
+
|
|
|
d8307d |
+# if ! HAVE_RAWMEMCHR_IFUNC
|
|
|
d8307d |
+strong_alias (RAWMEMCHR_Z13, __rawmemchr)
|
|
|
d8307d |
+weak_alias (__rawmemchr, rawmemchr)
|
|
|
d8307d |
+# endif
|
|
|
d8307d |
+
|
|
|
d8307d |
+# if ! HAVE_RAWMEMCHR_C && defined SHARED && IS_IN (libc)
|
|
|
d8307d |
+strong_alias (RAWMEMCHR_Z13, __GI___rawmemchr)
|
|
|
d8307d |
+# endif
|
|
|
d8307d |
+
|
|
|
d8307d |
+#endif /* HAVE_RAWMEMCHR_Z13 */
|
|
|
d8307d |
diff --git a/sysdeps/s390/multiarch/rawmemchr-c.c b/sysdeps/s390/rawmemchr.c
|
|
|
d8307d |
similarity index 56%
|
|
|
d8307d |
rename from sysdeps/s390/multiarch/rawmemchr-c.c
|
|
|
d8307d |
rename to sysdeps/s390/rawmemchr.c
|
|
|
d8307d |
index f43c883a76e52480..d9263ce208ea6361 100644
|
|
|
d8307d |
--- a/sysdeps/s390/multiarch/rawmemchr-c.c
|
|
|
d8307d |
+++ b/sysdeps/s390/rawmemchr.c
|
|
|
d8307d |
@@ -1,4 +1,4 @@
|
|
|
d8307d |
-/* Default rawmemchr implementation for S/390.
|
|
|
d8307d |
+/* Multiple versions of rawmemchr.
|
|
|
d8307d |
Copyright (C) 2015-2018 Free Software Foundation, Inc.
|
|
|
d8307d |
This file is part of the GNU C Library.
|
|
|
d8307d |
|
|
|
d8307d |
@@ -16,19 +16,26 @@
|
|
|
d8307d |
License along with the GNU C Library; if not, see
|
|
|
d8307d |
<http://www.gnu.org/licenses/>. */
|
|
|
d8307d |
|
|
|
d8307d |
-#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)
|
|
|
d8307d |
+#include <ifunc-rawmemchr.h>
|
|
|
d8307d |
+
|
|
|
d8307d |
+#if HAVE_RAWMEMCHR_IFUNC
|
|
|
d8307d |
+# define __rawmemchr __redirect___rawmemchr
|
|
|
d8307d |
# include <string.h>
|
|
|
d8307d |
+# undef __rawmemchr
|
|
|
d8307d |
+# include <ifunc-resolve.h>
|
|
|
d8307d |
|
|
|
d8307d |
-# define RAWMEMCHR __rawmemchr_c
|
|
|
d8307d |
-# undef weak_alias
|
|
|
d8307d |
-# define weak_alias(a, b)
|
|
|
d8307d |
-# ifdef SHARED
|
|
|
d8307d |
-# undef libc_hidden_def
|
|
|
d8307d |
-# define libc_hidden_def(name) \
|
|
|
d8307d |
- __hidden_ver1 (__rawmemchr_c, __GI___rawmemchr, __rawmemchr_c);
|
|
|
d8307d |
-# endif /* SHARED */
|
|
|
d8307d |
+# if HAVE_RAWMEMCHR_C
|
|
|
d8307d |
+extern __typeof (__redirect___rawmemchr) RAWMEMCHR_C attribute_hidden;
|
|
|
d8307d |
+# endif
|
|
|
d8307d |
|
|
|
d8307d |
-extern __typeof (rawmemchr) __rawmemchr_c attribute_hidden;
|
|
|
d8307d |
+# if HAVE_RAWMEMCHR_Z13
|
|
|
d8307d |
+extern __typeof (__redirect___rawmemchr) RAWMEMCHR_Z13 attribute_hidden;
|
|
|
d8307d |
+# endif
|
|
|
d8307d |
|
|
|
d8307d |
-# include <string/rawmemchr.c>
|
|
|
d8307d |
-#endif /* !(defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)) */
|
|
|
d8307d |
+s390_libc_ifunc_expr (__redirect___rawmemchr, __rawmemchr,
|
|
|
d8307d |
+ (HAVE_RAWMEMCHR_Z13 && (hwcap & HWCAP_S390_VX))
|
|
|
d8307d |
+ ? RAWMEMCHR_Z13
|
|
|
d8307d |
+ : RAWMEMCHR_DEFAULT
|
|
|
d8307d |
+ )
|
|
|
d8307d |
+weak_alias (__rawmemchr, rawmemchr)
|
|
|
d8307d |
+#endif /* HAVE_RAWMEMCHR_IFUNC */
|