diff --git a/sysdeps/s390/Makefile b/sysdeps/s390/Makefile
index 6401773..5fd00ad 100644
--- a/sysdeps/s390/Makefile
+++ b/sysdeps/s390/Makefile
@@ -65,5 +65,6 @@ sysdep_routines += wcslen wcslen-vx wcslen-c \
wcscpy wcscpy-vx wcscpy-c \
wcpcpy wcpcpy-vx wcpcpy-c \
wcsncpy wcsncpy-vx wcsncpy-c \
- wcpncpy wcpncpy-vx wcpncpy-c
+ wcpncpy wcpncpy-vx wcpncpy-c \
+ wcscat wcscat-vx wcscat-c
endif
diff --git a/sysdeps/s390/ifunc-wcscat.h b/sysdeps/s390/ifunc-wcscat.h
new file mode 100644
index 0000000..fecae21
--- /dev/null
+++ b/sysdeps/s390/ifunc-wcscat.h
@@ -0,0 +1,53 @@
+/* wcscat 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_WCSCAT_IFUNC 1
+#else
+# define HAVE_WCSCAT_IFUNC 0
+#endif
+
+#ifdef HAVE_S390_VX_ASM_SUPPORT
+# define HAVE_WCSCAT_IFUNC_AND_VX_SUPPORT HAVE_WCSCAT_IFUNC
+#else
+# define HAVE_WCSCAT_IFUNC_AND_VX_SUPPORT 0
+#endif
+
+#if defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT
+# define WCSCAT_DEFAULT WCSCAT_Z13
+/* The z13 ifunc variant is using the common code variant as fallback! */
+# define HAVE_WCSCAT_C 1
+# define HAVE_WCSCAT_Z13 1
+#else
+# define WCSCAT_DEFAULT WCSCAT_C
+# define HAVE_WCSCAT_C 1
+# define HAVE_WCSCAT_Z13 HAVE_WCSCAT_IFUNC_AND_VX_SUPPORT
+#endif
+
+#if HAVE_WCSCAT_C
+# define WCSCAT_C __wcscat_c
+#else
+# define WCSCAT_C NULL
+#endif
+
+#if HAVE_WCSCAT_Z13
+# define WCSCAT_Z13 __wcscat_vx
+#else
+# define WCSCAT_Z13 NULL
+#endif
diff --git a/sysdeps/s390/multiarch/Makefile b/sysdeps/s390/multiarch/Makefile
index 158fb49..6170174 100644
--- a/sysdeps/s390/multiarch/Makefile
+++ b/sysdeps/s390/multiarch/Makefile
@@ -1,6 +1,5 @@
ifeq ($(subdir),wcsmbs)
-sysdep_routines += wcscat wcscat-vx wcscat-c \
- wcsncat wcsncat-vx wcsncat-c \
+sysdep_routines += wcsncat wcsncat-vx wcsncat-c \
wcscmp wcscmp-vx wcscmp-c \
wcsncmp wcsncmp-vx wcsncmp-c \
wcschr wcschr-vx wcschr-c \
diff --git a/sysdeps/s390/multiarch/ifunc-impl-list.c b/sysdeps/s390/multiarch/ifunc-impl-list.c
index e60238f..b05bd35 100644
--- a/sysdeps/s390/multiarch/ifunc-impl-list.c
+++ b/sysdeps/s390/multiarch/ifunc-impl-list.c
@@ -52,6 +52,7 @@
#include
#include
#include
+#include
/* Maximum number of IFUNC implementations. */
#define MAX_IFUNC 3
@@ -502,6 +503,18 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
)
#endif /* HAVE_WCPNCPY_IFUNC */
+#if HAVE_WCSCAT_IFUNC
+ IFUNC_IMPL (i, name, wcscat,
+# if HAVE_WCSCAT_Z13
+ IFUNC_IMPL_ADD (array, i, wcscat,
+ dl_hwcap & HWCAP_S390_VX, WCSCAT_Z13)
+# endif
+# if HAVE_WCSCAT_C
+ IFUNC_IMPL_ADD (array, i, wcscat, 1, WCSCAT_C)
+# endif
+ )
+#endif /* HAVE_WCSCAT_IFUNC */
+
#ifdef HAVE_S390_VX_ASM_SUPPORT
# define IFUNC_VX_IMPL(FUNC) \
@@ -510,8 +523,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 (wcscat);
-
IFUNC_VX_IMPL (wcsncat);
IFUNC_VX_IMPL (wcscmp);
diff --git a/sysdeps/s390/multiarch/wcscat-c.c b/sysdeps/s390/multiarch/wcscat-c.c
deleted file mode 100644
index 9a31c65..0000000
--- a/sysdeps/s390/multiarch/wcscat-c.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Default wcscat 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 WCSCAT __wcscat_c
-
-# include
-extern __typeof (__wcscat) __wcscat_c;
-# include
-#endif
diff --git a/sysdeps/s390/multiarch/wcscat-vx.S b/sysdeps/s390/multiarch/wcscat-vx.S
deleted file mode 100644
index 2164a8d..0000000
--- a/sysdeps/s390/multiarch/wcscat-vx.S
+++ /dev/null
@@ -1,175 +0,0 @@
-/* Vector optimized 32/64 bit S/390 version of wcscat.
- 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 * wcscat (wchar_t *dest, const wchar_t *src)
- Concatenate two strings.
-
- Register usage:
- -r0=saved dest pointer for return
- -r1=tmp
- -r2=dest
- -r3=src
- -r4=tmp
- -r5=current_len
- -v16=part of src
- -v17=index of zero
- -v18=part of src
-*/
-ENTRY(__wcscat_vx)
- .machine "z13"
- .machinemode "zarch_nohighgprs"
-
- vlbb %v16,0(%r2),6 /* Load s until next 4k-byte boundary. */
- lcbb %r1,0(%r2),6 /* Get bytes to 4k-byte boundary or 16. */
-
- /* __wcslen_c can handle non 4byte aligned pointers,
- but __wcscpy_c not. Thus if either src or dest is
- not 4byte aligned, use __wcscat_c. */
- tmll %r2,3 /* Test if s is 4-byte aligned? */
- jne .Lfallback /* And use common-code variant if not. */
- tmll %r3,3 /* Test if src is 4-byte aligned? */
- jne .Lfallback /* And use common-code variant if not. */
-
- lgr %r0,%r2 /* Save destination pointer for return. */
-
- /* WCSLEN
- r1 = loaded bytes (tmp)
- r4 = zero byte index (tmp)
- r2 = dst
- */
-
- vfenezf %v16,%v16,%v16 /* Find element not equal with zero search. */
- vlgvb %r5,%v16,7 /* Load zero index or 16 if not found. */
- clrjl %r5,%r1,.Llen_end /* Found zero within loaded bytes, end. */
-
- /* Align s to 16 byte. */
- risbgn %r1,%r2,60,128+63,0 /* %r3 = bits 60-63 of %r2 'and' 15. */
- lghi %r5,16 /* current_len = 16. */
- slr %r5,%r1 /* Compute bytes to 16bytes boundary. */
-
- /* Find zero in 16byte aligned loop. */
-.Llen_loop:
- vl %v16,0(%r5,%r2) /* Load s. */
- vfenezfs %v16,%v16,%v16 /* Find element not equal with zero search. */
- je .Llen_found /* Jump away if zero was found. */
- vl %v16,16(%r5,%r2)
- vfenezfs %v16,%v16,%v16
- je .Llen_found16
- vl %v16,32(%r5,%r2)
- vfenezfs %v16,%v16,%v16
- je .Llen_found32
- vl %v16,48(%r5,%r2)
- vfenezfs %v16,%v16,%v16
- je .Llen_found48
-
- aghi %r5,64
- j .Llen_loop /* No zero -> loop. */
-
-.Llen_found48:
- aghi %r5,16
-.Llen_found32:
- aghi %r5,16
-.Llen_found16:
- aghi %r5,16
-.Llen_found:
- vlgvb %r4,%v16,7 /* Load byte index of zero. */
- algr %r5,%r4
-
-.Llen_end:
- /* WCSCPY
- %r1 = loaded bytes (tmp)
- %r4 = zero byte index (tmp)
- %r3 = curr src pointer
- %r2 = curr dst pointer
- */
- la %r2,0(%r5,%r2) /* strcpy at end of dst-string. */
-
- vlbb %v16,0(%r3),6 /* Load s until next 4k-byte boundary. */
- lcbb %r1,0(%r3),6 /* Get bytes to 4k-byte boundary or 16. */
-
- vfenezf %v17,%v16,%v16 /* Find element not equal with zero search. */
- vlgvb %r5,%v17,7 /* Load zero index or 16 if not found. */
- clrjl %r5,%r1,.Lcpy_found_align /* If found zero within loaded bytes,
- copy bytes before and return. */
-
- /* Align s to 16 byte. */
- risbgn %r4,%r3,60,128+63,0 /* %r3 = bits 60-63 of %r2 'and' 15. */
- lghi %r5,15 /* current_len = 15. */
- slr %r5,%r4 /* Compute highest index to 16byte boundary. */
-
- vstl %v16,%r5,0(%r2) /* Copy loaded characters - no zero. */
- ahi %r5,1 /* Start loop at next character. */
-
- /* Find zero in 16byte aligned loop. */
-.Lcpy_loop:
- vl %v16,0(%r5,%r3) /* Load s. */
- vfenezfs %v17,%v16,%v16 /* Find element not equal with zero search. */
- je .Lcpy_found_v16_0 /* Jump away if zero was found. */
- vl %v18,16(%r5,%r3) /* Load next part of s. */
- vst %v16,0(%r5,%r2) /* Save previous part without zero to dst. */
- vfenezfs %v17,%v18,%v18
- je .Lcpy_found_v18_16
- vl %v16,32(%r5,%r3)
- vst %v18,16(%r5,%r2)
- vfenezfs %v17,%v16,%v16
- je .Lcpy_found_v16_32
- vl %v18,48(%r5,%r3)
- vst %v16,32(%r5,%r2)
- vfenezfs %v17,%v18,%v18
- je .Lcpy_found_v18_48
- vst %v18,48(%r5,%r2)
-
- aghi %r5,64
- j .Lcpy_loop /* No zero -> loop. */
-
-.Lcpy_found_v16_32:
- aghi %r5,32
-.Lcpy_found_v16_0:
- la %r4,0(%r5,%r2)
- vlgvb %r1,%v17,7 /* Load byte index of zero. */
- aghi %r1,3 /* Also copy remaining bytes of zero. */
- vstl %v16,%r1,0(%r4) /* Copy characters including zero. */
- lgr %r2,%r0 /* Load saved dest-ptr. */
- br %r14
-
-.Lcpy_found_v18_48:
- aghi %r5,32
-.Lcpy_found_v18_16:
- la %r4,16(%r5,%r2)
- vlgvb %r1,%v17,7 /* Load byte index of zero. */
- aghi %r1,3 /* Also copy remaining bytes of zero. */
- vstl %v18,%r1,0(%r4) /* Copy characters including zero. */
- lgr %r2,%r0 /* Load saved dest-ptr. */
- br %r14
-
-.Lcpy_found_align:
- aghi %r5,3 /* Also copy remaining bytes of found zero. */
- vstl %v16,%r5,0(%r2) /* Copy characters including zero. */
- lgr %r2,%r0 /* Load saved dest-ptr. */
- br %r14
-.Lfallback:
- jg __wcscat_c
-END(__wcscat_vx)
-#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */
diff --git a/sysdeps/s390/multiarch/wcscat.c b/sysdeps/s390/multiarch/wcscat.c
deleted file mode 100644
index 33e4f6d..0000000
--- a/sysdeps/s390/multiarch/wcscat.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Multiple versions of wcscat.
- 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_ifunc (__wcscat)
-weak_alias (__wcscat, wcscat)
-
-#else
-# include
-#endif /* !(defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)) */
diff --git a/sysdeps/s390/wcscat-c.c b/sysdeps/s390/wcscat-c.c
new file mode 100644
index 0000000..bc1a50b
--- /dev/null
+++ b/sysdeps/s390/wcscat-c.c
@@ -0,0 +1,27 @@
+/* Default wcscat 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_WCSCAT_C
+# if HAVE_WCSCAT_IFUNC || HAVE_WCSCAT_Z13
+# define WCSCAT WCSCAT_C
+# endif
+
+# include
+#endif
diff --git a/sysdeps/s390/wcscat-vx.S b/sysdeps/s390/wcscat-vx.S
new file mode 100644
index 0000000..4e40d69
--- /dev/null
+++ b/sysdeps/s390/wcscat-vx.S
@@ -0,0 +1,181 @@
+/* Vector optimized 32/64 bit S/390 version of wcscat.
+ 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_WCSCAT_Z13
+
+# include "sysdep.h"
+# include "asm-syntax.h"
+
+ .text
+
+/* wchar_t * wcscat (wchar_t *dest, const wchar_t *src)
+ Concatenate two strings.
+
+ Register usage:
+ -r0=saved dest pointer for return
+ -r1=tmp
+ -r2=dest
+ -r3=src
+ -r4=tmp
+ -r5=current_len
+ -v16=part of src
+ -v17=index of zero
+ -v18=part of src
+*/
+ENTRY(WCSCAT_Z13)
+ .machine "z13"
+ .machinemode "zarch_nohighgprs"
+
+ vlbb %v16,0(%r2),6 /* Load s until next 4k-byte boundary. */
+ lcbb %r1,0(%r2),6 /* Get bytes to 4k-byte boundary or 16. */
+
+ /* __wcslen_c can handle non 4byte aligned pointers,
+ but __wcscpy_c not. Thus if either src or dest is
+ not 4byte aligned, use __wcscat_c. */
+ tmll %r2,3 /* Test if s is 4-byte aligned? */
+ jne .Lfallback /* And use common-code variant if not. */
+ tmll %r3,3 /* Test if src is 4-byte aligned? */
+ jne .Lfallback /* And use common-code variant if not. */
+
+ lgr %r0,%r2 /* Save destination pointer for return. */
+
+ /* WCSLEN
+ r1 = loaded bytes (tmp)
+ r4 = zero byte index (tmp)
+ r2 = dst
+ */
+
+ vfenezf %v16,%v16,%v16 /* Find element not equal with zero search. */
+ vlgvb %r5,%v16,7 /* Load zero index or 16 if not found. */
+ clrjl %r5,%r1,.Llen_end /* Found zero within loaded bytes, end. */
+
+ /* Align s to 16 byte. */
+ risbgn %r1,%r2,60,128+63,0 /* %r3 = bits 60-63 of %r2 'and' 15. */
+ lghi %r5,16 /* current_len = 16. */
+ slr %r5,%r1 /* Compute bytes to 16bytes boundary. */
+
+ /* Find zero in 16byte aligned loop. */
+.Llen_loop:
+ vl %v16,0(%r5,%r2) /* Load s. */
+ vfenezfs %v16,%v16,%v16 /* Find element not equal with zero search. */
+ je .Llen_found /* Jump away if zero was found. */
+ vl %v16,16(%r5,%r2)
+ vfenezfs %v16,%v16,%v16
+ je .Llen_found16
+ vl %v16,32(%r5,%r2)
+ vfenezfs %v16,%v16,%v16
+ je .Llen_found32
+ vl %v16,48(%r5,%r2)
+ vfenezfs %v16,%v16,%v16
+ je .Llen_found48
+
+ aghi %r5,64
+ j .Llen_loop /* No zero -> loop. */
+
+.Llen_found48:
+ aghi %r5,16
+.Llen_found32:
+ aghi %r5,16
+.Llen_found16:
+ aghi %r5,16
+.Llen_found:
+ vlgvb %r4,%v16,7 /* Load byte index of zero. */
+ algr %r5,%r4
+
+.Llen_end:
+ /* WCSCPY
+ %r1 = loaded bytes (tmp)
+ %r4 = zero byte index (tmp)
+ %r3 = curr src pointer
+ %r2 = curr dst pointer
+ */
+ la %r2,0(%r5,%r2) /* strcpy at end of dst-string. */
+
+ vlbb %v16,0(%r3),6 /* Load s until next 4k-byte boundary. */
+ lcbb %r1,0(%r3),6 /* Get bytes to 4k-byte boundary or 16. */
+
+ vfenezf %v17,%v16,%v16 /* Find element not equal with zero search. */
+ vlgvb %r5,%v17,7 /* Load zero index or 16 if not found. */
+ clrjl %r5,%r1,.Lcpy_found_align /* If found zero within loaded bytes,
+ copy bytes before and return. */
+
+ /* Align s to 16 byte. */
+ risbgn %r4,%r3,60,128+63,0 /* %r3 = bits 60-63 of %r2 'and' 15. */
+ lghi %r5,15 /* current_len = 15. */
+ slr %r5,%r4 /* Compute highest index to 16byte boundary. */
+
+ vstl %v16,%r5,0(%r2) /* Copy loaded characters - no zero. */
+ ahi %r5,1 /* Start loop at next character. */
+
+ /* Find zero in 16byte aligned loop. */
+.Lcpy_loop:
+ vl %v16,0(%r5,%r3) /* Load s. */
+ vfenezfs %v17,%v16,%v16 /* Find element not equal with zero search. */
+ je .Lcpy_found_v16_0 /* Jump away if zero was found. */
+ vl %v18,16(%r5,%r3) /* Load next part of s. */
+ vst %v16,0(%r5,%r2) /* Save previous part without zero to dst. */
+ vfenezfs %v17,%v18,%v18
+ je .Lcpy_found_v18_16
+ vl %v16,32(%r5,%r3)
+ vst %v18,16(%r5,%r2)
+ vfenezfs %v17,%v16,%v16
+ je .Lcpy_found_v16_32
+ vl %v18,48(%r5,%r3)
+ vst %v16,32(%r5,%r2)
+ vfenezfs %v17,%v18,%v18
+ je .Lcpy_found_v18_48
+ vst %v18,48(%r5,%r2)
+
+ aghi %r5,64
+ j .Lcpy_loop /* No zero -> loop. */
+
+.Lcpy_found_v16_32:
+ aghi %r5,32
+.Lcpy_found_v16_0:
+ la %r4,0(%r5,%r2)
+ vlgvb %r1,%v17,7 /* Load byte index of zero. */
+ aghi %r1,3 /* Also copy remaining bytes of zero. */
+ vstl %v16,%r1,0(%r4) /* Copy characters including zero. */
+ lgr %r2,%r0 /* Load saved dest-ptr. */
+ br %r14
+
+.Lcpy_found_v18_48:
+ aghi %r5,32
+.Lcpy_found_v18_16:
+ la %r4,16(%r5,%r2)
+ vlgvb %r1,%v17,7 /* Load byte index of zero. */
+ aghi %r1,3 /* Also copy remaining bytes of zero. */
+ vstl %v18,%r1,0(%r4) /* Copy characters including zero. */
+ lgr %r2,%r0 /* Load saved dest-ptr. */
+ br %r14
+
+.Lcpy_found_align:
+ aghi %r5,3 /* Also copy remaining bytes of found zero. */
+ vstl %v16,%r5,0(%r2) /* Copy characters including zero. */
+ lgr %r2,%r0 /* Load saved dest-ptr. */
+ br %r14
+.Lfallback:
+ jg WCSCAT_C
+END(WCSCAT_Z13)
+
+# if ! HAVE_WCSCAT_IFUNC
+strong_alias (WCSCAT_Z13, __wcscat)
+weak_alias (__wcscat, wcscat)
+# endif
+#endif
diff --git a/sysdeps/s390/wcscat.c b/sysdeps/s390/wcscat.c
new file mode 100644
index 0000000..3741210
--- /dev/null
+++ b/sysdeps/s390/wcscat.c
@@ -0,0 +1,39 @@
+/* Multiple versions of wcscat.
+ 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_WCSCAT_IFUNC
+# include
+# include
+
+# if HAVE_WCSCAT_C
+extern __typeof (__wcscat) WCSCAT_C attribute_hidden;
+# endif
+
+# if HAVE_WCSCAT_Z13
+extern __typeof (__wcscat) WCSCAT_Z13 attribute_hidden;
+# endif
+
+s390_libc_ifunc_expr (__wcscat, __wcscat,
+ (HAVE_WCSCAT_Z13 && (hwcap & HWCAP_S390_VX))
+ ? WCSCAT_Z13
+ : WCSCAT_DEFAULT
+ )
+weak_alias (__wcscat, wcscat)
+#endif