|
 |
bdc76f |
commit 581a051c2e09a847332d4750f6132de0f0ad15b6
|
|
|
bdc76f |
Author: Stefan Liebler <stli@linux.ibm.com>
|
|
|
bdc76f |
Date: Tue Dec 18 13:57:16 2018 +0100
|
|
|
bdc76f |
|
|
|
bdc76f |
S390: Refactor memchr ifunc handling.
|
|
|
bdc76f |
|
|
|
bdc76f |
The ifunc handling for memchr 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 |
Note: The fallback s390-32/s390-64 ifunc variants with srst instruction
|
|
|
bdc76f |
are now moved to the unified memchr-z900.S file which can be used for
|
|
|
bdc76f |
31/64bit. The s390-32/s390-64 files multiarch/memchr.c and memchr.S
|
|
|
bdc76f |
are deleted.
|
|
|
bdc76f |
|
|
|
bdc76f |
ChangeLog:
|
|
|
bdc76f |
|
|
|
bdc76f |
* sysdeps/s390/multiarch/Makefile
|
|
|
bdc76f |
(sysdep_routines): Remove memchr variants.
|
|
|
bdc76f |
* sysdeps/s390/Makefile (sysdep_routines): Add memchr variants.
|
|
|
bdc76f |
* sysdeps/s390/multiarch/ifunc-impl-list.c
|
|
|
bdc76f |
(__libc_ifunc_impl_list): Refactor ifunc handling for memchr.
|
|
|
bdc76f |
* sysdeps/s390/multiarch/memchr-vx.S: Move to ...
|
|
|
bdc76f |
* sysdeps/s390/memchr-vx.S: ... here and adjust ifunc handling.
|
|
|
bdc76f |
* sysdeps/s390/multiarch/memchr.c: Move to ...
|
|
|
bdc76f |
* sysdeps/s390/memchr.c: ... here and adjust ifunc handling.
|
|
|
bdc76f |
* sysdeps/s390/ifunc-memchr.h: New file.
|
|
|
bdc76f |
* sysdeps/s390/s390-64/memchr.S: Move to ...
|
|
|
bdc76f |
* sysdeps/s390/memchr-z900.S: ... here and adjust to be usable
|
|
|
bdc76f |
for 31/64bit and ifunc handling.
|
|
|
bdc76f |
* sysdeps/s390/s390-32/multiarch/memchr.c: Delete file.
|
|
|
bdc76f |
* sysdeps/s390/s390-64/multiarch/memchr.c: Likewise.
|
|
|
bdc76f |
* sysdeps/s390/s390-32/memchr.S: Likewise.
|
|
|
bdc76f |
|
|
|
bdc76f |
diff --git a/sysdeps/s390/Makefile b/sysdeps/s390/Makefile
|
|
|
bdc76f |
index 092d55826fbd15a5..816b2fccdc75e4cf 100644
|
|
|
bdc76f |
--- a/sysdeps/s390/Makefile
|
|
|
bdc76f |
+++ b/sysdeps/s390/Makefile
|
|
|
bdc76f |
@@ -52,5 +52,6 @@ sysdep_routines += bzero memset memset-z900 \
|
|
|
bdc76f |
strrchr strrchr-vx strrchr-c \
|
|
|
bdc76f |
strspn strspn-vx strspn-c \
|
|
|
bdc76f |
strpbrk strpbrk-vx strpbrk-c \
|
|
|
bdc76f |
- strcspn strcspn-vx strcspn-c
|
|
|
bdc76f |
+ strcspn strcspn-vx strcspn-c \
|
|
|
bdc76f |
+ memchr memchr-vx memchr-z900
|
|
|
bdc76f |
endif
|
|
|
bdc76f |
diff --git a/sysdeps/s390/ifunc-memchr.h b/sysdeps/s390/ifunc-memchr.h
|
|
|
bdc76f |
new file mode 100644
|
|
|
bdc76f |
index 0000000000000000..5d1327b45353322b
|
|
|
bdc76f |
--- /dev/null
|
|
|
bdc76f |
+++ b/sysdeps/s390/ifunc-memchr.h
|
|
|
bdc76f |
@@ -0,0 +1,52 @@
|
|
|
bdc76f |
+/* memchr 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_MEMCHR_IFUNC 1
|
|
|
bdc76f |
+#else
|
|
|
bdc76f |
+# define HAVE_MEMCHR_IFUNC 0
|
|
|
bdc76f |
+#endif
|
|
|
bdc76f |
+
|
|
|
bdc76f |
+#ifdef HAVE_S390_VX_ASM_SUPPORT
|
|
|
bdc76f |
+# define HAVE_MEMCHR_IFUNC_AND_VX_SUPPORT HAVE_MEMCHR_IFUNC
|
|
|
bdc76f |
+#else
|
|
|
bdc76f |
+# define HAVE_MEMCHR_IFUNC_AND_VX_SUPPORT 0
|
|
|
bdc76f |
+#endif
|
|
|
bdc76f |
+
|
|
|
bdc76f |
+#if defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT
|
|
|
bdc76f |
+# define MEMCHR_DEFAULT MEMCHR_Z13
|
|
|
bdc76f |
+# define HAVE_MEMCHR_Z900_G5 0
|
|
|
bdc76f |
+# define HAVE_MEMCHR_Z13 1
|
|
|
bdc76f |
+#else
|
|
|
bdc76f |
+# define MEMCHR_DEFAULT MEMCHR_Z900_G5
|
|
|
bdc76f |
+# define HAVE_MEMCHR_Z900_G5 1
|
|
|
bdc76f |
+# define HAVE_MEMCHR_Z13 HAVE_MEMCHR_IFUNC_AND_VX_SUPPORT
|
|
|
bdc76f |
+#endif
|
|
|
bdc76f |
+
|
|
|
bdc76f |
+#if HAVE_MEMCHR_Z900_G5
|
|
|
bdc76f |
+# define MEMCHR_Z900_G5 __memchr_default
|
|
|
bdc76f |
+#else
|
|
|
bdc76f |
+# define MEMCHR_Z900_G5 NULL
|
|
|
bdc76f |
+#endif
|
|
|
bdc76f |
+
|
|
|
bdc76f |
+#if HAVE_MEMCHR_Z13
|
|
|
bdc76f |
+# define MEMCHR_Z13 __memchr_vx
|
|
|
bdc76f |
+#else
|
|
|
bdc76f |
+# define MEMCHR_Z13 NULL
|
|
|
bdc76f |
+#endif
|
|
|
bdc76f |
diff --git a/sysdeps/s390/multiarch/memchr-vx.S b/sysdeps/s390/memchr-vx.S
|
|
|
bdc76f |
similarity index 92%
|
|
|
bdc76f |
rename from sysdeps/s390/multiarch/memchr-vx.S
|
|
|
bdc76f |
rename to sysdeps/s390/memchr-vx.S
|
|
|
bdc76f |
index 77d31e0036915665..274e7971ca7e9413 100644
|
|
|
bdc76f |
--- a/sysdeps/s390/multiarch/memchr-vx.S
|
|
|
bdc76f |
+++ b/sysdeps/s390/memchr-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-memchr.h>
|
|
|
bdc76f |
+#if HAVE_MEMCHR_Z13
|
|
|
bdc76f |
|
|
|
bdc76f |
# include "sysdep.h"
|
|
|
bdc76f |
# include "asm-syntax.h"
|
|
|
bdc76f |
@@ -38,7 +39,7 @@
|
|
|
bdc76f |
-v17=index of found c
|
|
|
bdc76f |
-v18=c replicated
|
|
|
bdc76f |
*/
|
|
|
bdc76f |
-ENTRY(__memchr_vx)
|
|
|
bdc76f |
+ENTRY(MEMCHR_Z13)
|
|
|
bdc76f |
|
|
|
bdc76f |
.machine "z13"
|
|
|
bdc76f |
.machinemode "zarch_nohighgprs"
|
|
|
bdc76f |
@@ -149,11 +150,14 @@ ENTRY(__memchr_vx)
|
|
|
bdc76f |
clgrjl %r0,%r4,.Lloop64
|
|
|
bdc76f |
|
|
|
bdc76f |
j .Llt64
|
|
|
bdc76f |
-END(__memchr_vx)
|
|
|
bdc76f |
+END(MEMCHR_Z13)
|
|
|
bdc76f |
|
|
|
bdc76f |
-# define memchr __memchr_c
|
|
|
bdc76f |
-# undef libc_hidden_builtin_def
|
|
|
bdc76f |
-# define libc_hidden_builtin_def(name) strong_alias(__memchr_c, __GI_memchr)
|
|
|
bdc76f |
-#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */
|
|
|
bdc76f |
+# if ! HAVE_MEMCHR_IFUNC
|
|
|
bdc76f |
+strong_alias (MEMCHR_Z13, __memchr)
|
|
|
bdc76f |
+weak_alias (__memchr, memchr)
|
|
|
bdc76f |
+# endif
|
|
|
bdc76f |
|
|
|
bdc76f |
-#include <memchr.S>
|
|
|
bdc76f |
+# if ! HAVE_MEMCHR_Z900_G5 && defined SHARED && IS_IN (libc)
|
|
|
bdc76f |
+strong_alias (MEMCHR_Z13, __GI_memchr)
|
|
|
bdc76f |
+# endif
|
|
|
bdc76f |
+#endif
|
|
|
bdc76f |
diff --git a/sysdeps/s390/s390-64/memchr.S b/sysdeps/s390/memchr-z900.S
|
|
|
bdc76f |
similarity index 63%
|
|
|
bdc76f |
rename from sysdeps/s390/s390-64/memchr.S
|
|
|
bdc76f |
rename to sysdeps/s390/memchr-z900.S
|
|
|
bdc76f |
index a19fcafa147dc338..c016bc41c61be2dc 100644
|
|
|
bdc76f |
--- a/sysdeps/s390/s390-64/memchr.S
|
|
|
bdc76f |
+++ b/sysdeps/s390/memchr-z900.S
|
|
|
bdc76f |
@@ -1,4 +1,4 @@
|
|
|
bdc76f |
-/* Search a character in a block of memory. 64 bit S/390 version.
|
|
|
bdc76f |
+/* Search a character in a block of memory. 31/64 bit S/390 version.
|
|
|
bdc76f |
Copyright (C) 2001-2018 Free Software Foundation, Inc.
|
|
|
bdc76f |
Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com).
|
|
|
bdc76f |
This file is part of the GNU C Library.
|
|
|
bdc76f |
@@ -22,19 +22,42 @@
|
|
|
bdc76f |
%r3 = character to find
|
|
|
bdc76f |
%r4 = number of bytes to search. */
|
|
|
bdc76f |
|
|
|
bdc76f |
+#include <ifunc-memchr.h>
|
|
|
bdc76f |
#include "sysdep.h"
|
|
|
bdc76f |
#include "asm-syntax.h"
|
|
|
bdc76f |
|
|
|
bdc76f |
+#if HAVE_MEMCHR_Z900_G5
|
|
|
bdc76f |
+# if defined __s390x__
|
|
|
bdc76f |
+# define SLGR slgr
|
|
|
bdc76f |
+# define LGHI lghi
|
|
|
bdc76f |
+# define NGR ngr
|
|
|
bdc76f |
+# define LGR lgr
|
|
|
bdc76f |
+# else
|
|
|
bdc76f |
+# define SLGR slr
|
|
|
bdc76f |
+# define LGHI lhi
|
|
|
bdc76f |
+# define NGR nr
|
|
|
bdc76f |
+# define LGR lr
|
|
|
bdc76f |
+# endif /* ! defined __s390x__ */
|
|
|
bdc76f |
+
|
|
|
bdc76f |
.text
|
|
|
bdc76f |
-ENTRY(memchr)
|
|
|
bdc76f |
- lghi %r0,0xff
|
|
|
bdc76f |
- ngr %r0,%r3
|
|
|
bdc76f |
- lgr %r1,%r2
|
|
|
bdc76f |
+ENTRY(MEMCHR_Z900_G5)
|
|
|
bdc76f |
+ LGHI %r0,0xff
|
|
|
bdc76f |
+ NGR %r0,%r3
|
|
|
bdc76f |
+ LGR %r1,%r2
|
|
|
bdc76f |
la %r2,0(%r4,%r1)
|
|
|
bdc76f |
0: srst %r2,%r1
|
|
|
bdc76f |
jo 0b
|
|
|
bdc76f |
brc 13,1f
|
|
|
bdc76f |
- slgr %r2,%r2
|
|
|
bdc76f |
+ SLGR %r2,%r2
|
|
|
bdc76f |
1: br %r14
|
|
|
bdc76f |
-END(memchr)
|
|
|
bdc76f |
-libc_hidden_builtin_def (memchr)
|
|
|
bdc76f |
+END(MEMCHR_Z900_G5)
|
|
|
bdc76f |
+
|
|
|
bdc76f |
+# if ! HAVE_MEMCHR_IFUNC
|
|
|
bdc76f |
+strong_alias (MEMCHR_Z900_G5, __memchr)
|
|
|
bdc76f |
+weak_alias (__memchr, memchr)
|
|
|
bdc76f |
+# endif
|
|
|
bdc76f |
+
|
|
|
bdc76f |
+# if defined SHARED && IS_IN (libc)
|
|
|
bdc76f |
+strong_alias (MEMCHR_Z900_G5, __GI_memchr)
|
|
|
bdc76f |
+# endif
|
|
|
bdc76f |
+#endif
|
|
|
bdc76f |
diff --git a/sysdeps/s390/multiarch/memchr.c b/sysdeps/s390/memchr.c
|
|
|
bdc76f |
similarity index 68%
|
|
|
bdc76f |
rename from sysdeps/s390/multiarch/memchr.c
|
|
|
bdc76f |
rename to sysdeps/s390/memchr.c
|
|
|
bdc76f |
index 3885ebaa4d90ed1a..490f1b66002aae05 100644
|
|
|
bdc76f |
--- a/sysdeps/s390/multiarch/memchr.c
|
|
|
bdc76f |
+++ b/sysdeps/s390/memchr.c
|
|
|
bdc76f |
@@ -16,12 +16,26 @@
|
|
|
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-memchr.h>
|
|
|
bdc76f |
+
|
|
|
bdc76f |
+#if HAVE_MEMCHR_IFUNC
|
|
|
bdc76f |
# define memchr __redirect_memchr
|
|
|
bdc76f |
# include <string.h>
|
|
|
bdc76f |
# undef memchr
|
|
|
bdc76f |
# include <ifunc-resolve.h>
|
|
|
bdc76f |
|
|
|
bdc76f |
-s390_vx_libc_ifunc2_redirected (__redirect_memchr, __memchr, memchr)
|
|
|
bdc76f |
+# if HAVE_MEMCHR_Z900_G5
|
|
|
bdc76f |
+extern __typeof (__redirect_memchr) MEMCHR_Z900_G5 attribute_hidden;
|
|
|
bdc76f |
+# endif
|
|
|
bdc76f |
+
|
|
|
bdc76f |
+# if HAVE_MEMCHR_Z13
|
|
|
bdc76f |
+extern __typeof (__redirect_memchr) MEMCHR_Z13 attribute_hidden;
|
|
|
bdc76f |
+# endif
|
|
|
bdc76f |
|
|
|
bdc76f |
+s390_libc_ifunc_expr (__redirect_memchr, __memchr,
|
|
|
bdc76f |
+ (HAVE_MEMCHR_Z13 && (hwcap & HWCAP_S390_VX))
|
|
|
bdc76f |
+ ? MEMCHR_Z13
|
|
|
bdc76f |
+ : MEMCHR_DEFAULT
|
|
|
bdc76f |
+ )
|
|
|
bdc76f |
+weak_alias (__memchr, memchr)
|
|
|
bdc76f |
#endif
|
|
|
bdc76f |
diff --git a/sysdeps/s390/multiarch/Makefile b/sysdeps/s390/multiarch/Makefile
|
|
|
bdc76f |
index 1578f21af4a1bd06..fa1f7b81db912be0 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 += memchr memchr-vx \
|
|
|
bdc76f |
- rawmemchr rawmemchr-vx rawmemchr-c \
|
|
|
bdc76f |
+sysdep_routines += rawmemchr rawmemchr-vx rawmemchr-c \
|
|
|
bdc76f |
memccpy memccpy-vx memccpy-c \
|
|
|
bdc76f |
memrchr memrchr-vx memrchr-c
|
|
|
bdc76f |
endif
|
|
|
bdc76f |
diff --git a/sysdeps/s390/multiarch/ifunc-impl-list.c b/sysdeps/s390/multiarch/ifunc-impl-list.c
|
|
|
bdc76f |
index 2d48c99c8d5663fe..b4be0140424aed69 100644
|
|
|
bdc76f |
--- a/sysdeps/s390/multiarch/ifunc-impl-list.c
|
|
|
bdc76f |
+++ b/sysdeps/s390/multiarch/ifunc-impl-list.c
|
|
|
bdc76f |
@@ -42,6 +42,7 @@
|
|
|
bdc76f |
#include <ifunc-strspn.h>
|
|
|
bdc76f |
#include <ifunc-strpbrk.h>
|
|
|
bdc76f |
#include <ifunc-strcspn.h>
|
|
|
bdc76f |
+#include <ifunc-memchr.h>
|
|
|
bdc76f |
|
|
|
bdc76f |
/* Maximum number of IFUNC implementations. */
|
|
|
bdc76f |
#define MAX_IFUNC 3
|
|
|
bdc76f |
@@ -372,6 +373,18 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
|
|
|
bdc76f |
)
|
|
|
bdc76f |
#endif /* HAVE_STRCSPN_IFUNC */
|
|
|
bdc76f |
|
|
|
bdc76f |
+#if HAVE_MEMCHR_IFUNC
|
|
|
bdc76f |
+ IFUNC_IMPL (i, name, memchr,
|
|
|
bdc76f |
+# if HAVE_MEMCHR_Z13
|
|
|
bdc76f |
+ IFUNC_IMPL_ADD (array, i, memchr,
|
|
|
bdc76f |
+ dl_hwcap & HWCAP_S390_VX, MEMCHR_Z13)
|
|
|
bdc76f |
+# endif
|
|
|
bdc76f |
+# if HAVE_MEMCHR_Z900_G5
|
|
|
bdc76f |
+ IFUNC_IMPL_ADD (array, i, memchr, 1, MEMCHR_Z900_G5)
|
|
|
bdc76f |
+# endif
|
|
|
bdc76f |
+ )
|
|
|
bdc76f |
+#endif /* HAVE_MEMCHR_IFUNC */
|
|
|
bdc76f |
+
|
|
|
bdc76f |
#ifdef HAVE_S390_VX_ASM_SUPPORT
|
|
|
bdc76f |
|
|
|
bdc76f |
# define IFUNC_VX_IMPL(FUNC) \
|
|
|
bdc76f |
@@ -412,7 +425,6 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
|
|
|
bdc76f |
|
|
|
bdc76f |
IFUNC_VX_IMPL (wcscspn);
|
|
|
bdc76f |
|
|
|
bdc76f |
- IFUNC_VX_IMPL (memchr);
|
|
|
bdc76f |
IFUNC_VX_IMPL (wmemchr);
|
|
|
bdc76f |
IFUNC_VX_IMPL (rawmemchr);
|
|
|
bdc76f |
|
|
|
bdc76f |
diff --git a/sysdeps/s390/s390-32/memchr.S b/sysdeps/s390/s390-32/memchr.S
|
|
|
bdc76f |
deleted file mode 100644
|
|
|
bdc76f |
index 54f9b85f578fa1c7..0000000000000000
|
|
|
bdc76f |
--- a/sysdeps/s390/s390-32/memchr.S
|
|
|
bdc76f |
+++ /dev/null
|
|
|
bdc76f |
@@ -1,41 +0,0 @@
|
|
|
bdc76f |
-/* Search a character in a block of memory. For IBM S390
|
|
|
bdc76f |
- Copyright (C) 2000-2018 Free Software Foundation, Inc.
|
|
|
bdc76f |
- This file is part of the GNU C Library.
|
|
|
bdc76f |
- Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com).
|
|
|
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 |
-/*
|
|
|
bdc76f |
- * R2 = address to memory area
|
|
|
bdc76f |
- * R3 = character to find
|
|
|
bdc76f |
- * R4 = number of bytes to search
|
|
|
bdc76f |
- */
|
|
|
bdc76f |
-
|
|
|
bdc76f |
-#include "sysdep.h"
|
|
|
bdc76f |
-#include "asm-syntax.h"
|
|
|
bdc76f |
-
|
|
|
bdc76f |
- .text
|
|
|
bdc76f |
-ENTRY(memchr)
|
|
|
bdc76f |
- lhi %r0,0xff
|
|
|
bdc76f |
- nr %r0,%r3
|
|
|
bdc76f |
- lr %r1,%r2
|
|
|
bdc76f |
- la %r2,0(%r4,%r1)
|
|
|
bdc76f |
-0: srst %r2,%r1
|
|
|
bdc76f |
- jo 0b
|
|
|
bdc76f |
- brc 13,1f
|
|
|
bdc76f |
- slr %r2,%r2
|
|
|
bdc76f |
-1: br %r14
|
|
|
bdc76f |
-END(memchr)
|
|
|
bdc76f |
-libc_hidden_builtin_def (memchr)
|
|
|
bdc76f |
diff --git a/sysdeps/s390/s390-32/multiarch/memchr.c b/sysdeps/s390/s390-32/multiarch/memchr.c
|
|
|
bdc76f |
deleted file mode 100644
|
|
|
bdc76f |
index 5e1610afa43ee549..0000000000000000
|
|
|
bdc76f |
--- a/sysdeps/s390/s390-32/multiarch/memchr.c
|
|
|
bdc76f |
+++ /dev/null
|
|
|
bdc76f |
@@ -1,21 +0,0 @@
|
|
|
bdc76f |
-/* Multiple versions of memchr.
|
|
|
bdc76f |
- Copyright (C) 2015-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 |
-/* This wrapper-file is needed, because otherwise file
|
|
|
bdc76f |
- sysdeps/s390/s390-[32|64]/memchr.S will be used. */
|
|
|
bdc76f |
-#include <sysdeps/s390/multiarch/memchr.c>
|
|
|
bdc76f |
diff --git a/sysdeps/s390/s390-64/multiarch/memchr.c b/sysdeps/s390/s390-64/multiarch/memchr.c
|
|
|
bdc76f |
deleted file mode 100644
|
|
|
bdc76f |
index 5e1610afa43ee549..0000000000000000
|
|
|
bdc76f |
--- a/sysdeps/s390/s390-64/multiarch/memchr.c
|
|
|
bdc76f |
+++ /dev/null
|
|
|
bdc76f |
@@ -1,21 +0,0 @@
|
|
|
bdc76f |
-/* Multiple versions of memchr.
|
|
|
bdc76f |
- Copyright (C) 2015-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 |
-/* This wrapper-file is needed, because otherwise file
|
|
|
bdc76f |
- sysdeps/s390/s390-[32|64]/memchr.S will be used. */
|
|
|
bdc76f |
-#include <sysdeps/s390/multiarch/memchr.c>
|