diff --git a/sysdeps/s390/Makefile b/sysdeps/s390/Makefile
index a6ebf11..19a556e 100644
--- a/sysdeps/s390/Makefile
+++ b/sysdeps/s390/Makefile
@@ -71,5 +71,6 @@ sysdep_routines += wcslen wcslen-vx wcslen-c \
wcscmp wcscmp-vx wcscmp-c \
wcsncmp wcsncmp-vx wcsncmp-c \
wcschr wcschr-vx wcschr-c \
- wcschrnul wcschrnul-vx wcschrnul-c
+ wcschrnul wcschrnul-vx wcschrnul-c \
+ wcsrchr wcsrchr-vx wcsrchr-c
endif
diff --git a/sysdeps/s390/ifunc-wcsrchr.h b/sysdeps/s390/ifunc-wcsrchr.h
new file mode 100644
index 0000000..4eec0c1
--- /dev/null
+++ b/sysdeps/s390/ifunc-wcsrchr.h
@@ -0,0 +1,53 @@
+/* wcsrchr 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_WCSRCHR_IFUNC 1
+#else
+# define HAVE_WCSRCHR_IFUNC 0
+#endif
+
+#ifdef HAVE_S390_VX_ASM_SUPPORT
+# define HAVE_WCSRCHR_IFUNC_AND_VX_SUPPORT HAVE_WCSRCHR_IFUNC
+#else
+# define HAVE_WCSRCHR_IFUNC_AND_VX_SUPPORT 0
+#endif
+
+#if defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT
+# define WCSRCHR_DEFAULT WCSRCHR_Z13
+/* The z13 ifunc variant is using the common code variant as fallback! */
+# define HAVE_WCSRCHR_C 1
+# define HAVE_WCSRCHR_Z13 1
+#else
+# define WCSRCHR_DEFAULT WCSRCHR_C
+# define HAVE_WCSRCHR_C 1
+# define HAVE_WCSRCHR_Z13 HAVE_WCSRCHR_IFUNC_AND_VX_SUPPORT
+#endif
+
+#if HAVE_WCSRCHR_C
+# define WCSRCHR_C __wcsrchr_c
+#else
+# define WCSRCHR_C NULL
+#endif
+
+#if HAVE_WCSRCHR_Z13
+# define WCSRCHR_Z13 __wcsrchr_vx
+#else
+# define WCSRCHR_Z13 NULL
+#endif
diff --git a/sysdeps/s390/multiarch/Makefile b/sysdeps/s390/multiarch/Makefile
index 0eb01d5..3d72cbb 100644
--- a/sysdeps/s390/multiarch/Makefile
+++ b/sysdeps/s390/multiarch/Makefile
@@ -1,6 +1,5 @@
ifeq ($(subdir),wcsmbs)
-sysdep_routines += wcsrchr wcsrchr-vx wcsrchr-c \
- wcsspn wcsspn-vx wcsspn-c \
+sysdep_routines += wcsspn wcsspn-vx wcsspn-c \
wcspbrk wcspbrk-vx wcspbrk-c \
wcscspn wcscspn-vx wcscspn-c \
wmemchr wmemchr-vx wmemchr-c \
diff --git a/sysdeps/s390/multiarch/ifunc-impl-list.c b/sysdeps/s390/multiarch/ifunc-impl-list.c
index 553a76c..ffb4d5b 100644
--- a/sysdeps/s390/multiarch/ifunc-impl-list.c
+++ b/sysdeps/s390/multiarch/ifunc-impl-list.c
@@ -58,6 +58,7 @@
#include
#include
#include
+#include
/* Maximum number of IFUNC implementations. */
#define MAX_IFUNC 3
@@ -580,6 +581,18 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
)
#endif /* HAVE_WCSCHRNUL_IFUNC */
+#if HAVE_WCSRCHR_IFUNC
+ IFUNC_IMPL (i, name, wcsrchr,
+# if HAVE_WCSRCHR_Z13
+ IFUNC_IMPL_ADD (array, i, wcsrchr,
+ dl_hwcap & HWCAP_S390_VX, WCSRCHR_Z13)
+# endif
+# if HAVE_WCSRCHR_C
+ IFUNC_IMPL_ADD (array, i, wcsrchr, 1, WCSRCHR_C)
+# endif
+ )
+#endif /* HAVE_WCSRCHR_IFUNC */
+
#ifdef HAVE_S390_VX_ASM_SUPPORT
# define IFUNC_VX_IMPL(FUNC) \
@@ -588,8 +601,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 (wcsrchr);
-
IFUNC_VX_IMPL (wcsspn);
IFUNC_VX_IMPL (wcspbrk);
diff --git a/sysdeps/s390/multiarch/wcsrchr-c.c b/sysdeps/s390/multiarch/wcsrchr-c.c
deleted file mode 100644
index 6152503..0000000
--- a/sysdeps/s390/multiarch/wcsrchr-c.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Default wcsrchr 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 WCSRCHR __wcsrchr_c
-
-# include
-extern __typeof (wcsrchr) __wcsrchr_c;
-# include
-#endif
diff --git a/sysdeps/s390/multiarch/wcsrchr-vx.S b/sysdeps/s390/multiarch/wcsrchr-vx.S
deleted file mode 100644
index e40a554..0000000
--- a/sysdeps/s390/multiarch/wcsrchr-vx.S
+++ /dev/null
@@ -1,190 +0,0 @@
-/* Vector optimized 32/64 bit S/390 version of wcsrchr.
- 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 *wcsrchr (const wchar_t *s, wchar_t c)
- Locate the last character c in string.
-
- Register usage:
- -r0=loaded bytes in first part of s.
- -r1=pointer to last occurence of c or NULL if not found.
- -r2=s
- -r3=c
- -r4=tmp
- -r5=current_len
- -v16=part of s
- -v17=index of found element
- -v18=replicated c
- -v19=part of s with last occurence of c.
- -v20=permute pattern
-*/
-ENTRY(__wcsrchr_vx)
- .machine "z13"
- .machinemode "zarch_nohighgprs"
-
- 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. */
-
- 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 %r1,-1 /* Currently no c found. */
- lghi %r5,0 /* current_len = 0. */
-
- vfeezfs %v17,%v16,%v18 /* Find element equal or zero. */
- vlgvb %r4,%v17,7 /* Load byte index of c/zero or 16. */
- clrjl %r4,%r0,.Lfound_first_part /* Found c/zero in loaded bytes. */
-.Lalign:
- /* Align s to 16 byte. */
- risbgn %r4,%r2,60,128+63,0 /* %r3 = bits 60-63 of %r2 'and' 15. */
- lghi %r5,16 /* current_len = 16. */
- slr %r5,%r4 /* Compute bytes to 16bytes boundary. */
-
-.Lloop:
- vl %v16,0(%r5,%r2) /* Load s. */
- vfeezfs %v17,%v16,%v18 /* Find element equal with zero search. */
- jno .Lfound /* Found c/zero (cc=0|1|2). */
- vl %v16,16(%r5,%r2)
- vfeezfs %v17,%v16,%v18
- jno .Lfound16
- vl %v16,32(%r5,%r2)
- vfeezfs %v17,%v16,%v18
- jno .Lfound32
- vl %v16,48(%r5,%r2)
- vfeezfs %v17,%v16,%v18
- jno .Lfound48
-
- aghi %r5,64
- j .Lloop /* No character and no zero -> loop. */
-
-.Lfound48:
- la %r5,16(%r5) /* Use la since aghi would clobber cc. */
-.Lfound32:
- la %r5,16(%r5)
-.Lfound16:
- la %r5,16(%r5)
-.Lfound:
- je .Lzero /* Found zero, but no c before that zero. */
- /* Save this part of s to check for further matches after reaching
- the end of the complete string. */
- vlr %v19,%v16
- lgr %r1,%r5
-
- jh .Lzero /* Found a zero after the found c. */
- aghi %r5,16 /* Start search of next part of s. */
- j .Lloop
-
-.Lfound_first_part:
- /* This code is only executed if the found c/zero is whithin loaded
- bytes. If no c/zero was found (cc==3) the found index = 16, thus
- this code is not called.
- Resulting condition code of vector find element equal:
- cc==0: no c, found zero
- cc==1: c found, no zero
- cc==2: c found, found zero after c
- cc==3: no c, no zero (this case can be ignored). */
- je .Lzero /* Found zero, but no c before that zero. */
-
- locgrne %r1,%r5 /* Mark c as found in first part of s. */
- vlr %v19,%v16
-
- jl .Lalign /* No zero (e.g. if vr was fully loaded)
- -> Align and loop afterwards. */
-
- /* Found a zero in vr. If vr was not fully loaded due to block
- boundary, the remaining bytes are filled with zero and we can't
- rely on zero indication of condition code here! */
-
- vfenezf %v17,%v16,%v16
- vlgvb %r4,%v17,7 /* Load byte index of zero or 16. */
- clrjl %r4,%r0,.Lzero /* Zero within loaded bytes -> end. */
- j .Lalign /* Align and loop afterwards. */
-
-.Lend_searched_zero:
- vlgvb %r4,%v17,7 /* Load byte index of zero. */
- algr %r5,%r4
- la %r2,0(%r5,%r2) /* Return pointer to zero. */
- br %r14
-
-.Lzero:
- /* Reached end of string. Check if one c was found before. */
- clije %r3,0,.Lend_searched_zero /* Found zero and c is zero. */
-
- cgfi %r1,-1 /* No c found -> return NULL. */
- locghie %r2,0
- ber %r14
-
- larl %r3,.Lpermute_mask /* Load permute mask. */
- vl %v20,0(%r3)
-
- /* c was found and is part of v19. */
- vfenezf %v17,%v19,%v19 /* Find zero. */
- vlgvb %r4,%v17,7 /* Load byte index of zero or 16. */
- ahi %r4,3 /* Found zero index is first byte,
- thus highest byte index is last byte of
- wchar_t zero. */
-
- clgfi %r5,0 /* Loaded byte count in v19 is 16, ... */
- lochine %r0,16 /* ... if v19 is not the first part of s. */
- ahi %r0,-1 /* Convert byte count to highest index. */
-
- clr %r0,%r4
- locrl %r4,%r0 /* r4 = min (zero-index, highest-index). */
-
- /* Right-shift of v19 to mask bytes after zero. */
- clije %r4,15,.Lzero_permute /* No shift is needed if highest index
- in vr is 15. */
- lhi %r0,15
- slr %r0,%r4 /* Compute byte count for vector shift left. */
- sll %r0,3 /* Convert to bit count. */
- vlvgb %v17,%r0,7
- vsrlb %v19,%v19,%v17 /* Vector shift right by byte by number of bytes
- specified in bits 1-4 of byte 7 in v17. */
-
- /* Reverse bytes in v19. */
-.Lzero_permute:
- vperm %v19,%v19,%v19,%v20 /* Permute v19 to reversed order. */
-
- /* Find c in reversed v19. */
- vfeef %v19,%v19,%v18 /* Find c. */
- la %r2,0(%r1,%r2)
- vlgvb %r3,%v19,7 /* Load byte index of c. */
-
- /* Compute index in real s and return. */
- slgr %r4,%r3
- lay %r2,-3(%r4,%r2) /* Return pointer to zero. -3 is needed,
- because the found byte index is reversed in
- vector-register. Thus point to first byte of
- wchar_t. */
- br %r14
-.Lpermute_mask:
- .byte 0x0C,0x0D,0x0E,0x0F,0x08,0x09,0x0A,0x0B
- .byte 0x04,0x05,0x06,0x07,0x00,0x01,0x02,0x03
-.Lfallback:
- jg __wcsrchr_c
-END(__wcsrchr_vx)
-#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */
diff --git a/sysdeps/s390/multiarch/wcsrchr.c b/sysdeps/s390/multiarch/wcsrchr.c
deleted file mode 100644
index aa0b8a8..0000000
--- a/sysdeps/s390/multiarch/wcsrchr.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Multiple versions of wcsrchr.
- 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
-# include
-
-s390_vx_libc_ifunc2 (__wcsrchr, wcsrchr)
-
-#else
-# include
-#endif /* !(defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)) */
diff --git a/sysdeps/s390/wcsrchr-c.c b/sysdeps/s390/wcsrchr-c.c
new file mode 100644
index 0000000..65164a8
--- /dev/null
+++ b/sysdeps/s390/wcsrchr-c.c
@@ -0,0 +1,27 @@
+/* Default wcsrchr 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_WCSRCHR_C
+# if HAVE_WCSRCHR_IFUNC || HAVE_WCSRCHR_Z13
+# define WCSRCHR WCSRCHR_C
+# endif
+
+# include
+#endif
diff --git a/sysdeps/s390/wcsrchr-vx.S b/sysdeps/s390/wcsrchr-vx.S
new file mode 100644
index 0000000..c7b6585
--- /dev/null
+++ b/sysdeps/s390/wcsrchr-vx.S
@@ -0,0 +1,195 @@
+/* Vector optimized 32/64 bit S/390 version of wcsrchr.
+ 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_WCSRCHR_Z13
+
+# include "sysdep.h"
+# include "asm-syntax.h"
+
+ .text
+
+/* wchar_t *wcsrchr (const wchar_t *s, wchar_t c)
+ Locate the last character c in string.
+
+ Register usage:
+ -r0=loaded bytes in first part of s.
+ -r1=pointer to last occurence of c or NULL if not found.
+ -r2=s
+ -r3=c
+ -r4=tmp
+ -r5=current_len
+ -v16=part of s
+ -v17=index of found element
+ -v18=replicated c
+ -v19=part of s with last occurence of c.
+ -v20=permute pattern
+*/
+ENTRY(WCSRCHR_Z13)
+ .machine "z13"
+ .machinemode "zarch_nohighgprs"
+
+ 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. */
+
+ 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 %r1,-1 /* Currently no c found. */
+ lghi %r5,0 /* current_len = 0. */
+
+ vfeezfs %v17,%v16,%v18 /* Find element equal or zero. */
+ vlgvb %r4,%v17,7 /* Load byte index of c/zero or 16. */
+ clrjl %r4,%r0,.Lfound_first_part /* Found c/zero in loaded bytes. */
+.Lalign:
+ /* Align s to 16 byte. */
+ risbgn %r4,%r2,60,128+63,0 /* %r3 = bits 60-63 of %r2 'and' 15. */
+ lghi %r5,16 /* current_len = 16. */
+ slr %r5,%r4 /* Compute bytes to 16bytes boundary. */
+
+.Lloop:
+ vl %v16,0(%r5,%r2) /* Load s. */
+ vfeezfs %v17,%v16,%v18 /* Find element equal with zero search. */
+ jno .Lfound /* Found c/zero (cc=0|1|2). */
+ vl %v16,16(%r5,%r2)
+ vfeezfs %v17,%v16,%v18
+ jno .Lfound16
+ vl %v16,32(%r5,%r2)
+ vfeezfs %v17,%v16,%v18
+ jno .Lfound32
+ vl %v16,48(%r5,%r2)
+ vfeezfs %v17,%v16,%v18
+ jno .Lfound48
+
+ aghi %r5,64
+ j .Lloop /* No character and no zero -> loop. */
+
+.Lfound48:
+ la %r5,16(%r5) /* Use la since aghi would clobber cc. */
+.Lfound32:
+ la %r5,16(%r5)
+.Lfound16:
+ la %r5,16(%r5)
+.Lfound:
+ je .Lzero /* Found zero, but no c before that zero. */
+ /* Save this part of s to check for further matches after reaching
+ the end of the complete string. */
+ vlr %v19,%v16
+ lgr %r1,%r5
+
+ jh .Lzero /* Found a zero after the found c. */
+ aghi %r5,16 /* Start search of next part of s. */
+ j .Lloop
+
+.Lfound_first_part:
+ /* This code is only executed if the found c/zero is whithin loaded
+ bytes. If no c/zero was found (cc==3) the found index = 16, thus
+ this code is not called.
+ Resulting condition code of vector find element equal:
+ cc==0: no c, found zero
+ cc==1: c found, no zero
+ cc==2: c found, found zero after c
+ cc==3: no c, no zero (this case can be ignored). */
+ je .Lzero /* Found zero, but no c before that zero. */
+
+ locgrne %r1,%r5 /* Mark c as found in first part of s. */
+ vlr %v19,%v16
+
+ jl .Lalign /* No zero (e.g. if vr was fully loaded)
+ -> Align and loop afterwards. */
+
+ /* Found a zero in vr. If vr was not fully loaded due to block
+ boundary, the remaining bytes are filled with zero and we can't
+ rely on zero indication of condition code here! */
+
+ vfenezf %v17,%v16,%v16
+ vlgvb %r4,%v17,7 /* Load byte index of zero or 16. */
+ clrjl %r4,%r0,.Lzero /* Zero within loaded bytes -> end. */
+ j .Lalign /* Align and loop afterwards. */
+
+.Lend_searched_zero:
+ vlgvb %r4,%v17,7 /* Load byte index of zero. */
+ algr %r5,%r4
+ la %r2,0(%r5,%r2) /* Return pointer to zero. */
+ br %r14
+
+.Lzero:
+ /* Reached end of string. Check if one c was found before. */
+ clije %r3,0,.Lend_searched_zero /* Found zero and c is zero. */
+
+ cgfi %r1,-1 /* No c found -> return NULL. */
+ locghie %r2,0
+ ber %r14
+
+ larl %r3,.Lpermute_mask /* Load permute mask. */
+ vl %v20,0(%r3)
+
+ /* c was found and is part of v19. */
+ vfenezf %v17,%v19,%v19 /* Find zero. */
+ vlgvb %r4,%v17,7 /* Load byte index of zero or 16. */
+ ahi %r4,3 /* Found zero index is first byte,
+ thus highest byte index is last byte of
+ wchar_t zero. */
+
+ clgfi %r5,0 /* Loaded byte count in v19 is 16, ... */
+ lochine %r0,16 /* ... if v19 is not the first part of s. */
+ ahi %r0,-1 /* Convert byte count to highest index. */
+
+ clr %r0,%r4
+ locrl %r4,%r0 /* r4 = min (zero-index, highest-index). */
+
+ /* Right-shift of v19 to mask bytes after zero. */
+ clije %r4,15,.Lzero_permute /* No shift is needed if highest index
+ in vr is 15. */
+ lhi %r0,15
+ slr %r0,%r4 /* Compute byte count for vector shift left. */
+ sll %r0,3 /* Convert to bit count. */
+ vlvgb %v17,%r0,7
+ vsrlb %v19,%v19,%v17 /* Vector shift right by byte by number of bytes
+ specified in bits 1-4 of byte 7 in v17. */
+
+ /* Reverse bytes in v19. */
+.Lzero_permute:
+ vperm %v19,%v19,%v19,%v20 /* Permute v19 to reversed order. */
+
+ /* Find c in reversed v19. */
+ vfeef %v19,%v19,%v18 /* Find c. */
+ la %r2,0(%r1,%r2)
+ vlgvb %r3,%v19,7 /* Load byte index of c. */
+
+ /* Compute index in real s and return. */
+ slgr %r4,%r3
+ lay %r2,-3(%r4,%r2) /* Return pointer to zero. -3 is needed,
+ because the found byte index is reversed in
+ vector-register. Thus point to first byte of
+ wchar_t. */
+ br %r14
+.Lpermute_mask:
+ .byte 0x0C,0x0D,0x0E,0x0F,0x08,0x09,0x0A,0x0B
+ .byte 0x04,0x05,0x06,0x07,0x00,0x01,0x02,0x03
+.Lfallback:
+ jg WCSRCHR_C
+END(WCSRCHR_Z13)
+
+# if ! HAVE_WCSRCHR_IFUNC
+strong_alias (WCSRCHR_Z13, wcsrchr)
+# endif
+#endif
diff --git a/sysdeps/s390/wcsrchr.c b/sysdeps/s390/wcsrchr.c
new file mode 100644
index 0000000..eb70f27
--- /dev/null
+++ b/sysdeps/s390/wcsrchr.c
@@ -0,0 +1,38 @@
+/* Multiple versions of wcsrchr.
+ 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_WCSRCHR_IFUNC
+# include
+# include
+
+# if HAVE_WCSRCHR_C
+extern __typeof (wcsrchr) WCSRCHR_C attribute_hidden;
+# endif
+
+# if HAVE_WCSRCHR_Z13
+extern __typeof (wcsrchr) WCSRCHR_Z13 attribute_hidden;
+# endif
+
+s390_libc_ifunc_expr (wcsrchr, wcsrchr,
+ (HAVE_WCSRCHR_Z13 && (hwcap & HWCAP_S390_VX))
+ ? WCSRCHR_Z13
+ : WCSRCHR_DEFAULT
+ )
+#endif