From 6343421a8023f5c3821fecbe63535346e24039bf Mon Sep 17 00:00:00 2001 From: Packit Service Date: Jan 06 2021 22:38:39 +0000 Subject: Apply patch glibc-rh1659438-22.patch patch_name: glibc-rh1659438-22.patch present_in_specfile: true location_in_specfile: 115 --- diff --git a/sysdeps/s390/Makefile b/sysdeps/s390/Makefile index a9882b3..de2d5e5 100644 --- a/sysdeps/s390/Makefile +++ b/sysdeps/s390/Makefile @@ -42,5 +42,6 @@ sysdep_routines += bzero memset memset-z900 \ strcpy strcpy-vx strcpy-z900 \ stpcpy stpcpy-vx stpcpy-c \ strncpy strncpy-vx strncpy-z900 \ - stpncpy stpncpy-vx stpncpy-c + stpncpy stpncpy-vx stpncpy-c \ + strcat strcat-vx strcat-c endif diff --git a/sysdeps/s390/ifunc-strcat.h b/sysdeps/s390/ifunc-strcat.h new file mode 100644 index 0000000..6fd2f7d --- /dev/null +++ b/sysdeps/s390/ifunc-strcat.h @@ -0,0 +1,52 @@ +/* strcat 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_STRCAT_IFUNC 1 +#else +# define HAVE_STRCAT_IFUNC 0 +#endif + +#ifdef HAVE_S390_VX_ASM_SUPPORT +# define HAVE_STRCAT_IFUNC_AND_VX_SUPPORT HAVE_STRCAT_IFUNC +#else +# define HAVE_STRCAT_IFUNC_AND_VX_SUPPORT 0 +#endif + +#if defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT +# define STRCAT_DEFAULT STRCAT_Z13 +# define HAVE_STRCAT_C 0 +# define HAVE_STRCAT_Z13 1 +#else +# define STRCAT_DEFAULT STRCAT_C +# define HAVE_STRCAT_C 1 +# define HAVE_STRCAT_Z13 HAVE_STRCAT_IFUNC_AND_VX_SUPPORT +#endif + +#if HAVE_STRCAT_C +# define STRCAT_C __strcat_c +#else +# define STRCAT_C NULL +#endif + +#if HAVE_STRCAT_Z13 +# define STRCAT_Z13 __strcat_vx +#else +# define STRCAT_Z13 NULL +#endif diff --git a/sysdeps/s390/multiarch/Makefile b/sysdeps/s390/multiarch/Makefile index 3d97d21..9b66237 100644 --- a/sysdeps/s390/multiarch/Makefile +++ b/sysdeps/s390/multiarch/Makefile @@ -1,6 +1,5 @@ ifeq ($(subdir),string) -sysdep_routines += strcat strcat-vx strcat-c \ - strncat strncat-vx strncat-c \ +sysdep_routines += strncat strncat-vx strncat-c \ strcmp strcmp-vx \ strncmp strncmp-vx strncmp-c \ strchr strchr-vx strchr-c \ diff --git a/sysdeps/s390/multiarch/ifunc-impl-list.c b/sysdeps/s390/multiarch/ifunc-impl-list.c index 021e9f2..1b7f3df 100644 --- a/sysdeps/s390/multiarch/ifunc-impl-list.c +++ b/sysdeps/s390/multiarch/ifunc-impl-list.c @@ -32,6 +32,7 @@ #include #include #include +#include /* Maximum number of IFUNC implementations. */ #define MAX_IFUNC 3 @@ -242,6 +243,17 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, ) #endif /* HAVE_STPNCPY_IFUNC */ +#if HAVE_STRCAT_IFUNC + IFUNC_IMPL (i, name, strcat, +# if HAVE_STRCAT_Z13 + IFUNC_IMPL_ADD (array, i, strcat, + dl_hwcap & HWCAP_S390_VX, STRCAT_Z13) +# endif +# if HAVE_STRCAT_C + IFUNC_IMPL_ADD (array, i, strcat, 1, STRCAT_C) +# endif + ) +#endif /* HAVE_STRCAT_IFUNC */ #ifdef HAVE_S390_VX_ASM_SUPPORT @@ -263,7 +275,6 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, IFUNC_VX_IMPL (wcpncpy); - IFUNC_VX_IMPL (strcat); IFUNC_VX_IMPL (wcscat); IFUNC_VX_IMPL (strncat); diff --git a/sysdeps/s390/multiarch/strcat-c.c b/sysdeps/s390/multiarch/strcat-c.c deleted file mode 100644 index f871faa..0000000 --- a/sysdeps/s390/multiarch/strcat-c.c +++ /dev/null @@ -1,28 +0,0 @@ -/* Default strcat 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 STRCAT __strcat_c -# ifdef SHARED -# undef libc_hidden_builtin_def -# define libc_hidden_builtin_def(name) \ - __hidden_ver1 (__strcat_c, __GI_strcat, __strcat_c); -# endif /* SHARED */ - -# include -#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */ diff --git a/sysdeps/s390/multiarch/strcat-vx.S b/sysdeps/s390/multiarch/strcat-vx.S deleted file mode 100644 index 3abbbcc..0000000 --- a/sysdeps/s390/multiarch/strcat-vx.S +++ /dev/null @@ -1,161 +0,0 @@ -/* Vector optimized 32/64 bit S/390 version of strcat. - 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 * strcat (const char *dest, const char *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(__strcat_vx) - .machine "z13" - .machinemode "zarch_nohighgprs" - - lgr %r0,%r2 /* Save destination pointer for return. */ - - /* STRLEN - r1 = loaded bytes (tmp) - r4 = 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 %r4,%v16,7 /* Load byte index of zero. */ - algr %r5,%r4 - -.Llen_end: - /* STRCPY - %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. */ - - vfenezb %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. */ - vfenezbs %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) /* 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 - 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. */ - 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. */ - vstl %v18,%r1,0(%r4) /* Copy characters including zero. */ - lgr %r2,%r0 /* Load saved dest-ptr. */ - br %r14 - -.Lcpy_found_align: - vstl %v16,%r5,0(%r2) /* Copy characters including zero. */ - lgr %r2,%r0 /* Load saved dest-ptr. */ - br %r14 -END(__strcat_vx) -#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */ diff --git a/sysdeps/s390/multiarch/strcat.c b/sysdeps/s390/multiarch/strcat.c deleted file mode 100644 index 7d4126b..0000000 --- a/sysdeps/s390/multiarch/strcat.c +++ /dev/null @@ -1,29 +0,0 @@ -/* Multiple versions of strcat. - 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 strcat __redirect_strcat -# include -# undef strcat -# include - -s390_vx_libc_ifunc2_redirected (__redirect_strcat, __strcat, strcat) - -#else -# include -#endif /* !(defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)) */ diff --git a/sysdeps/s390/strcat-c.c b/sysdeps/s390/strcat-c.c new file mode 100644 index 0000000..7accc6c --- /dev/null +++ b/sysdeps/s390/strcat-c.c @@ -0,0 +1,32 @@ +/* Default strcat 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_STRCAT_C +# if HAVE_STRCAT_IFUNC +# define STRCAT STRCAT_C +# if defined SHARED && IS_IN (libc) +# undef libc_hidden_builtin_def +# define libc_hidden_builtin_def(name) \ + __hidden_ver1 (__strcat_c, __GI_strcat, __strcat_c); +# endif +# endif + +# include +#endif diff --git a/sysdeps/s390/strcat-vx.S b/sysdeps/s390/strcat-vx.S new file mode 100644 index 0000000..218e301 --- /dev/null +++ b/sysdeps/s390/strcat-vx.S @@ -0,0 +1,170 @@ +/* Vector optimized 32/64 bit S/390 version of strcat. + 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_STRCAT_Z13 + +# include "sysdep.h" +# include "asm-syntax.h" + + .text + +/* char * strcat (const char *dest, const char *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(STRCAT_Z13) + .machine "z13" + .machinemode "zarch_nohighgprs" + + lgr %r0,%r2 /* Save destination pointer for return. */ + + /* STRLEN + r1 = loaded bytes (tmp) + r4 = 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 %r4,%v16,7 /* Load byte index of zero. */ + algr %r5,%r4 + +.Llen_end: + /* STRCPY + %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. */ + + vfenezb %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. */ + vfenezbs %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) /* 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 + 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. */ + 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. */ + vstl %v18,%r1,0(%r4) /* Copy characters including zero. */ + lgr %r2,%r0 /* Load saved dest-ptr. */ + br %r14 + +.Lcpy_found_align: + vstl %v16,%r5,0(%r2) /* Copy characters including zero. */ + lgr %r2,%r0 /* Load saved dest-ptr. */ + br %r14 +END(STRCAT_Z13) + +# if ! HAVE_STRCAT_IFUNC +strong_alias (STRCAT_Z13, strcat) +# endif + +# if ! HAVE_STRCAT_C && defined SHARED && IS_IN (libc) +strong_alias (STRCAT_Z13, __GI_strcat) +# endif +#endif diff --git a/sysdeps/s390/strcat.c b/sysdeps/s390/strcat.c new file mode 100644 index 0000000..d378519 --- /dev/null +++ b/sysdeps/s390/strcat.c @@ -0,0 +1,40 @@ +/* Multiple versions of strcat. + 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_STRCAT_IFUNC +# define strcat __redirect_strcat +# include +# undef strcat +# include + +# if HAVE_STRCAT_C +extern __typeof (__redirect_strcat) STRCAT_C attribute_hidden; +# endif + +# if HAVE_STRCAT_Z13 +extern __typeof (__redirect_strcat) STRCAT_Z13 attribute_hidden; +# endif + +s390_libc_ifunc_expr (__redirect_strcat, strcat, + (HAVE_STRCAT_Z13 && (hwcap & HWCAP_S390_VX)) + ? STRCAT_Z13 + : STRCAT_DEFAULT + ) +#endif