From f2d8c8ec62c1e3c0ec03bf439a6e73e8944754ed Mon Sep 17 00:00:00 2001 From: Packit Service Date: Dec 08 2020 11:32:19 +0000 Subject: Apply patch glibc-rh1659438-54.patch patch_name: glibc-rh1659438-54.patch present_in_specfile: true location_in_specfile: 147 --- diff --git a/sysdeps/s390/Makefile b/sysdeps/s390/Makefile index f9a7127..3f7de66 100644 --- a/sysdeps/s390/Makefile +++ b/sysdeps/s390/Makefile @@ -77,5 +77,6 @@ sysdep_routines += wcslen wcslen-vx wcslen-c \ wcspbrk wcspbrk-vx wcspbrk-c \ wcscspn wcscspn-vx wcscspn-c \ wmemchr wmemchr-vx wmemchr-c \ - wmemset wmemset-vx wmemset-c + wmemset wmemset-vx wmemset-c \ + wmemcmp wmemcmp-vx wmemcmp-c endif diff --git a/sysdeps/s390/ifunc-wmemcmp.h b/sysdeps/s390/ifunc-wmemcmp.h new file mode 100644 index 0000000..1b38a01 --- /dev/null +++ b/sysdeps/s390/ifunc-wmemcmp.h @@ -0,0 +1,52 @@ +/* wmemcmp 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_WMEMCMP_IFUNC 1 +#else +# define HAVE_WMEMCMP_IFUNC 0 +#endif + +#ifdef HAVE_S390_VX_ASM_SUPPORT +# define HAVE_WMEMCMP_IFUNC_AND_VX_SUPPORT HAVE_WMEMCMP_IFUNC +#else +# define HAVE_WMEMCMP_IFUNC_AND_VX_SUPPORT 0 +#endif + +#if defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT +# define WMEMCMP_DEFAULT WMEMCMP_Z13 +# define HAVE_WMEMCMP_C 0 +# define HAVE_WMEMCMP_Z13 1 +#else +# define WMEMCMP_DEFAULT WMEMCMP_C +# define HAVE_WMEMCMP_C 1 +# define HAVE_WMEMCMP_Z13 HAVE_WMEMCMP_IFUNC_AND_VX_SUPPORT +#endif + +#if HAVE_WMEMCMP_C +# define WMEMCMP_C __wmemcmp_c +#else +# define WMEMCMP_C NULL +#endif + +#if HAVE_WMEMCMP_Z13 +# define WMEMCMP_Z13 __wmemcmp_vx +#else +# define WMEMCMP_Z13 NULL +#endif diff --git a/sysdeps/s390/multiarch/Makefile b/sysdeps/s390/multiarch/Makefile index cc6dd7a..fec3615 100644 --- a/sysdeps/s390/multiarch/Makefile +++ b/sysdeps/s390/multiarch/Makefile @@ -1,7 +1,3 @@ -ifeq ($(subdir),wcsmbs) -sysdep_routines += wmemcmp wmemcmp-vx wmemcmp-c -endif - ifeq ($(subdir),iconvdata) override define generate-8bit-table $(make-target-directory) diff --git a/sysdeps/s390/multiarch/ifunc-impl-list.c b/sysdeps/s390/multiarch/ifunc-impl-list.c index 7040959..177c5fd 100644 --- a/sysdeps/s390/multiarch/ifunc-impl-list.c +++ b/sysdeps/s390/multiarch/ifunc-impl-list.c @@ -64,6 +64,7 @@ #include #include #include +#include /* Maximum number of IFUNC implementations. */ #define MAX_IFUNC 3 @@ -658,17 +659,17 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, ) #endif /* HAVE_WMEMSET_IFUNC */ -#ifdef HAVE_S390_VX_ASM_SUPPORT - -# define IFUNC_VX_IMPL(FUNC) \ - IFUNC_IMPL (i, name, FUNC, \ - IFUNC_IMPL_ADD (array, i, FUNC, dl_hwcap & HWCAP_S390_VX, \ - __##FUNC##_vx) \ - IFUNC_IMPL_ADD (array, i, FUNC, 1, __##FUNC##_c)) - - IFUNC_VX_IMPL (wmemcmp); - -#endif /* HAVE_S390_VX_ASM_SUPPORT */ +#if HAVE_WMEMCMP_IFUNC + IFUNC_IMPL (i, name, wmemcmp, +# if HAVE_WMEMCMP_Z13 + IFUNC_IMPL_ADD (array, i, wmemcmp, + dl_hwcap & HWCAP_S390_VX, WMEMCMP_Z13) +# endif +# if HAVE_WMEMCMP_C + IFUNC_IMPL_ADD (array, i, wmemcmp, 1, WMEMCMP_C) +# endif + ) +#endif /* HAVE_WMEMCMP_IFUNC */ return i; } diff --git a/sysdeps/s390/multiarch/wmemcmp-c.c b/sysdeps/s390/multiarch/wmemcmp-c.c deleted file mode 100644 index 2fd39d5..0000000 --- a/sysdeps/s390/multiarch/wmemcmp-c.c +++ /dev/null @@ -1,26 +0,0 @@ -/* Default wmemcmp 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 WMEMCMP __wmemcmp_c - -# include -extern __typeof (wmemcmp) __wmemcmp_c; - -# include -#endif diff --git a/sysdeps/s390/multiarch/wmemcmp-vx.S b/sysdeps/s390/multiarch/wmemcmp-vx.S deleted file mode 100644 index e2fc21e..0000000 --- a/sysdeps/s390/multiarch/wmemcmp-vx.S +++ /dev/null @@ -1,149 +0,0 @@ -/* Vector Optimized 32/64 bit S/390 version of wmemcmp. - 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 - -/* int wmemcmp (const wchar_t *s1, const wchar_t *s2, size_t n) - Compare at most n characters of two wchar_t-arrays. - - Register usage: - -r0=tmp - -r1=number of blocks - -r2=s1 - -r3=s2 - -r4=n - -r5=current_len - -v16=part of s1 - -v17=part of s2 - -v18=index of unequal -*/ -ENTRY(__wmemcmp_vx) - .machine "z13" - .machinemode "zarch_nohighgprs" - -# if !defined __s390x__ - llgfr %r4,%r4 -# endif /* !defined __s390x__ */ - clgije %r4,0,.Lend_equal /* Nothing to do if n == 0. */ - - /* Check range of maxlen and convert to byte-count. */ -# ifdef __s390x__ - tmhh %r4,49152 /* Test bit 0 or 1 of maxlen. */ - lghi %r1,-4 /* Max byte-count is 18446744073709551612. */ -# else - tmlh %r4,49152 /* Test bit 0 or 1 of maxlen. */ - llilf %r1,4294967292 /* Max byte-count is 4294967292. */ -# endif /* !__s390x__ */ - sllg %r4,%r4,2 /* Convert character-count to byte-count. */ - locgrne %r4,%r1 /* Use max byte-count, if bit 0/1 was one. */ - - lghi %r5,0 /* current_len = 0. */ - - clgijh %r4,16,.Lgt16 - -.Lremaining: - aghi %r4,-1 /* vstl needs highest index. */ - vll %v16,%r4,0(%r2) - vll %v17,%r4,0(%r3) - vfenef %v18,%v16,%v17 /* Compare not equal. */ - vlgvb %r1,%v18,7 /* Load unequal index or 16 if not found. */ - clrj %r1,%r4,12,.Lfound2 /* r1 <= r4 -> unequal within loaded - bytes. */ - -.Lend_equal: - lghi %r2,0 - br %r14 - -.Lfound: - /* vfenezf found an unequal element or zero. - This instruction compares unsigned words, but wchar_t is signed. - Thus we have to compare the found element again. */ - vlgvb %r1,%v18,7 /* Extract not equal byte-index. */ -.Lfound2: - srl %r1,2 /* And convert it to character-index. */ - vlgvf %r0,%v16,0(%r1) /* Load character-values. */ - vlgvf %r1,%v17,0(%r1) - cr %r0,%r1 - je .Lend_equal - lghi %r2,1 - lghi %r1,-1 - locgrl %r2,%r1 - br %r14 - -.Lgt16: - clgijh %r4,64,.Lpreloop64 - -.Lpreloop16: - srlg %r1,%r4,4 /* Split into 16byte blocks */ -.Lloop16: - vl %v16,0(%r5,%r2) - vl %v17,0(%r5,%r3) - aghi %r5,16 - vfenefs %v18,%v16,%v17 /* Compare not equal. */ - jno .Lfound - brctg %r1,.Lloop16 /* Loop until all blocks are processed. */ - - llgfr %r4,%r4 - nilf %r4,15 /* Get remaining bytes */ - locgre %r2,%r4 - ber %r14 - la %r2,0(%r5,%r2) - la %r3,0(%r5,%r3) - j .Lremaining - -.Lpreloop64: - srlg %r1,%r4,6 /* Split into 64byte blocks */ -.Lloop64: - vl %v16,0(%r5,%r2) - vl %v17,0(%r5,%r3) - vfenefs %v18,%v16,%v17 /* Compare not equal. */ - jno .Lfound - - vl %v16,16(%r5,%r2) - vl %v17,16(%r5,%r3) - vfenefs %v18,%v16,%v17 - jno .Lfound - - vl %v16,32(%r5,%r2) - vl %v17,32(%r5,%r3) - vfenefs %v18,%v16,%v17 - jno .Lfound - - vl %v16,48(%r5,%r2) - vl %v17,48(%r5,%r3) - aghi %r5,64 - vfenefs %v18,%v16,%v17 - jno .Lfound - - brctg %r1,.Lloop64 /* Loop until all blocks are processed. */ - - llgfr %r4,%r4 - nilf %r4,63 /* Get remaining bytes */ - locgre %r2,%r4 - ber %r14 - clgijh %r4,16,.Lpreloop16 - la %r2,0(%r5,%r2) - la %r3,0(%r5,%r3) - j .Lremaining -END(__wmemcmp_vx) -#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */ diff --git a/sysdeps/s390/multiarch/wmemcmp.c b/sysdeps/s390/multiarch/wmemcmp.c deleted file mode 100644 index a4cb440..0000000 --- a/sysdeps/s390/multiarch/wmemcmp.c +++ /dev/null @@ -1,27 +0,0 @@ -/* Multiple versions of wmemcmp. - 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 (__wmemcmp, wmemcmp) - -#else -# include -#endif /* !(defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)) */ diff --git a/sysdeps/s390/wmemcmp-c.c b/sysdeps/s390/wmemcmp-c.c new file mode 100644 index 0000000..0c73636 --- /dev/null +++ b/sysdeps/s390/wmemcmp-c.c @@ -0,0 +1,27 @@ +/* Default wmemcmp 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_WMEMCMP_C +# if HAVE_WMEMCMP_IFUNC +# define WMEMCMP WMEMCMP_C +# endif + +# include +#endif diff --git a/sysdeps/s390/wmemcmp-vx.S b/sysdeps/s390/wmemcmp-vx.S new file mode 100644 index 0000000..87ae21b --- /dev/null +++ b/sysdeps/s390/wmemcmp-vx.S @@ -0,0 +1,154 @@ +/* Vector Optimized 32/64 bit S/390 version of wmemcmp. + 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_WMEMCMP_Z13 + +# include "sysdep.h" +# include "asm-syntax.h" + + .text + +/* int wmemcmp (const wchar_t *s1, const wchar_t *s2, size_t n) + Compare at most n characters of two wchar_t-arrays. + + Register usage: + -r0=tmp + -r1=number of blocks + -r2=s1 + -r3=s2 + -r4=n + -r5=current_len + -v16=part of s1 + -v17=part of s2 + -v18=index of unequal +*/ +ENTRY(WMEMCMP_Z13) + .machine "z13" + .machinemode "zarch_nohighgprs" + +# if !defined __s390x__ + llgfr %r4,%r4 +# endif /* !defined __s390x__ */ + clgije %r4,0,.Lend_equal /* Nothing to do if n == 0. */ + + /* Check range of maxlen and convert to byte-count. */ +# ifdef __s390x__ + tmhh %r4,49152 /* Test bit 0 or 1 of maxlen. */ + lghi %r1,-4 /* Max byte-count is 18446744073709551612. */ +# else + tmlh %r4,49152 /* Test bit 0 or 1 of maxlen. */ + llilf %r1,4294967292 /* Max byte-count is 4294967292. */ +# endif /* !__s390x__ */ + sllg %r4,%r4,2 /* Convert character-count to byte-count. */ + locgrne %r4,%r1 /* Use max byte-count, if bit 0/1 was one. */ + + lghi %r5,0 /* current_len = 0. */ + + clgijh %r4,16,.Lgt16 + +.Lremaining: + aghi %r4,-1 /* vstl needs highest index. */ + vll %v16,%r4,0(%r2) + vll %v17,%r4,0(%r3) + vfenef %v18,%v16,%v17 /* Compare not equal. */ + vlgvb %r1,%v18,7 /* Load unequal index or 16 if not found. */ + clrj %r1,%r4,12,.Lfound2 /* r1 <= r4 -> unequal within loaded + bytes. */ + +.Lend_equal: + lghi %r2,0 + br %r14 + +.Lfound: + /* vfenezf found an unequal element or zero. + This instruction compares unsigned words, but wchar_t is signed. + Thus we have to compare the found element again. */ + vlgvb %r1,%v18,7 /* Extract not equal byte-index. */ +.Lfound2: + srl %r1,2 /* And convert it to character-index. */ + vlgvf %r0,%v16,0(%r1) /* Load character-values. */ + vlgvf %r1,%v17,0(%r1) + cr %r0,%r1 + je .Lend_equal + lghi %r2,1 + lghi %r1,-1 + locgrl %r2,%r1 + br %r14 + +.Lgt16: + clgijh %r4,64,.Lpreloop64 + +.Lpreloop16: + srlg %r1,%r4,4 /* Split into 16byte blocks */ +.Lloop16: + vl %v16,0(%r5,%r2) + vl %v17,0(%r5,%r3) + aghi %r5,16 + vfenefs %v18,%v16,%v17 /* Compare not equal. */ + jno .Lfound + brctg %r1,.Lloop16 /* Loop until all blocks are processed. */ + + llgfr %r4,%r4 + nilf %r4,15 /* Get remaining bytes */ + locgre %r2,%r4 + ber %r14 + la %r2,0(%r5,%r2) + la %r3,0(%r5,%r3) + j .Lremaining + +.Lpreloop64: + srlg %r1,%r4,6 /* Split into 64byte blocks */ +.Lloop64: + vl %v16,0(%r5,%r2) + vl %v17,0(%r5,%r3) + vfenefs %v18,%v16,%v17 /* Compare not equal. */ + jno .Lfound + + vl %v16,16(%r5,%r2) + vl %v17,16(%r5,%r3) + vfenefs %v18,%v16,%v17 + jno .Lfound + + vl %v16,32(%r5,%r2) + vl %v17,32(%r5,%r3) + vfenefs %v18,%v16,%v17 + jno .Lfound + + vl %v16,48(%r5,%r2) + vl %v17,48(%r5,%r3) + aghi %r5,64 + vfenefs %v18,%v16,%v17 + jno .Lfound + + brctg %r1,.Lloop64 /* Loop until all blocks are processed. */ + + llgfr %r4,%r4 + nilf %r4,63 /* Get remaining bytes */ + locgre %r2,%r4 + ber %r14 + clgijh %r4,16,.Lpreloop16 + la %r2,0(%r5,%r2) + la %r3,0(%r5,%r3) + j .Lremaining +END(WMEMCMP_Z13) + +# if ! HAVE_WMEMCMP_IFUNC +strong_alias (WMEMCMP_Z13, wmemcmp) +# endif +#endif diff --git a/sysdeps/s390/wmemcmp.c b/sysdeps/s390/wmemcmp.c new file mode 100644 index 0000000..6c8ca5f --- /dev/null +++ b/sysdeps/s390/wmemcmp.c @@ -0,0 +1,38 @@ +/* Multiple versions of wmemcmp. + 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_WMEMCMP_IFUNC +# include +# include + +# if HAVE_WMEMCMP_C +extern __typeof (wmemcmp) WMEMCMP_C attribute_hidden; +# endif + +# if HAVE_WMEMCMP_Z13 +extern __typeof (wmemcmp) WMEMCMP_Z13 attribute_hidden; +# endif + +s390_libc_ifunc_expr (wmemcmp, wmemcmp, + (HAVE_WMEMCMP_Z13 && (hwcap & HWCAP_S390_VX)) + ? WMEMCMP_Z13 + : WMEMCMP_DEFAULT + ) +#endif