|
 |
077c9d |
commit 970449311ded3cacb6058c96143dd4c057900589
|
|
|
077c9d |
Author: Stefan Liebler <stli@linux.ibm.com>
|
|
|
077c9d |
Date: Tue Dec 18 13:57:11 2018 +0100
|
|
|
077c9d |
|
|
|
077c9d |
S390: Refactor stpcpy ifunc handling.
|
|
|
077c9d |
|
|
|
077c9d |
The ifunc handling for stpcpy 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 stpcpy variants.
|
|
|
077c9d |
* sysdeps/s390/Makefile (sysdep_routines): Add stpcpy variants.
|
|
|
077c9d |
* sysdeps/s390/multiarch/ifunc-impl-list.c
|
|
|
077c9d |
(__libc_ifunc_impl_list): Refactor ifunc handling for stpcpy.
|
|
|
077c9d |
* sysdeps/s390/multiarch/stpcpy-c.c: Move to ...
|
|
|
077c9d |
* sysdeps/s390/stpcpy-c.c: ... here and adjust ifunc handling.
|
|
|
077c9d |
* sysdeps/s390/multiarch/stpcpy-vx.S: Move to ...
|
|
|
077c9d |
* sysdeps/s390/stpcpy-vx.S: ... here and adjust ifunc handling.
|
|
|
077c9d |
* sysdeps/s390/multiarch/stpcpy.c: Move to ...
|
|
|
077c9d |
* sysdeps/s390/stpcpy.c: ... here and adjust ifunc handling.
|
|
|
077c9d |
* sysdeps/s390/ifunc-stpcpy.h: New file.
|
|
|
077c9d |
|
|
|
077c9d |
diff --git a/sysdeps/s390/Makefile b/sysdeps/s390/Makefile
|
|
|
077c9d |
index e4191319531ecb01..b7e1bc8aecf2f8c9 100644
|
|
|
077c9d |
--- a/sysdeps/s390/Makefile
|
|
|
077c9d |
+++ b/sysdeps/s390/Makefile
|
|
|
077c9d |
@@ -39,5 +39,6 @@ sysdep_routines += bzero memset memset-z900 \
|
|
|
077c9d |
memmem memmem-vx memmem-c \
|
|
|
077c9d |
strlen strlen-vx strlen-c \
|
|
|
077c9d |
strnlen strnlen-vx strnlen-c \
|
|
|
077c9d |
- strcpy strcpy-vx strcpy-z900
|
|
|
077c9d |
+ strcpy strcpy-vx strcpy-z900 \
|
|
|
077c9d |
+ stpcpy stpcpy-vx stpcpy-c
|
|
|
077c9d |
endif
|
|
|
077c9d |
diff --git a/sysdeps/s390/ifunc-stpcpy.h b/sysdeps/s390/ifunc-stpcpy.h
|
|
|
077c9d |
new file mode 100644
|
|
|
077c9d |
index 0000000000000000..9a70cd7c8c4f4582
|
|
|
077c9d |
--- /dev/null
|
|
|
077c9d |
+++ b/sysdeps/s390/ifunc-stpcpy.h
|
|
|
077c9d |
@@ -0,0 +1,52 @@
|
|
|
077c9d |
+/* stpcpy 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_STPCPY_IFUNC 1
|
|
|
077c9d |
+#else
|
|
|
077c9d |
+# define HAVE_STPCPY_IFUNC 0
|
|
|
077c9d |
+#endif
|
|
|
077c9d |
+
|
|
|
077c9d |
+#ifdef HAVE_S390_VX_ASM_SUPPORT
|
|
|
077c9d |
+# define HAVE_STPCPY_IFUNC_AND_VX_SUPPORT HAVE_STPCPY_IFUNC
|
|
|
077c9d |
+#else
|
|
|
077c9d |
+# define HAVE_STPCPY_IFUNC_AND_VX_SUPPORT 0
|
|
|
077c9d |
+#endif
|
|
|
077c9d |
+
|
|
|
077c9d |
+#if defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT
|
|
|
077c9d |
+# define STPCPY_DEFAULT STPCPY_Z13
|
|
|
077c9d |
+# define HAVE_STPCPY_C 0
|
|
|
077c9d |
+# define HAVE_STPCPY_Z13 1
|
|
|
077c9d |
+#else
|
|
|
077c9d |
+# define STPCPY_DEFAULT STPCPY_C
|
|
|
077c9d |
+# define HAVE_STPCPY_C 1
|
|
|
077c9d |
+# define HAVE_STPCPY_Z13 HAVE_STPCPY_IFUNC_AND_VX_SUPPORT
|
|
|
077c9d |
+#endif
|
|
|
077c9d |
+
|
|
|
077c9d |
+#if HAVE_STPCPY_C
|
|
|
077c9d |
+# define STPCPY_C __stpcpy_c
|
|
|
077c9d |
+#else
|
|
|
077c9d |
+# define STPCPY_C NULL
|
|
|
077c9d |
+#endif
|
|
|
077c9d |
+
|
|
|
077c9d |
+#if HAVE_STPCPY_Z13
|
|
|
077c9d |
+# define STPCPY_Z13 __stpcpy_vx
|
|
|
077c9d |
+#else
|
|
|
077c9d |
+# define STPCPY_Z13 NULL
|
|
|
077c9d |
+#endif
|
|
|
077c9d |
diff --git a/sysdeps/s390/multiarch/Makefile b/sysdeps/s390/multiarch/Makefile
|
|
|
077c9d |
index 50f7f0b78df723bb..9517417dcbe1c701 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 += stpcpy stpcpy-vx stpcpy-c \
|
|
|
077c9d |
- strncpy strncpy-vx \
|
|
|
077c9d |
+sysdep_routines += strncpy strncpy-vx \
|
|
|
077c9d |
stpncpy stpncpy-vx stpncpy-c \
|
|
|
077c9d |
strcat strcat-vx strcat-c \
|
|
|
077c9d |
strncat strncat-vx strncat-c \
|
|
|
077c9d |
diff --git a/sysdeps/s390/multiarch/ifunc-impl-list.c b/sysdeps/s390/multiarch/ifunc-impl-list.c
|
|
|
077c9d |
index 1784372db9828463..678ed13833332f11 100644
|
|
|
077c9d |
--- a/sysdeps/s390/multiarch/ifunc-impl-list.c
|
|
|
077c9d |
+++ b/sysdeps/s390/multiarch/ifunc-impl-list.c
|
|
|
077c9d |
@@ -29,6 +29,7 @@
|
|
|
077c9d |
#include <ifunc-strlen.h>
|
|
|
077c9d |
#include <ifunc-strnlen.h>
|
|
|
077c9d |
#include <ifunc-strcpy.h>
|
|
|
077c9d |
+#include <ifunc-stpcpy.h>
|
|
|
077c9d |
|
|
|
077c9d |
/* Maximum number of IFUNC implementations. */
|
|
|
077c9d |
#define MAX_IFUNC 3
|
|
|
077c9d |
@@ -203,6 +204,18 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
|
|
|
077c9d |
)
|
|
|
077c9d |
#endif /* HAVE_STRCPY_IFUNC */
|
|
|
077c9d |
|
|
|
077c9d |
+#if HAVE_STPCPY_IFUNC
|
|
|
077c9d |
+ IFUNC_IMPL (i, name, stpcpy,
|
|
|
077c9d |
+# if HAVE_STPCPY_Z13
|
|
|
077c9d |
+ IFUNC_IMPL_ADD (array, i, stpcpy,
|
|
|
077c9d |
+ dl_hwcap & HWCAP_S390_VX, STPCPY_Z13)
|
|
|
077c9d |
+# endif
|
|
|
077c9d |
+# if HAVE_STPCPY_C
|
|
|
077c9d |
+ IFUNC_IMPL_ADD (array, i, stpcpy, 1, STPCPY_C)
|
|
|
077c9d |
+# endif
|
|
|
077c9d |
+ )
|
|
|
077c9d |
+#endif /* HAVE_STPCPY_IFUNC */
|
|
|
077c9d |
+
|
|
|
077c9d |
#ifdef HAVE_S390_VX_ASM_SUPPORT
|
|
|
077c9d |
|
|
|
077c9d |
# define IFUNC_VX_IMPL(FUNC) \
|
|
|
077c9d |
@@ -217,7 +230,6 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
|
|
|
077c9d |
|
|
|
077c9d |
IFUNC_VX_IMPL (wcscpy);
|
|
|
077c9d |
|
|
|
077c9d |
- IFUNC_VX_IMPL (stpcpy);
|
|
|
077c9d |
IFUNC_VX_IMPL (wcpcpy);
|
|
|
077c9d |
|
|
|
077c9d |
IFUNC_VX_IMPL (strncpy);
|
|
|
077c9d |
diff --git a/sysdeps/s390/multiarch/stpcpy-c.c b/sysdeps/s390/stpcpy-c.c
|
|
|
077c9d |
similarity index 74%
|
|
|
077c9d |
rename from sysdeps/s390/multiarch/stpcpy-c.c
|
|
|
077c9d |
rename to sysdeps/s390/stpcpy-c.c
|
|
|
077c9d |
index 4a1c3e5832c9b544..76ec88462717799c 100644
|
|
|
077c9d |
--- a/sysdeps/s390/multiarch/stpcpy-c.c
|
|
|
077c9d |
+++ b/sysdeps/s390/stpcpy-c.c
|
|
|
077c9d |
@@ -16,20 +16,25 @@
|
|
|
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 STPCPY __stpcpy_c
|
|
|
077c9d |
-# undef weak_alias
|
|
|
077c9d |
-# define weak_alias(a, b)
|
|
|
077c9d |
-# ifdef SHARED
|
|
|
077c9d |
-# undef libc_hidden_def
|
|
|
077c9d |
-# define libc_hidden_def(name) \
|
|
|
077c9d |
+#include <ifunc-stpcpy.h>
|
|
|
077c9d |
+
|
|
|
077c9d |
+#if HAVE_STPCPY_C
|
|
|
077c9d |
+# if HAVE_STPCPY_IFUNC
|
|
|
077c9d |
+# define STPCPY STPCPY_C
|
|
|
077c9d |
+
|
|
|
077c9d |
+# undef weak_alias
|
|
|
077c9d |
+# define weak_alias(a, b)
|
|
|
077c9d |
+
|
|
|
077c9d |
+# if defined SHARED && IS_IN (libc)
|
|
|
077c9d |
+# undef libc_hidden_def
|
|
|
077c9d |
+# define libc_hidden_def(name) \
|
|
|
077c9d |
__hidden_ver1 (__stpcpy_c, __GI___stpcpy, __stpcpy_c);
|
|
|
077c9d |
-# undef libc_hidden_builtin_def
|
|
|
077c9d |
-# define libc_hidden_builtin_def(name) \
|
|
|
077c9d |
+# undef libc_hidden_builtin_def
|
|
|
077c9d |
+# define libc_hidden_builtin_def(name) \
|
|
|
077c9d |
strong_alias (__stpcpy_c, __stpcpy_c_1); \
|
|
|
077c9d |
__hidden_ver1 (__stpcpy_c_1, __GI_stpcpy, __stpcpy_c_1);
|
|
|
077c9d |
-# endif /* SHARED */
|
|
|
077c9d |
-
|
|
|
077c9d |
+# endif
|
|
|
077c9d |
+# endif
|
|
|
077c9d |
|
|
|
077c9d |
# include <string/stpcpy.c>
|
|
|
077c9d |
-#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */
|
|
|
077c9d |
+#endif
|
|
|
077c9d |
diff --git a/sysdeps/s390/multiarch/stpcpy-vx.S b/sysdeps/s390/stpcpy-vx.S
|
|
|
077c9d |
similarity index 90%
|
|
|
077c9d |
rename from sysdeps/s390/multiarch/stpcpy-vx.S
|
|
|
077c9d |
rename to sysdeps/s390/stpcpy-vx.S
|
|
|
077c9d |
index 6c17def0fc35d60d..d2db02d0cd714d27 100644
|
|
|
077c9d |
--- a/sysdeps/s390/multiarch/stpcpy-vx.S
|
|
|
077c9d |
+++ b/sysdeps/s390/stpcpy-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-stpcpy.h>
|
|
|
077c9d |
+
|
|
|
077c9d |
+#if HAVE_STPCPY_Z13
|
|
|
077c9d |
|
|
|
077c9d |
# include "sysdep.h"
|
|
|
077c9d |
# include "asm-syntax.h"
|
|
|
077c9d |
@@ -36,7 +38,7 @@
|
|
|
077c9d |
-v17=index of zero
|
|
|
077c9d |
-v18=part of src
|
|
|
077c9d |
*/
|
|
|
077c9d |
-ENTRY(__stpcpy_vx)
|
|
|
077c9d |
+ENTRY(STPCPY_Z13)
|
|
|
077c9d |
.machine "z13"
|
|
|
077c9d |
.machinemode "zarch_nohighgprs"
|
|
|
077c9d |
|
|
|
077c9d |
@@ -100,5 +102,15 @@ ENTRY(__stpcpy_vx)
|
|
|
077c9d |
vstl %v16,%r5,0(%r2) /* Copy characters including zero. */
|
|
|
077c9d |
la %r2,0(%r5,%r2) /* Return pointer to zero. */
|
|
|
077c9d |
br %r14
|
|
|
077c9d |
-END(__stpcpy_vx)
|
|
|
077c9d |
-#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */
|
|
|
077c9d |
+END(STPCPY_Z13)
|
|
|
077c9d |
+
|
|
|
077c9d |
+# if ! HAVE_STPCPY_IFUNC
|
|
|
077c9d |
+strong_alias (STPCPY_Z13, __stpcpy)
|
|
|
077c9d |
+weak_alias (__stpcpy, stpcpy)
|
|
|
077c9d |
+# endif
|
|
|
077c9d |
+
|
|
|
077c9d |
+# if ! HAVE_STPCPY_C && defined SHARED && IS_IN (libc)
|
|
|
077c9d |
+strong_alias (STPCPY_Z13, __GI_stpcpy)
|
|
|
077c9d |
+strong_alias (STPCPY_Z13, __GI___stpcpy)
|
|
|
077c9d |
+# endif
|
|
|
077c9d |
+#endif
|
|
|
077c9d |
diff --git a/sysdeps/s390/multiarch/stpcpy.c b/sysdeps/s390/stpcpy.c
|
|
|
077c9d |
similarity index 74%
|
|
|
077c9d |
rename from sysdeps/s390/multiarch/stpcpy.c
|
|
|
077c9d |
rename to sysdeps/s390/stpcpy.c
|
|
|
077c9d |
index 654f9dfbef512e34..670604e2de3806b7 100644
|
|
|
077c9d |
--- a/sysdeps/s390/multiarch/stpcpy.c
|
|
|
077c9d |
+++ b/sysdeps/s390/stpcpy.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-stpcpy.h>
|
|
|
077c9d |
+
|
|
|
077c9d |
+#if HAVE_STPCPY_IFUNC
|
|
|
077c9d |
# define stpcpy __redirect_stpcpy
|
|
|
077c9d |
# define __stpcpy __redirect___stpcpy
|
|
|
077c9d |
/* Omit the stpcpy inline definitions because it would redefine stpcpy. */
|
|
|
077c9d |
@@ -27,9 +29,18 @@
|
|
|
077c9d |
# undef __stpcpy
|
|
|
077c9d |
# include <ifunc-resolve.h>
|
|
|
077c9d |
|
|
|
077c9d |
-s390_vx_libc_ifunc_redirected (__redirect___stpcpy, __stpcpy);
|
|
|
077c9d |
-weak_alias (__stpcpy, stpcpy)
|
|
|
077c9d |
+# if HAVE_STPCPY_C
|
|
|
077c9d |
+extern __typeof (__redirect_stpcpy) STPCPY_C attribute_hidden;
|
|
|
077c9d |
+# endif
|
|
|
077c9d |
|
|
|
077c9d |
-#else
|
|
|
077c9d |
-# include <string/stpcpy.c>
|
|
|
077c9d |
-#endif /* !(defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)) */
|
|
|
077c9d |
+# if HAVE_STPCPY_Z13
|
|
|
077c9d |
+extern __typeof (__redirect_stpcpy) STPCPY_Z13 attribute_hidden;
|
|
|
077c9d |
+# endif
|
|
|
077c9d |
+
|
|
|
077c9d |
+s390_libc_ifunc_expr (__redirect___stpcpy, __stpcpy,
|
|
|
077c9d |
+ (HAVE_STPCPY_Z13 && (hwcap & HWCAP_S390_VX))
|
|
|
077c9d |
+ ? STPCPY_Z13
|
|
|
077c9d |
+ : STPCPY_DEFAULT
|
|
|
077c9d |
+ )
|
|
|
077c9d |
+weak_alias (__stpcpy, stpcpy)
|
|
|
077c9d |
+#endif
|