+2018-12-18 Stefan Liebler <stli@linux.ibm.com>
+
+ * sysdeps/s390/multiarch/Makefile
+ (sysdep_routines): Remove strchr variants.
+ * sysdeps/s390/Makefile (sysdep_routines): Add strchr variants.
+ * sysdeps/s390/multiarch/ifunc-impl-list.c
+ (__libc_ifunc_impl_list): Refactor ifunc handling for strchr.
+ * sysdeps/s390/multiarch/strchr-c.c: Move to ...
+ * sysdeps/s390/strchr-c.c: ... here and adjust ifunc handling.
+ * sysdeps/s390/multiarch/strchr-vx.S: Move to ...
+ * sysdeps/s390/strchr-vx.S: ... here and adjust ifunc handling.
+ * sysdeps/s390/multiarch/strchr.c: Move to ...
+ * sysdeps/s390/strchr.c: ... here and adjust ifunc handling.
+ * sysdeps/s390/ifunc-strchr.h: New file.
+
2018-12-18 Stefan Liebler <stli@linux.ibm.com>
* sysdeps/s390/multiarch/Makefile
strcat strcat-vx strcat-c \
strncat strncat-vx strncat-c \
strcmp strcmp-vx strcmp-z900 \
- strncmp strncmp-vx strncmp-c
+ strncmp strncmp-vx strncmp-c \
+ strchr strchr-vx strchr-c
endif
--- /dev/null
+/* strchr variant information on S/390 version.
+ Copyright (C) 2018 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+#if defined USE_MULTIARCH && IS_IN (libc) \
+ && ! defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT
+# define HAVE_STRCHR_IFUNC 1
+#else
+# define HAVE_STRCHR_IFUNC 0
+#endif
+
+#ifdef HAVE_S390_VX_ASM_SUPPORT
+# define HAVE_STRCHR_IFUNC_AND_VX_SUPPORT HAVE_STRCHR_IFUNC
+#else
+# define HAVE_STRCHR_IFUNC_AND_VX_SUPPORT 0
+#endif
+
+#if defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT
+# define STRCHR_DEFAULT STRCHR_Z13
+# define HAVE_STRCHR_C 0
+# define HAVE_STRCHR_Z13 1
+#else
+# define STRCHR_DEFAULT STRCHR_C
+# define HAVE_STRCHR_C 1
+# define HAVE_STRCHR_Z13 HAVE_STRCHR_IFUNC_AND_VX_SUPPORT
+#endif
+
+#if HAVE_STRCHR_C
+# define STRCHR_C __strchr_c
+#else
+# define STRCHR_C NULL
+#endif
+
+#if HAVE_STRCHR_Z13
+# define STRCHR_Z13 __strchr_vx
+#else
+# define STRCHR_Z13 NULL
+#endif
ifeq ($(subdir),string)
-sysdep_routines += strchr strchr-vx strchr-c \
- strchrnul strchrnul-vx strchrnul-c \
+sysdep_routines += strchrnul strchrnul-vx strchrnul-c \
strrchr strrchr-vx strrchr-c \
strspn strspn-vx strspn-c \
strpbrk strpbrk-vx strpbrk-c \
#include <ifunc-strncat.h>
#include <ifunc-strcmp.h>
#include <ifunc-strncmp.h>
+#include <ifunc-strchr.h>
/* Maximum number of IFUNC implementations. */
#define MAX_IFUNC 3
)
#endif /* HAVE_STRNCMP_IFUNC */
+#if HAVE_STRCHR_IFUNC
+ IFUNC_IMPL (i, name, strchr,
+# if HAVE_STRCHR_Z13
+ IFUNC_IMPL_ADD (array, i, strchr,
+ dl_hwcap & HWCAP_S390_VX, STRCHR_Z13)
+# endif
+# if HAVE_STRCHR_C
+ IFUNC_IMPL_ADD (array, i, strchr, 1, STRCHR_C)
+# endif
+ )
+#endif /* HAVE_STRCHR_IFUNC */
+
#ifdef HAVE_S390_VX_ASM_SUPPORT
# define IFUNC_VX_IMPL(FUNC) \
IFUNC_VX_IMPL (wcsncmp);
- IFUNC_VX_IMPL (strchr);
IFUNC_VX_IMPL (wcschr);
IFUNC_VX_IMPL (strchrnul);
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)
-# define STRCHR __strchr_c
-# undef weak_alias
-# ifdef SHARED
-# undef libc_hidden_builtin_def
-# define libc_hidden_builtin_def(name) \
+#include <ifunc-strchr.h>
+
+#if HAVE_STRCHR_C
+# if HAVE_STRCHR_IFUNC
+# define STRCHR STRCHR_C
+# undef weak_alias
+# if defined SHARED && IS_IN (libc)
+# undef libc_hidden_builtin_def
+# define libc_hidden_builtin_def(name) \
__hidden_ver1 (__strchr_c, __GI_strchr, __strchr_c);
-# endif /* SHARED */
+# endif
+# endif
# include <string/strchr.c>
-#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */
+#endif
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)
+#include <ifunc-strchr.h>
+
+#if HAVE_STRCHR_Z13
# include "sysdep.h"
# include "asm-syntax.h"
-v17=index of unequal
-v18=replicated c
*/
-ENTRY(__strchr_vx)
+ENTRY(STRCHR_Z13)
.machine "z13"
.machinemode "zarch_nohighgprs"
clije %r3,0,.Lcharacter /* Found zero and c is zero. */
lghi %r2,0 /* Return null if character not found. */
br %r14
-END(__strchr_vx)
-#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */
+END(STRCHR_Z13)
+
+# if ! HAVE_STRCHR_IFUNC
+strong_alias (STRCHR_Z13, strchr)
+weak_alias (strchr, index)
+# endif
+
+# if ! HAVE_STRCHR_C && defined SHARED && IS_IN (libc)
+strong_alias (STRCHR_Z13, __GI_strchr)
+# endif
+
+#endif /* HAVE_STRCHR_Z13 */
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)
+#include <ifunc-strchr.h>
+
+#if HAVE_STRCHR_IFUNC
# define strchr __redirect_strchr
/* Omit the strchr inline definitions because it would redefine strchr. */
# define __NO_STRING_INLINES
# undef strchr
# include <ifunc-resolve.h>
-s390_vx_libc_ifunc2_redirected (__redirect_strchr, __strchr, strchr)
-weak_alias (strchr, index)
+# if HAVE_STRCHR_C
+extern __typeof (__redirect_strchr) STRCHR_C attribute_hidden;
+# endif
-#else
-# include <string/strchr.c>
-#endif /* !(defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)) */
+# if HAVE_STRCHR_Z13
+extern __typeof (__redirect_strchr) STRCHR_Z13 attribute_hidden;
+# endif
+
+s390_libc_ifunc_expr (__redirect_strchr, strchr,
+ (HAVE_STRCHR_Z13 && (hwcap & HWCAP_S390_VX))
+ ? STRCHR_Z13
+ : STRCHR_DEFAULT
+ )
+weak_alias (strchr, index)
+#endif /* HAVE_STRCHR_IFUNC */
git://sourceware.org / glibc.git / commitdiff