diff --git a/sysdeps/s390/Makefile b/sysdeps/s390/Makefile
index da96ac3..fdfd1c6 100644
--- a/sysdeps/s390/Makefile
+++ b/sysdeps/s390/Makefile
@@ -75,5 +75,6 @@ sysdep_routines += wcslen wcslen-vx wcslen-c \
wcsrchr wcsrchr-vx wcsrchr-c \
wcsspn wcsspn-vx wcsspn-c \
wcspbrk wcspbrk-vx wcspbrk-c \
- wcscspn wcscspn-vx wcscspn-c
+ wcscspn wcscspn-vx wcscspn-c \
+ wmemchr wmemchr-vx wmemchr-c
endif
diff --git a/sysdeps/s390/ifunc-wmemchr.h b/sysdeps/s390/ifunc-wmemchr.h
new file mode 100644
index 0000000..0610cfb
--- /dev/null
+++ b/sysdeps/s390/ifunc-wmemchr.h
@@ -0,0 +1,53 @@
+/* wmemchr 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
+ . */
+
+#if defined USE_MULTIARCH && IS_IN (libc) \
+ && ! defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT
+# define HAVE_WMEMCHR_IFUNC 1
+#else
+# define HAVE_WMEMCHR_IFUNC 0
+#endif
+
+#ifdef HAVE_S390_VX_ASM_SUPPORT
+# define HAVE_WMEMCHR_IFUNC_AND_VX_SUPPORT HAVE_WMEMCHR_IFUNC
+#else
+# define HAVE_WMEMCHR_IFUNC_AND_VX_SUPPORT 0
+#endif
+
+#if defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT
+# define WMEMCHR_DEFAULT WMEMCHR_Z13
+/* The z13 ifunc variant is using the common code variant as fallback! */
+# define HAVE_WMEMCHR_C 1
+# define HAVE_WMEMCHR_Z13 1
+#else
+# define WMEMCHR_DEFAULT WMEMCHR_C
+# define HAVE_WMEMCHR_C 1
+# define HAVE_WMEMCHR_Z13 HAVE_WMEMCHR_IFUNC_AND_VX_SUPPORT
+#endif
+
+#if HAVE_WMEMCHR_C
+# define WMEMCHR_C __wmemchr_c
+#else
+# define WMEMCHR_C NULL
+#endif
+
+#if HAVE_WMEMCHR_Z13
+# define WMEMCHR_Z13 __wmemchr_vx
+#else
+# define WMEMCHR_Z13 NULL
+#endif
diff --git a/sysdeps/s390/multiarch/Makefile b/sysdeps/s390/multiarch/Makefile
index 5be6355..92e28dc 100644
--- a/sysdeps/s390/multiarch/Makefile
+++ b/sysdeps/s390/multiarch/Makefile
@@ -1,6 +1,5 @@
ifeq ($(subdir),wcsmbs)
-sysdep_routines += wmemchr wmemchr-vx wmemchr-c \
- wmemset wmemset-vx wmemset-c \
+sysdep_routines += wmemset wmemset-vx wmemset-c \
wmemcmp wmemcmp-vx wmemcmp-c
endif
diff --git a/sysdeps/s390/multiarch/ifunc-impl-list.c b/sysdeps/s390/multiarch/ifunc-impl-list.c
index 7d8031a..b5f55de 100644
--- a/sysdeps/s390/multiarch/ifunc-impl-list.c
+++ b/sysdeps/s390/multiarch/ifunc-impl-list.c
@@ -62,6 +62,7 @@
#include
#include
#include
+#include
/* Maximum number of IFUNC implementations. */
#define MAX_IFUNC 3
@@ -632,6 +633,18 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
)
#endif /* HAVE_WCSCSPN_IFUNC */
+#if HAVE_WMEMCHR_IFUNC
+ IFUNC_IMPL (i, name, wmemchr,
+# if HAVE_WMEMCHR_Z13
+ IFUNC_IMPL_ADD (array, i, wmemchr,
+ dl_hwcap & HWCAP_S390_VX, WMEMCHR_Z13)
+# endif
+# if HAVE_WMEMCHR_C
+ IFUNC_IMPL_ADD (array, i, wmemchr, 1, WMEMCHR_C)
+# endif
+ )
+#endif /* HAVE_WMEMCHR_IFUNC */
+
#ifdef HAVE_S390_VX_ASM_SUPPORT
# define IFUNC_VX_IMPL(FUNC) \
@@ -640,8 +653,6 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
__##FUNC##_vx) \
IFUNC_IMPL_ADD (array, i, FUNC, 1, __##FUNC##_c))
- IFUNC_VX_IMPL (wmemchr);
-
IFUNC_VX_IMPL (wmemset);
IFUNC_VX_IMPL (wmemcmp);
diff --git a/sysdeps/s390/multiarch/wmemchr-c.c b/sysdeps/s390/multiarch/wmemchr-c.c
deleted file mode 100644
index 089392b..0000000
--- a/sysdeps/s390/multiarch/wmemchr-c.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Default wmemchr implementation for S/390.
- Copyright (C) 2015-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
- . */
-
-#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)
-# define WMEMCHR __wmemchr_c
-
-# include
-extern __typeof (wmemchr) __wmemchr_c;
-# undef weak_alias
-# define weak_alias(name, alias)
-# ifdef SHARED
-# undef libc_hidden_def
-# define libc_hidden_def(name) \
- __hidden_ver1 (__wmemchr_c, __GI___wmemchr, __wmemchr_c);
-# undef libc_hidden_weak
-# define libc_hidden_weak(name) \
- strong_alias (__wmemchr_c, __wmemchr_c_1); \
- __hidden_ver1 (__wmemchr_c_1, __GI_wmemchr, __wmemchr_c_1);
-# endif /* SHARED */
-
-# include
-#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */
diff --git a/sysdeps/s390/multiarch/wmemchr-vx.S b/sysdeps/s390/multiarch/wmemchr-vx.S
deleted file mode 100644
index db057b5..0000000
--- a/sysdeps/s390/multiarch/wmemchr-vx.S
+++ /dev/null
@@ -1,166 +0,0 @@
-/* Vector optimized 32/64 bit S/390 version of wmemchr.
- Copyright (C) 2015-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
- . */
-
-#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)
-
-# include "sysdep.h"
-# include "asm-syntax.h"
-
- .text
-
-/* wchar_t *wmemchr (const wchar_t *s, wchar_t c, size_t n)
- Scans memory for character c
- and returns pointer to first c.
-
- Register usage:
- -r0=tmp
- -r1=tmp
- -r2=s
- -r3=c
- -r4=n
- -r5=current_len
- -v16=part of s
- -v17=index of found c
- -v18=c replicated
-*/
-ENTRY(__wmemchr_vx)
- .machine "z13"
- .machinemode "zarch_nohighgprs"
-
-# if !defined __s390x__
- llgfr %r4,%r4
-# endif /* !defined __s390x__ */
-
- clgije %r4,0,.Lnf_end /* If len == 0 then exit. */
-
- vlbb %v16,0(%r2),6 /* Load s until next 4k-byte boundary. */
- lcbb %r0,0(%r2),6 /* Get bytes to 4k-byte boundary or 16. */
- llgfr %r0,%r0 /* Convert 32bit to 64bit. */
-
- tmll %r2,3 /* Test if s is 4-byte aligned? */
- jne .Lfallback /* And use common-code variant if not. */
-
- vlvgf %v18,%r3,0 /* Generate vector which elements are all c. */
- vrepf %v18,%v18,0
- lghi %r5,16 /* current_len = 16. */
-
- /* Check range of maxlen and convert to byte-count. */
-# ifdef __s390x__
- tmhh %r4,49152 /* Test bit 0 or 1 of maxlen. */
- lghi %r1,-4 /* Max byte-count is 18446744073709551612. */
-# else
- tmlh %r4,49152 /* Test bit 0 or 1 of maxlen. */
- llilf %r1,4294967292 /* Max byte-count is 4294967292. */
-# endif /* !__s390x__ */
- sllg %r4,%r4,2 /* Convert character-count to byte-count. */
- locgrne %r4,%r1 /* Use max byte-count, if bit 0/1 was one. */
-
- clgrjhe %r0,%r4,.Llastcmp /* If (bytes to boundary) >= n,
- jump to lastcmp. */
-
- vfeefs %v17,%v16,%v18 /* Find c. */
- vlgvb %r1,%v17,7 /* Load byte index of c. */
- clgrjl %r1,%r0,.Lfound2 /* Found c is within loaded bytes. */
-
- /* Align s to 16 byte. */
- risbgn %r1,%r2,60,128+63,0 /* %r3 = bits 60-63 of %r2 'and' 15. */
- slr %r5,%r1 /* Compute bytes to 16bytes boundary. */
-
- lgr %r0,%r5 /* If %r5 + 64 < n? -> loop64. */
- aghi %r0,64
- clgrjl %r0,%r4,.Lloop64
-.Llt64:
- vl %v16,0(%r5,%r2)
- aghi %r5,16
- clgrjhe %r5,%r4,.Llastcmp /* Do last compare if curr-len >= n. */
- vfeefs %v17,%v16,%v18 /* Find c. */
- jl .Lfound /* Jump away if c was found. */
-
- vl %v16,0(%r5,%r2)
- aghi %r5,16
- clgrjhe %r5,%r4,.Llastcmp
- vfeefs %v17,%v16,%v18
- jl .Lfound
-
- vl %v16,0(%r5,%r2)
- aghi %r5,16
- clgrjhe %r5,%r4,.Llastcmp
- vfeefs %v17,%v16,%v18
- jl .Lfound
-
- vl %v16,0(%r5,%r2)
- aghi %r5,16
-
-.Llastcmp:
- /* Use comparision result only if located within first n characters.
- %r5: current_len;
- %r4: n;
- (current_len - n): [0...16[
- first ignored match index = vr-width - (current_len - n) ]0...16]
- */
- vfeefs %v17,%v16,%v18 /* Find c. */
- slgrk %r4,%r5,%r4 /* %r5 = current_len - n. */
- lghi %r0,16 /* Register width = 16. */
- vlgvb %r1,%v17,7 /* Extract found index or 16 if all equal. */
- slr %r0,%r4 /* %r0 = first ignored match index. */
- clrjl %r1,%r0,.Lfound2 /* Go away if miscompare is below n bytes. */
- /* c not found within n-bytes. */
-.Lnf_end:
- lghi %r2,0 /* Return null. */
- br %r14
-
-.Lfound48:
- aghi %r5,16
-.Lfound32:
- aghi %r5,16
-.Lfound16:
- aghi %r5,16
-.Lfound0:
- aghi %r5,16
-.Lfound:
- vlgvb %r1,%v17,7 /* Load byte index of c. */
-.Lfound2:
- slgfi %r5,16 /* current_len -=16 */
- algr %r5,%r1 /* Zero byte index is added to current len. */
- la %r2,0(%r5,%r2) /* Return pointer to c. */
- br %r14
-
-.Lloop64:
- vl %v16,0(%r5,%r2)
- vfeefs %v17,%v16,%v18 /* Find c. */
- jl .Lfound0 /* Jump away if c was found. */
- vl %v16,16(%r5,%r2)
- vfeefs %v17,%v16,%v18
- jl .Lfound16
- vl %v16,32(%r5,%r2)
- vfeefs %v17,%v16,%v18
- jl .Lfound32
- vl %v16,48(%r5,%r2)
- vfeefs %v17,%v16,%v18
- jl .Lfound48
-
- aghi %r5,64
- lgr %r0,%r5 /* If %r5 + 64 < n? -> loop64. */
- aghi %r0,64
- clgrjl %r0,%r4,.Lloop64
-
- j .Llt64
-.Lfallback:
- jg __wmemchr_c
-END(__wmemchr_vx)
-#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */
diff --git a/sysdeps/s390/multiarch/wmemchr.c b/sysdeps/s390/multiarch/wmemchr.c
deleted file mode 100644
index 6b55c1d..0000000
--- a/sysdeps/s390/multiarch/wmemchr.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Multiple versions of wmemchr.
- Copyright (C) 2015-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
- . */
-
-#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)
-# define wmemchr __redirect_wmemchr
-# define __wmemchr __redirect___wmemchr
-# include
-# undef wmemchr
-# undef __wmemchr
-# include
-
-s390_vx_libc_ifunc_redirected (__redirect___wmemchr, __wmemchr)
-weak_alias (__wmemchr, wmemchr)
-
-#else
-# include
-#endif /* !(defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)) */
diff --git a/sysdeps/s390/wmemchr-c.c b/sysdeps/s390/wmemchr-c.c
new file mode 100644
index 0000000..bb2526e
--- /dev/null
+++ b/sysdeps/s390/wmemchr-c.c
@@ -0,0 +1,44 @@
+/* Default wmemchr implementation for S/390.
+ Copyright (C) 2015-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
+ . */
+
+#include
+
+#if HAVE_WMEMCHR_C
+# if HAVE_WMEMCHR_IFUNC || HAVE_WMEMCHR_Z13
+# define WMEMCHR WMEMCHR_C
+
+# undef weak_alias
+# define weak_alias(name, alias)
+
+# if defined SHARED && IS_IN (libc)
+# undef libc_hidden_weak
+# define libc_hidden_weak(name)
+# undef libc_hidden_def
+# if ! defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT
+# define libc_hidden_def(name) \
+ __hidden_ver1 (__wmemchr_c, __GI_wmemchr, __wmemchr_c) __attribute__((weak)); \
+ strong_alias (__wmemchr_c, __wmemchr_c_1); \
+ __hidden_ver1 (__wmemchr_c_1, __GI___wmemchr, __wmemchr_c_1);
+# else
+# define libc_hidden_def(name)
+# endif
+# endif
+# endif
+
+# include
+#endif
diff --git a/sysdeps/s390/wmemchr-vx.S b/sysdeps/s390/wmemchr-vx.S
new file mode 100644
index 0000000..72e9ef5
--- /dev/null
+++ b/sysdeps/s390/wmemchr-vx.S
@@ -0,0 +1,178 @@
+/* Vector optimized 32/64 bit S/390 version of wmemchr.
+ Copyright (C) 2015-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
+ . */
+
+#include
+#if HAVE_WMEMCHR_Z13
+
+# include "sysdep.h"
+# include "asm-syntax.h"
+
+ .text
+
+/* wchar_t *wmemchr (const wchar_t *s, wchar_t c, size_t n)
+ Scans memory for character c
+ and returns pointer to first c.
+
+ Register usage:
+ -r0=tmp
+ -r1=tmp
+ -r2=s
+ -r3=c
+ -r4=n
+ -r5=current_len
+ -v16=part of s
+ -v17=index of found c
+ -v18=c replicated
+*/
+ENTRY(WMEMCHR_Z13)
+ .machine "z13"
+ .machinemode "zarch_nohighgprs"
+
+# if !defined __s390x__
+ llgfr %r4,%r4
+# endif /* !defined __s390x__ */
+
+ clgije %r4,0,.Lnf_end /* If len == 0 then exit. */
+
+ vlbb %v16,0(%r2),6 /* Load s until next 4k-byte boundary. */
+ lcbb %r0,0(%r2),6 /* Get bytes to 4k-byte boundary or 16. */
+ llgfr %r0,%r0 /* Convert 32bit to 64bit. */
+
+ tmll %r2,3 /* Test if s is 4-byte aligned? */
+ jne .Lfallback /* And use common-code variant if not. */
+
+ vlvgf %v18,%r3,0 /* Generate vector which elements are all c. */
+ vrepf %v18,%v18,0
+ lghi %r5,16 /* current_len = 16. */
+
+ /* Check range of maxlen and convert to byte-count. */
+# ifdef __s390x__
+ tmhh %r4,49152 /* Test bit 0 or 1 of maxlen. */
+ lghi %r1,-4 /* Max byte-count is 18446744073709551612. */
+# else
+ tmlh %r4,49152 /* Test bit 0 or 1 of maxlen. */
+ llilf %r1,4294967292 /* Max byte-count is 4294967292. */
+# endif /* !__s390x__ */
+ sllg %r4,%r4,2 /* Convert character-count to byte-count. */
+ locgrne %r4,%r1 /* Use max byte-count, if bit 0/1 was one. */
+
+ clgrjhe %r0,%r4,.Llastcmp /* If (bytes to boundary) >= n,
+ jump to lastcmp. */
+
+ vfeefs %v17,%v16,%v18 /* Find c. */
+ vlgvb %r1,%v17,7 /* Load byte index of c. */
+ clgrjl %r1,%r0,.Lfound2 /* Found c is within loaded bytes. */
+
+ /* Align s to 16 byte. */
+ risbgn %r1,%r2,60,128+63,0 /* %r3 = bits 60-63 of %r2 'and' 15. */
+ slr %r5,%r1 /* Compute bytes to 16bytes boundary. */
+
+ lgr %r0,%r5 /* If %r5 + 64 < n? -> loop64. */
+ aghi %r0,64
+ clgrjl %r0,%r4,.Lloop64
+.Llt64:
+ vl %v16,0(%r5,%r2)
+ aghi %r5,16
+ clgrjhe %r5,%r4,.Llastcmp /* Do last compare if curr-len >= n. */
+ vfeefs %v17,%v16,%v18 /* Find c. */
+ jl .Lfound /* Jump away if c was found. */
+
+ vl %v16,0(%r5,%r2)
+ aghi %r5,16
+ clgrjhe %r5,%r4,.Llastcmp
+ vfeefs %v17,%v16,%v18
+ jl .Lfound
+
+ vl %v16,0(%r5,%r2)
+ aghi %r5,16
+ clgrjhe %r5,%r4,.Llastcmp
+ vfeefs %v17,%v16,%v18
+ jl .Lfound
+
+ vl %v16,0(%r5,%r2)
+ aghi %r5,16
+
+.Llastcmp:
+ /* Use comparision result only if located within first n characters.
+ %r5: current_len;
+ %r4: n;
+ (current_len - n): [0...16[
+ first ignored match index = vr-width - (current_len - n) ]0...16]
+ */
+ vfeefs %v17,%v16,%v18 /* Find c. */
+ slgrk %r4,%r5,%r4 /* %r5 = current_len - n. */
+ lghi %r0,16 /* Register width = 16. */
+ vlgvb %r1,%v17,7 /* Extract found index or 16 if all equal. */
+ slr %r0,%r4 /* %r0 = first ignored match index. */
+ clrjl %r1,%r0,.Lfound2 /* Go away if miscompare is below n bytes. */
+ /* c not found within n-bytes. */
+.Lnf_end:
+ lghi %r2,0 /* Return null. */
+ br %r14
+
+.Lfound48:
+ aghi %r5,16
+.Lfound32:
+ aghi %r5,16
+.Lfound16:
+ aghi %r5,16
+.Lfound0:
+ aghi %r5,16
+.Lfound:
+ vlgvb %r1,%v17,7 /* Load byte index of c. */
+.Lfound2:
+ slgfi %r5,16 /* current_len -=16 */
+ algr %r5,%r1 /* Zero byte index is added to current len. */
+ la %r2,0(%r5,%r2) /* Return pointer to c. */
+ br %r14
+
+.Lloop64:
+ vl %v16,0(%r5,%r2)
+ vfeefs %v17,%v16,%v18 /* Find c. */
+ jl .Lfound0 /* Jump away if c was found. */
+ vl %v16,16(%r5,%r2)
+ vfeefs %v17,%v16,%v18
+ jl .Lfound16
+ vl %v16,32(%r5,%r2)
+ vfeefs %v17,%v16,%v18
+ jl .Lfound32
+ vl %v16,48(%r5,%r2)
+ vfeefs %v17,%v16,%v18
+ jl .Lfound48
+
+ aghi %r5,64
+ lgr %r0,%r5 /* If %r5 + 64 < n? -> loop64. */
+ aghi %r0,64
+ clgrjl %r0,%r4,.Lloop64
+
+ j .Llt64
+.Lfallback:
+ jg WMEMCHR_C
+END(WMEMCHR_Z13)
+
+# if ! HAVE_WMEMCHR_IFUNC
+strong_alias (WMEMCHR_Z13, __wmemchr)
+weak_alias (__wmemchr, wmemchr)
+# endif
+
+# if defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT \
+ && defined SHARED && IS_IN (libc)
+strong_alias (WMEMCHR_Z13, __GI___wmemchr)
+weak_alias (WMEMCHR_Z13, __GI_wmemchr)
+# endif
+#endif
diff --git a/sysdeps/s390/wmemchr.c b/sysdeps/s390/wmemchr.c
new file mode 100644
index 0000000..0d2fbb2
--- /dev/null
+++ b/sysdeps/s390/wmemchr.c
@@ -0,0 +1,43 @@
+/* Multiple versions of wmemchr.
+ Copyright (C) 2015-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
+ . */
+
+#include
+
+#if HAVE_WMEMCHR_IFUNC
+# define wmemchr __redirect_wmemchr
+# define __wmemchr __redirect___wmemchr
+# include
+# undef wmemchr
+# undef __wmemchr
+# include
+
+# if HAVE_WMEMCHR_C
+extern __typeof (__redirect___wmemchr) WMEMCHR_C attribute_hidden;
+# endif
+
+# if HAVE_WMEMCHR_Z13
+extern __typeof (__redirect___wmemchr) WMEMCHR_Z13 attribute_hidden;
+# endif
+
+s390_libc_ifunc_expr (__redirect___wmemchr, __wmemchr,
+ (HAVE_WMEMCHR_Z13 && (hwcap & HWCAP_S390_VX))
+ ? WMEMCHR_Z13
+ : WMEMCHR_DEFAULT
+ )
+weak_alias (__wmemchr, wmemchr)
+#endif