diff --git a/sysdeps/s390/Makefile b/sysdeps/s390/Makefile
index de2d5e5..cb5dc1d 100644
--- a/sysdeps/s390/Makefile
+++ b/sysdeps/s390/Makefile
@@ -43,5 +43,6 @@ sysdep_routines += bzero memset memset-z900 \
stpcpy stpcpy-vx stpcpy-c \
strncpy strncpy-vx strncpy-z900 \
stpncpy stpncpy-vx stpncpy-c \
- strcat strcat-vx strcat-c
+ strcat strcat-vx strcat-c \
+ strncat strncat-vx strncat-c
endif
diff --git a/sysdeps/s390/ifunc-strncat.h b/sysdeps/s390/ifunc-strncat.h
new file mode 100644
index 0000000..bb164dc
--- /dev/null
+++ b/sysdeps/s390/ifunc-strncat.h
@@ -0,0 +1,52 @@
+/* strncat 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_STRNCAT_IFUNC 1
+#else
+# define HAVE_STRNCAT_IFUNC 0
+#endif
+
+#ifdef HAVE_S390_VX_ASM_SUPPORT
+# define HAVE_STRNCAT_IFUNC_AND_VX_SUPPORT HAVE_STRNCAT_IFUNC
+#else
+# define HAVE_STRNCAT_IFUNC_AND_VX_SUPPORT 0
+#endif
+
+#if defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT
+# define STRNCAT_DEFAULT STRNCAT_Z13
+# define HAVE_STRNCAT_C 0
+# define HAVE_STRNCAT_Z13 1
+#else
+# define STRNCAT_DEFAULT STRNCAT_C
+# define HAVE_STRNCAT_C 1
+# define HAVE_STRNCAT_Z13 HAVE_STRNCAT_IFUNC_AND_VX_SUPPORT
+#endif
+
+#if HAVE_STRNCAT_C
+# define STRNCAT_C __strncat_c
+#else
+# define STRNCAT_C NULL
+#endif
+
+#if HAVE_STRNCAT_Z13
+# define STRNCAT_Z13 __strncat_vx
+#else
+# define STRNCAT_Z13 NULL
+#endif
diff --git a/sysdeps/s390/multiarch/Makefile b/sysdeps/s390/multiarch/Makefile
index 9b66237..24be3ea 100644
--- a/sysdeps/s390/multiarch/Makefile
+++ b/sysdeps/s390/multiarch/Makefile
@@ -1,6 +1,5 @@
ifeq ($(subdir),string)
-sysdep_routines += strncat strncat-vx strncat-c \
- strcmp strcmp-vx \
+sysdep_routines += strcmp strcmp-vx \
strncmp strncmp-vx strncmp-c \
strchr strchr-vx strchr-c \
strchrnul strchrnul-vx strchrnul-c \
diff --git a/sysdeps/s390/multiarch/ifunc-impl-list.c b/sysdeps/s390/multiarch/ifunc-impl-list.c
index 1b7f3df..3abcaf0 100644
--- a/sysdeps/s390/multiarch/ifunc-impl-list.c
+++ b/sysdeps/s390/multiarch/ifunc-impl-list.c
@@ -33,6 +33,7 @@
#include
#include
#include
+#include
/* Maximum number of IFUNC implementations. */
#define MAX_IFUNC 3
@@ -255,6 +256,18 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
)
#endif /* HAVE_STRCAT_IFUNC */
+#if HAVE_STRNCAT_IFUNC
+ IFUNC_IMPL (i, name, strncat,
+# if HAVE_STRNCAT_Z13
+ IFUNC_IMPL_ADD (array, i, strncat,
+ dl_hwcap & HWCAP_S390_VX, STRNCAT_Z13)
+# endif
+# if HAVE_STRNCAT_C
+ IFUNC_IMPL_ADD (array, i, strncat, 1, STRNCAT_C)
+# endif
+ )
+#endif /* HAVE_STRNCAT_IFUNC */
+
#ifdef HAVE_S390_VX_ASM_SUPPORT
# define IFUNC_VX_IMPL(FUNC) \
@@ -277,7 +290,6 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
IFUNC_VX_IMPL (wcscat);
- IFUNC_VX_IMPL (strncat);
IFUNC_VX_IMPL (wcsncat);
IFUNC_VX_IMPL (strcmp);
diff --git a/sysdeps/s390/multiarch/strncat-c.c b/sysdeps/s390/multiarch/strncat-c.c
deleted file mode 100644
index 9e6c245..0000000
--- a/sysdeps/s390/multiarch/strncat-c.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Default strncat 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 STRNCAT __strncat_c
-# define STRNCAT_PRIMARY
-# include
-#endif
diff --git a/sysdeps/s390/multiarch/strncat-vx.S b/sysdeps/s390/multiarch/strncat-vx.S
deleted file mode 100644
index e6584d0..0000000
--- a/sysdeps/s390/multiarch/strncat-vx.S
+++ /dev/null
@@ -1,239 +0,0 @@
-/* Vector optimized 32/64 bit S/390 version of strncat.
- 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
-
-/* char * strncat (const char *dest, const char *src, size_t n)
- Concatenate two strings - at most n characters of src.
-
- Register usage:
- -r0=saved dest pointer for return
- -r1=tmp
- -r2=dest
- -r3=src
- -r4=n
- -r5=current_len
- -r6=tmp
- -r7=tmp
- -v16=part of src
- -v17=index of zero
- -v18=part of src
- -v31=register save area for r6, r7
-*/
-ENTRY(__strncat_vx)
- .machine "z13"
- .machinemode "zarch_nohighgprs"
-
-# if !defined __s390x__
- llgfr %r4,%r4
-# endif /* !defined __s390x__ */
-
- clgfi %r4,0
- ber %r14 /* Nothing to do, if n == 0. */
- lgr %r0,%r2 /* Save destination pointer for return. */
- vlvgp %v31,%r6,%r7 /* Save registers. */
-
- /* STRLEN
- %r1 = loaded bytes (tmp)
- %r6 = zero byte index (tmp)
- %r2 = dst
- */
- 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. */
-
- vfenezb %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. */
- vfenezbs %v16,%v16,%v16 /* Find element not equal with zero search. */
- je .Llen_found /* Jump away if zero was found. */
- vl %v16,16(%r5,%r2)
- vfenezbs %v16,%v16,%v16
- je .Llen_found16
- vl %v16,32(%r5,%r2)
- vfenezbs %v16,%v16,%v16
- je .Llen_found32
- vl %v16,48(%r5,%r2)
- vfenezbs %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 %r1,%v16,7 /* Load byte index of zero. */
- algr %r5,%r1
-
-.Llen_end:
- /* STRCPY
- %r1 = zero byte index (tmp)
- %r6 = loaded bytes (tmp)
- %r3 = curr src pointer
- %r2 = curr dst pointer
- %r7 = border, tmp
- */
- la %r2,0(%r5,%r2) /* strcpy at end of dst-string. */
-
- vlbb %v16,0(%r3),6 /* Load s until next 4k-byte boundary. */
- lcbb %r6,0(%r3),6 /* Get bytes to 4k-byte boundary or 16. */
- llgfr %r6,%r6 /* Convert 32bit to 64bit. */
-
- lghi %r5,0 /* current_len = 0. */
-
- clgrjle %r4,%r6,.Lcpy_remaining_v16 /* If n <= loaded-bytes
- -> process remaining. */
-
- /* n > loaded-byte-count. */
- vfenezb %v17,%v16,%v16 /* Find element not equal with zero search. */
- vlgvb %r1,%v17,7 /* Load zero index or 16 if not found. */
- clrjl %r1,%r6,.Lcpy_found_v16_store /* Found zero within loaded
- bytes, copy and return. */
-
- /* Align s to 16 byte. */
- risbgn %r7,%r3,60,128+63,0 /* %r3 = bits 60-63 of %r2 'and' 15. */
- lghi %r5,15 /* current_len = 15. */
- slr %r5,%r7 /* Compute highest index to 16byte boundary. */
-
- /* Zero not found and n > loaded-byte-count. */
- vstl %v16,%r5,0(%r2) /* Copy loaded characters - no zero. */
- ahi %r5,1 /* Start loop at next character. */
-
- /*
- Now we are 16byte aligned, so we can load a full vreg
- without page fault.
- */
- lgr %r1,%r5 /* If %r5 + 64 < maxlen? -> loop64. */
- aghi %r1,64
- clgrjl %r1,%r4,.Lcpy_loop64
-
- vl %v16,0(%r5,%r3) /* Load s. */
- clgijl %r4,17,.Lcpy_remaining_v16 /* If n <=16,
- process remaining bytes. */
-.Lcpy_lt64:
- lgr %r7,%r4
- slgfi %r7,16 /* border_len = n - 16. */
-
- /* If current_len >= border then process remaining bytes. */
- clgrjhe %r5,%r7,.Lcpy_remaining_v16
- vfenezbs %v17,%v16,%v16 /* Find element not equal with zero search. */
- je .Lcpy_found_v16 /* Jump away if zero was found. */
- vl %v18,16(%r5,%r3) /* Load next part of s. */
- vst %v16,0(%r5,%r2) /* Store previous part without zero to dst. */
- aghi %r5,16
-
- clgrjhe %r5,%r7,.Lcpy_remaining_v18
- vfenezbs %v17,%v18,%v18
- je .Lcpy_found_v18
- vl %v16,16(%r5,%r3)
- vst %v18,0(%r5,%r2)
- aghi %r5,16
-
- clgrjhe %r5,%r7,.Lcpy_remaining_v16
- vfenezbs %v17,%v16,%v16
- je .Lcpy_found_v16
- vl %v18,16(%r5,%r3)
- vst %v16,0(%r5,%r2)
- aghi %r5,16
-
-.Lcpy_remaining_v18:
- vlr %v16,%v18
-.Lcpy_remaining_v16:
- /* v16 contains the remaining bytes [1...16].
- Store remaining bytes and append string-termination. */
- vfenezb %v17,%v16,%v16 /* Find element not equal with zero search. */
- slgrk %r7,%r4,%r5 /* Remaining bytes = maxlen - current_len. */
- aghi %r7,-1 /* vstl needs highest index. */
- vlgvb %r1,%v17,7 /* Load zero index or 16 if not found. */
- la %r2,0(%r5,%r2) /* vstl has no index register. */
- /* Zero-index within remaining-bytes, store up to zero and end. */
- clgrjle %r1,%r7,.Lcpy_found_v16_store
- vstl %v16,%r7,0(%r2) /* Store remaining bytes. */
- lghi %r1,0
- stc %r1,1(%r7,%r2) /* Store string-null-termination beyond n. */
-.Lcpy_end:
- /* Restore saved registers. */
- vlgvg %r6,%v31,0
- vlgvg %r7,%v31,1
- lgr %r2,%r0 /* Load saved dest-ptr. */
- br %r14
-
-.Lcpy_found_v16_32:
- aghi %r5,32
- j .Lcpy_found_v16
-.Lcpy_found_v18_48:
- aghi %r5,32
-.Lcpy_found_v18_16:
- aghi %r5,16
-.Lcpy_found_v18:
- vlr %v16,%v18
-.Lcpy_found_v16:
- /* v16 contains a zero. Store remaining bytes to zero. current_len
- has not reached border, thus checking for n is not needed! */
- vlgvb %r1,%v17,7 /* Load byte index of zero. */
- la %r2,0(%r5,%r2)
-.Lcpy_found_v16_store:
- vstl %v16,%r1,0(%r2) /* Copy characters including zero. */
- j .Lcpy_end
-
- /* Find zero in 16byte aligned loop. */
-.Lcpy_loop64:
- vl %v16,0(%r5,%r3) /* Load s. */
- vfenezbs %v17,%v16,%v16 /* Find element not equal with zero search. */
- je .Lcpy_found_v16 /* Jump away if zero was found. */
- vl %v18,16(%r5,%r3) /* Load next part of s. */
- vst %v16,0(%r5,%r2) /* Store previous part without zero to dst. */
- vfenezbs %v17,%v18,%v18
- je .Lcpy_found_v18_16
- vl %v16,32(%r5,%r3)
- vst %v18,16(%r5,%r2)
- vfenezbs %v17,%v16,%v16
- je .Lcpy_found_v16_32
- vl %v18,48(%r5,%r3)
- vst %v16,32(%r5,%r2)
- vfenezbs %v17,%v18,%v18
- je .Lcpy_found_v18_48
- vst %v18,48(%r5,%r2)
-
- aghi %r5,64
- lgr %r1,%r5 /* If %r5 + 64 < maxlen? -> loop64. */
- aghi %r1,64
- clgrjl %r1,%r4,.Lcpy_loop64
-
- vl %v16,0(%r5,%r3) /* Load s. */
- j .Lcpy_lt64
-END(__strncat_vx)
-#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */
diff --git a/sysdeps/s390/multiarch/strncat.c b/sysdeps/s390/multiarch/strncat.c
deleted file mode 100644
index 94b8dff..0000000
--- a/sysdeps/s390/multiarch/strncat.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Multiple versions of strncat.
- 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 (__strncat, strncat)
-
-#else
-# include
-#endif /* !(defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)) */
diff --git a/sysdeps/s390/strncat-c.c b/sysdeps/s390/strncat-c.c
new file mode 100644
index 0000000..86df898
--- /dev/null
+++ b/sysdeps/s390/strncat-c.c
@@ -0,0 +1,27 @@
+/* Default strncat 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_STRNCAT_C
+# if HAVE_STRNCAT_IFUNC
+# define STRNCAT STRNCAT_C
+# define STRNCAT_PRIMARY
+# endif
+# include
+#endif
diff --git a/sysdeps/s390/strncat-vx.S b/sysdeps/s390/strncat-vx.S
new file mode 100644
index 0000000..76345e7
--- /dev/null
+++ b/sysdeps/s390/strncat-vx.S
@@ -0,0 +1,252 @@
+/* Vector optimized 32/64 bit S/390 version of strncat.
+ 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_STRNCAT_Z13
+
+# include "sysdep.h"
+# include "asm-syntax.h"
+
+ .text
+
+/* char * strncat (const char *dest, const char *src, size_t n)
+ Concatenate two strings - at most n characters of src.
+
+ Register usage:
+ -r0=saved dest pointer for return
+ -r1=tmp
+ -r2=dest
+ -r3=src
+ -r4=n
+ -r5=current_len
+ -r6=tmp
+ -r7=tmp
+ -v16=part of src
+ -v17=index of zero
+ -v18=part of src
+ -v31=register save area for r6, r7
+*/
+ENTRY(STRNCAT_Z13)
+ .machine "z13"
+ .machinemode "zarch_nohighgprs"
+
+# if !defined __s390x__
+ llgfr %r4,%r4
+# endif /* !defined __s390x__ */
+
+ clgfi %r4,0
+ ber %r14 /* Nothing to do, if n == 0. */
+ lgr %r0,%r2 /* Save destination pointer for return. */
+ vlvgp %v31,%r6,%r7 /* Save registers. */
+
+ /* STRLEN
+ %r1 = loaded bytes (tmp)
+ %r6 = zero byte index (tmp)
+ %r2 = dst
+ */
+ 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. */
+
+ vfenezb %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. */
+ vfenezbs %v16,%v16,%v16 /* Find element not equal with zero search. */
+ je .Llen_found /* Jump away if zero was found. */
+ vl %v16,16(%r5,%r2)
+ vfenezbs %v16,%v16,%v16
+ je .Llen_found16
+ vl %v16,32(%r5,%r2)
+ vfenezbs %v16,%v16,%v16
+ je .Llen_found32
+ vl %v16,48(%r5,%r2)
+ vfenezbs %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 %r1,%v16,7 /* Load byte index of zero. */
+ algr %r5,%r1
+
+.Llen_end:
+ /* STRCPY
+ %r1 = zero byte index (tmp)
+ %r6 = loaded bytes (tmp)
+ %r3 = curr src pointer
+ %r2 = curr dst pointer
+ %r7 = border, tmp
+ */
+ la %r2,0(%r5,%r2) /* strcpy at end of dst-string. */
+
+ vlbb %v16,0(%r3),6 /* Load s until next 4k-byte boundary. */
+ lcbb %r6,0(%r3),6 /* Get bytes to 4k-byte boundary or 16. */
+ llgfr %r6,%r6 /* Convert 32bit to 64bit. */
+
+ lghi %r5,0 /* current_len = 0. */
+
+ clgrjle %r4,%r6,.Lcpy_remaining_v16 /* If n <= loaded-bytes
+ -> process remaining. */
+
+ /* n > loaded-byte-count. */
+ vfenezb %v17,%v16,%v16 /* Find element not equal with zero search. */
+ vlgvb %r1,%v17,7 /* Load zero index or 16 if not found. */
+ clrjl %r1,%r6,.Lcpy_found_v16_store /* Found zero within loaded
+ bytes, copy and return. */
+
+ /* Align s to 16 byte. */
+ risbgn %r7,%r3,60,128+63,0 /* %r3 = bits 60-63 of %r2 'and' 15. */
+ lghi %r5,15 /* current_len = 15. */
+ slr %r5,%r7 /* Compute highest index to 16byte boundary. */
+
+ /* Zero not found and n > loaded-byte-count. */
+ vstl %v16,%r5,0(%r2) /* Copy loaded characters - no zero. */
+ ahi %r5,1 /* Start loop at next character. */
+
+ /*
+ Now we are 16byte aligned, so we can load a full vreg
+ without page fault.
+ */
+ lgr %r1,%r5 /* If %r5 + 64 < maxlen? -> loop64. */
+ aghi %r1,64
+ clgrjl %r1,%r4,.Lcpy_loop64
+
+ vl %v16,0(%r5,%r3) /* Load s. */
+ clgijl %r4,17,.Lcpy_remaining_v16 /* If n <=16,
+ process remaining bytes. */
+.Lcpy_lt64:
+ lgr %r7,%r4
+ slgfi %r7,16 /* border_len = n - 16. */
+
+ /* If current_len >= border then process remaining bytes. */
+ clgrjhe %r5,%r7,.Lcpy_remaining_v16
+ vfenezbs %v17,%v16,%v16 /* Find element not equal with zero search. */
+ je .Lcpy_found_v16 /* Jump away if zero was found. */
+ vl %v18,16(%r5,%r3) /* Load next part of s. */
+ vst %v16,0(%r5,%r2) /* Store previous part without zero to dst. */
+ aghi %r5,16
+
+ clgrjhe %r5,%r7,.Lcpy_remaining_v18
+ vfenezbs %v17,%v18,%v18
+ je .Lcpy_found_v18
+ vl %v16,16(%r5,%r3)
+ vst %v18,0(%r5,%r2)
+ aghi %r5,16
+
+ clgrjhe %r5,%r7,.Lcpy_remaining_v16
+ vfenezbs %v17,%v16,%v16
+ je .Lcpy_found_v16
+ vl %v18,16(%r5,%r3)
+ vst %v16,0(%r5,%r2)
+ aghi %r5,16
+
+.Lcpy_remaining_v18:
+ vlr %v16,%v18
+.Lcpy_remaining_v16:
+ /* v16 contains the remaining bytes [1...16].
+ Store remaining bytes and append string-termination. */
+ vfenezb %v17,%v16,%v16 /* Find element not equal with zero search. */
+ slgrk %r7,%r4,%r5 /* Remaining bytes = maxlen - current_len. */
+ aghi %r7,-1 /* vstl needs highest index. */
+ vlgvb %r1,%v17,7 /* Load zero index or 16 if not found. */
+ la %r2,0(%r5,%r2) /* vstl has no index register. */
+ /* Zero-index within remaining-bytes, store up to zero and end. */
+ clgrjle %r1,%r7,.Lcpy_found_v16_store
+ vstl %v16,%r7,0(%r2) /* Store remaining bytes. */
+ lghi %r1,0
+ stc %r1,1(%r7,%r2) /* Store string-null-termination beyond n. */
+.Lcpy_end:
+ /* Restore saved registers. */
+ vlgvg %r6,%v31,0
+ vlgvg %r7,%v31,1
+ lgr %r2,%r0 /* Load saved dest-ptr. */
+ br %r14
+
+.Lcpy_found_v16_32:
+ aghi %r5,32
+ j .Lcpy_found_v16
+.Lcpy_found_v18_48:
+ aghi %r5,32
+.Lcpy_found_v18_16:
+ aghi %r5,16
+.Lcpy_found_v18:
+ vlr %v16,%v18
+.Lcpy_found_v16:
+ /* v16 contains a zero. Store remaining bytes to zero. current_len
+ has not reached border, thus checking for n is not needed! */
+ vlgvb %r1,%v17,7 /* Load byte index of zero. */
+ la %r2,0(%r5,%r2)
+.Lcpy_found_v16_store:
+ vstl %v16,%r1,0(%r2) /* Copy characters including zero. */
+ j .Lcpy_end
+
+ /* Find zero in 16byte aligned loop. */
+.Lcpy_loop64:
+ vl %v16,0(%r5,%r3) /* Load s. */
+ vfenezbs %v17,%v16,%v16 /* Find element not equal with zero search. */
+ je .Lcpy_found_v16 /* Jump away if zero was found. */
+ vl %v18,16(%r5,%r3) /* Load next part of s. */
+ vst %v16,0(%r5,%r2) /* Store previous part without zero to dst. */
+ vfenezbs %v17,%v18,%v18
+ je .Lcpy_found_v18_16
+ vl %v16,32(%r5,%r3)
+ vst %v18,16(%r5,%r2)
+ vfenezbs %v17,%v16,%v16
+ je .Lcpy_found_v16_32
+ vl %v18,48(%r5,%r3)
+ vst %v16,32(%r5,%r2)
+ vfenezbs %v17,%v18,%v18
+ je .Lcpy_found_v18_48
+ vst %v18,48(%r5,%r2)
+
+ aghi %r5,64
+ lgr %r1,%r5 /* If %r5 + 64 < maxlen? -> loop64. */
+ aghi %r1,64
+ clgrjl %r1,%r4,.Lcpy_loop64
+
+ vl %v16,0(%r5,%r3) /* Load s. */
+ j .Lcpy_lt64
+END(STRNCAT_Z13)
+
+# if ! HAVE_STRNCAT_IFUNC
+strong_alias (STRNCAT_Z13, strncat)
+# endif
+
+# if ! HAVE_STRNCAT_C
+/* See string/strncat.c and define STRNCAT_PRIMARY. */
+strong_alias (STRNCAT_Z13, __strncat)
+# if defined SHARED && IS_IN (libc)
+strong_alias (__strncat, __GI___strncat)
+# endif
+# endif
+#endif
diff --git a/sysdeps/s390/strncat.c b/sysdeps/s390/strncat.c
new file mode 100644
index 0000000..b4b3656
--- /dev/null
+++ b/sysdeps/s390/strncat.c
@@ -0,0 +1,38 @@
+/* Multiple versions of strncat.
+ 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_STRNCAT_IFUNC
+# include
+# include
+
+# if HAVE_STRNCAT_C
+extern __typeof (__strncat) STRNCAT_C attribute_hidden;
+# endif
+
+# if HAVE_STRNCAT_Z13
+extern __typeof (__strncat) STRNCAT_Z13 attribute_hidden;
+# endif
+
+s390_libc_ifunc_expr (__strncat, strncat,
+ (HAVE_STRNCAT_Z13 && (hwcap & HWCAP_S390_VX))
+ ? STRNCAT_Z13
+ : STRNCAT_DEFAULT
+ )
+#endif