From 720eedf39639cc9fbbe9b380a48ce27b9f663091 Mon Sep 17 00:00:00 2001 From: Packit Service Date: Feb 24 2021 16:02:13 +0000 Subject: Apply patch glibc-rh1659438-16.patch patch_name: glibc-rh1659438-16.patch present_in_specfile: true location_in_specfile: 109 --- diff --git a/sysdeps/s390/Makefile b/sysdeps/s390/Makefile index 47d606d..600d8e6 100644 --- a/sysdeps/s390/Makefile +++ b/sysdeps/s390/Makefile @@ -36,5 +36,6 @@ sysdep_routines += bzero memset memset-z900 \ mempcpy memcpy memcpy-z900 \ memmove memmove-c \ strstr strstr-vx strstr-c \ - memmem memmem-vx memmem-c + memmem memmem-vx memmem-c \ + strlen strlen-vx strlen-c endif diff --git a/sysdeps/s390/ifunc-strlen.h b/sysdeps/s390/ifunc-strlen.h new file mode 100644 index 0000000..f207059 --- /dev/null +++ b/sysdeps/s390/ifunc-strlen.h @@ -0,0 +1,52 @@ +/* strlen 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_STRLEN_IFUNC 1 +#else +# define HAVE_STRLEN_IFUNC 0 +#endif + +#ifdef HAVE_S390_VX_ASM_SUPPORT +# define HAVE_STRLEN_IFUNC_AND_VX_SUPPORT HAVE_STRLEN_IFUNC +#else +# define HAVE_STRLEN_IFUNC_AND_VX_SUPPORT 0 +#endif + +#if defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT +# define STRLEN_DEFAULT STRLEN_Z13 +# define HAVE_STRLEN_C 0 +# define HAVE_STRLEN_Z13 1 +#else +# define STRLEN_DEFAULT STRLEN_C +# define HAVE_STRLEN_C 1 +# define HAVE_STRLEN_Z13 HAVE_STRLEN_IFUNC_AND_VX_SUPPORT +#endif + +#if HAVE_STRLEN_C +# define STRLEN_C __strlen_c +#else +# define STRLEN_C NULL +#endif + +#if HAVE_STRLEN_Z13 +# define STRLEN_Z13 __strlen_vx +#else +# define STRLEN_Z13 NULL +#endif diff --git a/sysdeps/s390/multiarch/Makefile b/sysdeps/s390/multiarch/Makefile index 24949cd..6015239 100644 --- a/sysdeps/s390/multiarch/Makefile +++ b/sysdeps/s390/multiarch/Makefile @@ -1,6 +1,5 @@ ifeq ($(subdir),string) -sysdep_routines += strlen strlen-vx strlen-c \ - strnlen strnlen-vx strnlen-c \ +sysdep_routines += strnlen strnlen-vx strnlen-c \ strcpy strcpy-vx \ stpcpy stpcpy-vx stpcpy-c \ strncpy strncpy-vx \ diff --git a/sysdeps/s390/multiarch/ifunc-impl-list.c b/sysdeps/s390/multiarch/ifunc-impl-list.c index da8696d..c531be4 100644 --- a/sysdeps/s390/multiarch/ifunc-impl-list.c +++ b/sysdeps/s390/multiarch/ifunc-impl-list.c @@ -26,6 +26,7 @@ #include #include #include +#include /* Maximum number of IFUNC implementations. */ #define MAX_IFUNC 3 @@ -164,6 +165,18 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, ) #endif /* HAVE_MEMMEM_IFUNC */ +#if HAVE_STRLEN_IFUNC + IFUNC_IMPL (i, name, strlen, +# if HAVE_STRLEN_Z13 + IFUNC_IMPL_ADD (array, i, strlen, + dl_hwcap & HWCAP_S390_VX, STRLEN_Z13) +# endif +# if HAVE_STRLEN_C + IFUNC_IMPL_ADD (array, i, strlen, 1, STRLEN_C) +# endif + ) +#endif /* HAVE_STRLEN_IFUNC */ + #ifdef HAVE_S390_VX_ASM_SUPPORT # define IFUNC_VX_IMPL(FUNC) \ @@ -172,7 +185,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 (strlen); IFUNC_VX_IMPL (wcslen); IFUNC_VX_IMPL (strnlen); diff --git a/sysdeps/s390/multiarch/strlen-c.c b/sysdeps/s390/multiarch/strlen-c.c deleted file mode 100644 index a2c8e43..0000000 --- a/sysdeps/s390/multiarch/strlen-c.c +++ /dev/null @@ -1,28 +0,0 @@ -/* Default strlen 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 STRLEN __strlen_c -# ifdef SHARED -# undef libc_hidden_builtin_def -# define libc_hidden_builtin_def(name) \ - __hidden_ver1 (__strlen_c, __GI_strlen, __strlen_c); -# endif /* SHARED */ - -# include -#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */ diff --git a/sysdeps/s390/multiarch/strlen-vx.S b/sysdeps/s390/multiarch/strlen-vx.S deleted file mode 100644 index 9308b33..0000000 --- a/sysdeps/s390/multiarch/strlen-vx.S +++ /dev/null @@ -1,84 +0,0 @@ -/* Vector optimized 32/64 bit S/390 version of strlen. - 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 - -/* size_t strlen (const char *s) - Returns length of string s. - - Register usage: - -r1=bytes to 4k-byte boundary - -r2=s - -r3=tmp - -r4=tmp - -r5=current_len and return_value - -v16=part of s -*/ -ENTRY(__strlen_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. */ - - vfenezb %v16,%v16,%v16 /* Find element not equal with zero search. */ - vlgvb %r4,%v16,7 /* Load zero index or 16 if not found. */ - clr %r4,%r1 /* If found zero within loaded bytes? */ - locgrl %r2,%r4 /* Then copy return value. */ - blr %r14 /* And return. */ - - /* Align s to 16 byte. */ - risbgn %r3,%r2,60,128+63,0 /* %r3 = bits 60-63 of %r2 'and' 15. */ - lghi %r5,16 /* current_len = 16. */ - slr %r5,%r3 /* Compute bytes to 16bytes boundary. */ - - /* Find zero in 16 byte aligned loop. */ -.Lloop: - vl %v16,0(%r5,%r2) /* Load s. */ - vfenezbs %v16,%v16,%v16 /* Find element not equal with zero search. */ - je .Lfound /* Jump away if zero was found. */ - vl %v16,16(%r5,%r2) - vfenezbs %v16,%v16,%v16 - je .Lfound16 - vl %v16,32(%r5,%r2) - vfenezbs %v16,%v16,%v16 - je .Lfound32 - vl %v16,48(%r5,%r2) - vfenezbs %v16,%v16,%v16 - je .Lfound48 - - aghi %r5,64 - j .Lloop /* No zero found -> loop. */ - -.Lfound48: - aghi %r5,16 -.Lfound32: - aghi %r5,16 -.Lfound16: - aghi %r5,16 -.Lfound: - vlgvb %r2,%v16,7 /* Load byte index of zero. */ - algr %r2,%r5 - br %r14 -END(__strlen_vx) -#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */ diff --git a/sysdeps/s390/multiarch/strlen.c b/sysdeps/s390/multiarch/strlen.c deleted file mode 100644 index 0edf8b7..0000000 --- a/sysdeps/s390/multiarch/strlen.c +++ /dev/null @@ -1,29 +0,0 @@ -/* Multiple versions of strlen. - 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 strlen __redirect_strlen -# include -# include -# undef strlen - -s390_vx_libc_ifunc2_redirected (__redirect_strlen, __strlen, strlen) - -#else -# include -#endif /* !(defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)) */ diff --git a/sysdeps/s390/strlen-c.c b/sysdeps/s390/strlen-c.c new file mode 100644 index 0000000..b456970 --- /dev/null +++ b/sysdeps/s390/strlen-c.c @@ -0,0 +1,32 @@ +/* Default strlen 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_STRLEN_C +# if HAVE_STRLEN_IFUNC +# define STRLEN STRLEN_C +# if defined SHARED && IS_IN (libc) +# undef libc_hidden_builtin_def +# define libc_hidden_builtin_def(name) \ + __hidden_ver1 (__strlen_c, __GI_strlen, __strlen_c); +# endif +# endif + +# include +#endif diff --git a/sysdeps/s390/strlen-vx.S b/sysdeps/s390/strlen-vx.S new file mode 100644 index 0000000..39ef431 --- /dev/null +++ b/sysdeps/s390/strlen-vx.S @@ -0,0 +1,93 @@ +/* Vector optimized 32/64 bit S/390 version of strlen. + 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_STRLEN_Z13 + +# include "sysdep.h" +# include "asm-syntax.h" + + .text + +/* size_t strlen (const char *s) + Returns length of string s. + + Register usage: + -r1=bytes to 4k-byte boundary + -r2=s + -r3=tmp + -r4=tmp + -r5=current_len and return_value + -v16=part of s +*/ +ENTRY(STRLEN_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. */ + + vfenezb %v16,%v16,%v16 /* Find element not equal with zero search. */ + vlgvb %r4,%v16,7 /* Load zero index or 16 if not found. */ + clr %r4,%r1 /* If found zero within loaded bytes? */ + locgrl %r2,%r4 /* Then copy return value. */ + blr %r14 /* And return. */ + + /* Align s to 16 byte. */ + risbgn %r3,%r2,60,128+63,0 /* %r3 = bits 60-63 of %r2 'and' 15. */ + lghi %r5,16 /* current_len = 16. */ + slr %r5,%r3 /* Compute bytes to 16bytes boundary. */ + + /* Find zero in 16 byte aligned loop. */ +.Lloop: + vl %v16,0(%r5,%r2) /* Load s. */ + vfenezbs %v16,%v16,%v16 /* Find element not equal with zero search. */ + je .Lfound /* Jump away if zero was found. */ + vl %v16,16(%r5,%r2) + vfenezbs %v16,%v16,%v16 + je .Lfound16 + vl %v16,32(%r5,%r2) + vfenezbs %v16,%v16,%v16 + je .Lfound32 + vl %v16,48(%r5,%r2) + vfenezbs %v16,%v16,%v16 + je .Lfound48 + + aghi %r5,64 + j .Lloop /* No zero found -> loop. */ + +.Lfound48: + aghi %r5,16 +.Lfound32: + aghi %r5,16 +.Lfound16: + aghi %r5,16 +.Lfound: + vlgvb %r2,%v16,7 /* Load byte index of zero. */ + algr %r2,%r5 + br %r14 +END(STRLEN_Z13) + +# if ! HAVE_STRLEN_IFUNC +strong_alias (STRLEN_Z13, strlen) +# endif + +# if ! HAVE_STRLEN_C && defined SHARED && IS_IN (libc) +strong_alias (STRLEN_Z13, __GI_strlen) +# endif +#endif diff --git a/sysdeps/s390/strlen.c b/sysdeps/s390/strlen.c new file mode 100644 index 0000000..6ba0fe8 --- /dev/null +++ b/sysdeps/s390/strlen.c @@ -0,0 +1,40 @@ +/* Multiple versions of strlen. + 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_STRLEN_IFUNC +# define strlen __redirect_strlen +# include +# include +# undef strlen + +# if HAVE_STRLEN_C +extern __typeof (__redirect_strlen) STRLEN_C attribute_hidden; +# endif + +# if HAVE_STRLEN_Z13 +extern __typeof (__redirect_strlen) STRLEN_Z13 attribute_hidden; +# endif + +s390_libc_ifunc_expr (__redirect_strlen, strlen, + (HAVE_STRLEN_Z13 && (hwcap & HWCAP_S390_VX)) + ? STRLEN_Z13 + : STRLEN_DEFAULT + ) +#endif