From e222d37df5df01d2216a18ad945670a783e93840 Mon Sep 17 00:00:00 2001 From: Packit Date: Aug 21 2020 09:20:57 +0000 Subject: Apply patch glibc-rh1659438-32.patch patch_name: glibc-rh1659438-32.patch location_in_specfile: 125 present_in_specfile: true --- diff --git a/sysdeps/s390/Makefile b/sysdeps/s390/Makefile index 092d558..816b2fc 100644 --- a/sysdeps/s390/Makefile +++ b/sysdeps/s390/Makefile @@ -52,5 +52,6 @@ sysdep_routines += bzero memset memset-z900 \ strrchr strrchr-vx strrchr-c \ strspn strspn-vx strspn-c \ strpbrk strpbrk-vx strpbrk-c \ - strcspn strcspn-vx strcspn-c + strcspn strcspn-vx strcspn-c \ + memchr memchr-vx memchr-z900 endif diff --git a/sysdeps/s390/ifunc-memchr.h b/sysdeps/s390/ifunc-memchr.h new file mode 100644 index 0000000..5d1327b --- /dev/null +++ b/sysdeps/s390/ifunc-memchr.h @@ -0,0 +1,52 @@ +/* memchr 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_MEMCHR_IFUNC 1 +#else +# define HAVE_MEMCHR_IFUNC 0 +#endif + +#ifdef HAVE_S390_VX_ASM_SUPPORT +# define HAVE_MEMCHR_IFUNC_AND_VX_SUPPORT HAVE_MEMCHR_IFUNC +#else +# define HAVE_MEMCHR_IFUNC_AND_VX_SUPPORT 0 +#endif + +#if defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT +# define MEMCHR_DEFAULT MEMCHR_Z13 +# define HAVE_MEMCHR_Z900_G5 0 +# define HAVE_MEMCHR_Z13 1 +#else +# define MEMCHR_DEFAULT MEMCHR_Z900_G5 +# define HAVE_MEMCHR_Z900_G5 1 +# define HAVE_MEMCHR_Z13 HAVE_MEMCHR_IFUNC_AND_VX_SUPPORT +#endif + +#if HAVE_MEMCHR_Z900_G5 +# define MEMCHR_Z900_G5 __memchr_default +#else +# define MEMCHR_Z900_G5 NULL +#endif + +#if HAVE_MEMCHR_Z13 +# define MEMCHR_Z13 __memchr_vx +#else +# define MEMCHR_Z13 NULL +#endif diff --git a/sysdeps/s390/memchr-vx.S b/sysdeps/s390/memchr-vx.S new file mode 100644 index 0000000..274e797 --- /dev/null +++ b/sysdeps/s390/memchr-vx.S @@ -0,0 +1,163 @@ +/* Vector optimized 32/64 bit S/390 version of memchr. + 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_MEMCHR_Z13 + +# include "sysdep.h" +# include "asm-syntax.h" + + .text + +/* void *memchr (const void *s, int c, size_t n) + Scans memory for character c + and returns pointer to first c. + + Register usage: + -r0=tmp + -r1=tmp + -r2=s + -r3=c + -r4=n + -r5=current_len + -v16=part of s + -v17=index of found c + -v18=c replicated +*/ +ENTRY(MEMCHR_Z13) + + .machine "z13" + .machinemode "zarch_nohighgprs" + +# if !defined __s390x__ + llgfr %r4,%r4 +# endif /* !defined __s390x__ */ + + clgije %r4,0,.Lnf_end /* If len == 0 then exit. */ + + vlbb %v16,0(%r2),6 /* Load s until next 4k-byte boundary. */ + lcbb %r0,0(%r2),6 /* Get bytes to 4k-byte boundary or 16. */ + llgfr %r0,%r0 /* Convert 32bit to 64bit. */ + + vlvgb %v18,%r3,0 /* Generate vector which elements are all c. + if c > 255, c will be truncated. */ + vrepb %v18,%v18,0 + lghi %r5,16 /* current_len = 16. */ + + clgrjhe %r0,%r4,.Llastcmp /* If (bytes to boundary) >= n, + jump to lastcmp. */ + + vfeebs %v17,%v16,%v18 /* Find c. */ + vlgvb %r1,%v17,7 /* Load byte index of c. */ + clgrjl %r1,%r0,.Lfound2 /* Found c is within loaded bytes. */ + + /* Align s to 16 byte. */ + risbgn %r1,%r2,60,128+63,0 /* %r3 = bits 60-63 of %r2 'and' 15. */ + slr %r5,%r1 /* Compute bytes to 16bytes boundary. */ + + lgr %r0,%r5 /* If %r5 + 64 < n? -> loop64. */ + aghi %r0,64 + clgrjl %r0,%r4,.Lloop64 +.Llt64: + vl %v16,0(%r5,%r2) + aghi %r5,16 + clgrjhe %r5,%r4,.Llastcmp /* Do last compare if curr-len >= n. */ + vfeebs %v17,%v16,%v18 /* Find c. */ + jl .Lfound /* Jump away if c was found. */ + + vl %v16,0(%r5,%r2) + aghi %r5,16 + clgrjhe %r5,%r4,.Llastcmp + vfeebs %v17,%v16,%v18 + jl .Lfound + + vl %v16,0(%r5,%r2) + aghi %r5,16 + clgrjhe %r5,%r4,.Llastcmp + vfeebs %v17,%v16,%v18 + jl .Lfound + + vl %v16,0(%r5,%r2) + aghi %r5,16 + +.Llastcmp: + /* Use comparision result only if located within first n characters. + %r5: current_len; + %r4: n; + (current_len - n): [0...16[ + first ignored match index: vr-width - (current_len - n) ]0...16] + */ + vfeebs %v17,%v16,%v18 /* Find c. */ + slgrk %r4,%r5,%r4 /* %r5 = current_len - n. */ + lghi %r0,16 /* Register width = 16. */ + vlgvb %r1,%v17,7 /* Extract found index or 16 if all equal. */ + slr %r0,%r4 /* %r0 = first ignored match index. */ + clrjl %r1,%r0,.Lfound2 /* Go away if miscompare is below n bytes. */ + /* c not found within n-bytes. */ +.Lnf_end: + lghi %r2,0 /* Return null. */ + br %r14 + +.Lfound48: + aghi %r5,16 +.Lfound32: + aghi %r5,16 +.Lfound16: + aghi %r5,16 +.Lfound0: + aghi %r5,16 +.Lfound: + vlgvb %r1,%v17,7 /* Load byte index of c. */ +.Lfound2: + slgfi %r5,16 /* current_len -=16 */ + algr %r5,%r1 /* Zero byte index is added to current len. */ + la %r2,0(%r5,%r2) /* Return pointer to c. */ + br %r14 + + +.Lloop64: + vl %v16,0(%r5,%r2) + vfeebs %v17,%v16,%v18 /* Find c. */ + jl .Lfound0 /* Jump away if c was found. */ + vl %v16,16(%r5,%r2) + vfeebs %v17,%v16,%v18 + jl .Lfound16 + vl %v16,32(%r5,%r2) + vfeebs %v17,%v16,%v18 + jl .Lfound32 + vl %v16,48(%r5,%r2) + vfeebs %v17,%v16,%v18 + jl .Lfound48 + + aghi %r5,64 + lgr %r0,%r5 /* If %r5 + 64 < n? -> loop64. */ + aghi %r0,64 + clgrjl %r0,%r4,.Lloop64 + + j .Llt64 +END(MEMCHR_Z13) + +# if ! HAVE_MEMCHR_IFUNC +strong_alias (MEMCHR_Z13, __memchr) +weak_alias (__memchr, memchr) +# endif + +# if ! HAVE_MEMCHR_Z900_G5 && defined SHARED && IS_IN (libc) +strong_alias (MEMCHR_Z13, __GI_memchr) +# endif +#endif diff --git a/sysdeps/s390/memchr-z900.S b/sysdeps/s390/memchr-z900.S new file mode 100644 index 0000000..c016bc4 --- /dev/null +++ b/sysdeps/s390/memchr-z900.S @@ -0,0 +1,63 @@ +/* Search a character in a block of memory. 31/64 bit S/390 version. + Copyright (C) 2001-2018 Free Software Foundation, Inc. + Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com). + 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 + . */ + +/* INPUT PARAMETERS + %r2 = address to memory area + %r3 = character to find + %r4 = number of bytes to search. */ + +#include +#include "sysdep.h" +#include "asm-syntax.h" + +#if HAVE_MEMCHR_Z900_G5 +# if defined __s390x__ +# define SLGR slgr +# define LGHI lghi +# define NGR ngr +# define LGR lgr +# else +# define SLGR slr +# define LGHI lhi +# define NGR nr +# define LGR lr +# endif /* ! defined __s390x__ */ + + .text +ENTRY(MEMCHR_Z900_G5) + LGHI %r0,0xff + NGR %r0,%r3 + LGR %r1,%r2 + la %r2,0(%r4,%r1) +0: srst %r2,%r1 + jo 0b + brc 13,1f + SLGR %r2,%r2 +1: br %r14 +END(MEMCHR_Z900_G5) + +# if ! HAVE_MEMCHR_IFUNC +strong_alias (MEMCHR_Z900_G5, __memchr) +weak_alias (__memchr, memchr) +# endif + +# if defined SHARED && IS_IN (libc) +strong_alias (MEMCHR_Z900_G5, __GI_memchr) +# endif +#endif diff --git a/sysdeps/s390/memchr.c b/sysdeps/s390/memchr.c new file mode 100644 index 0000000..490f1b6 --- /dev/null +++ b/sysdeps/s390/memchr.c @@ -0,0 +1,41 @@ +/* Multiple versions of memchr. + 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_MEMCHR_IFUNC +# define memchr __redirect_memchr +# include +# undef memchr +# include + +# if HAVE_MEMCHR_Z900_G5 +extern __typeof (__redirect_memchr) MEMCHR_Z900_G5 attribute_hidden; +# endif + +# if HAVE_MEMCHR_Z13 +extern __typeof (__redirect_memchr) MEMCHR_Z13 attribute_hidden; +# endif + +s390_libc_ifunc_expr (__redirect_memchr, __memchr, + (HAVE_MEMCHR_Z13 && (hwcap & HWCAP_S390_VX)) + ? MEMCHR_Z13 + : MEMCHR_DEFAULT + ) +weak_alias (__memchr, memchr) +#endif diff --git a/sysdeps/s390/multiarch/Makefile b/sysdeps/s390/multiarch/Makefile index 1578f21..fa1f7b8 100644 --- a/sysdeps/s390/multiarch/Makefile +++ b/sysdeps/s390/multiarch/Makefile @@ -1,6 +1,5 @@ ifeq ($(subdir),string) -sysdep_routines += memchr memchr-vx \ - rawmemchr rawmemchr-vx rawmemchr-c \ +sysdep_routines += rawmemchr rawmemchr-vx rawmemchr-c \ memccpy memccpy-vx memccpy-c \ memrchr memrchr-vx memrchr-c endif diff --git a/sysdeps/s390/multiarch/ifunc-impl-list.c b/sysdeps/s390/multiarch/ifunc-impl-list.c index 2d48c99..b4be014 100644 --- a/sysdeps/s390/multiarch/ifunc-impl-list.c +++ b/sysdeps/s390/multiarch/ifunc-impl-list.c @@ -42,6 +42,7 @@ #include #include #include +#include /* Maximum number of IFUNC implementations. */ #define MAX_IFUNC 3 @@ -372,6 +373,18 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, ) #endif /* HAVE_STRCSPN_IFUNC */ +#if HAVE_MEMCHR_IFUNC + IFUNC_IMPL (i, name, memchr, +# if HAVE_MEMCHR_Z13 + IFUNC_IMPL_ADD (array, i, memchr, + dl_hwcap & HWCAP_S390_VX, MEMCHR_Z13) +# endif +# if HAVE_MEMCHR_Z900_G5 + IFUNC_IMPL_ADD (array, i, memchr, 1, MEMCHR_Z900_G5) +# endif + ) +#endif /* HAVE_MEMCHR_IFUNC */ + #ifdef HAVE_S390_VX_ASM_SUPPORT # define IFUNC_VX_IMPL(FUNC) \ @@ -412,7 +425,6 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, IFUNC_VX_IMPL (wcscspn); - IFUNC_VX_IMPL (memchr); IFUNC_VX_IMPL (wmemchr); IFUNC_VX_IMPL (rawmemchr); diff --git a/sysdeps/s390/multiarch/memchr-vx.S b/sysdeps/s390/multiarch/memchr-vx.S deleted file mode 100644 index 77d31e0..0000000 --- a/sysdeps/s390/multiarch/memchr-vx.S +++ /dev/null @@ -1,159 +0,0 @@ -/* Vector optimized 32/64 bit S/390 version of memchr. - 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 - -/* void *memchr (const void *s, int c, size_t n) - Scans memory for character c - and returns pointer to first c. - - Register usage: - -r0=tmp - -r1=tmp - -r2=s - -r3=c - -r4=n - -r5=current_len - -v16=part of s - -v17=index of found c - -v18=c replicated -*/ -ENTRY(__memchr_vx) - - .machine "z13" - .machinemode "zarch_nohighgprs" - -# if !defined __s390x__ - llgfr %r4,%r4 -# endif /* !defined __s390x__ */ - - clgije %r4,0,.Lnf_end /* If len == 0 then exit. */ - - vlbb %v16,0(%r2),6 /* Load s until next 4k-byte boundary. */ - lcbb %r0,0(%r2),6 /* Get bytes to 4k-byte boundary or 16. */ - llgfr %r0,%r0 /* Convert 32bit to 64bit. */ - - vlvgb %v18,%r3,0 /* Generate vector which elements are all c. - if c > 255, c will be truncated. */ - vrepb %v18,%v18,0 - lghi %r5,16 /* current_len = 16. */ - - clgrjhe %r0,%r4,.Llastcmp /* If (bytes to boundary) >= n, - jump to lastcmp. */ - - vfeebs %v17,%v16,%v18 /* Find c. */ - vlgvb %r1,%v17,7 /* Load byte index of c. */ - clgrjl %r1,%r0,.Lfound2 /* Found c is within loaded bytes. */ - - /* Align s to 16 byte. */ - risbgn %r1,%r2,60,128+63,0 /* %r3 = bits 60-63 of %r2 'and' 15. */ - slr %r5,%r1 /* Compute bytes to 16bytes boundary. */ - - lgr %r0,%r5 /* If %r5 + 64 < n? -> loop64. */ - aghi %r0,64 - clgrjl %r0,%r4,.Lloop64 -.Llt64: - vl %v16,0(%r5,%r2) - aghi %r5,16 - clgrjhe %r5,%r4,.Llastcmp /* Do last compare if curr-len >= n. */ - vfeebs %v17,%v16,%v18 /* Find c. */ - jl .Lfound /* Jump away if c was found. */ - - vl %v16,0(%r5,%r2) - aghi %r5,16 - clgrjhe %r5,%r4,.Llastcmp - vfeebs %v17,%v16,%v18 - jl .Lfound - - vl %v16,0(%r5,%r2) - aghi %r5,16 - clgrjhe %r5,%r4,.Llastcmp - vfeebs %v17,%v16,%v18 - jl .Lfound - - vl %v16,0(%r5,%r2) - aghi %r5,16 - -.Llastcmp: - /* Use comparision result only if located within first n characters. - %r5: current_len; - %r4: n; - (current_len - n): [0...16[ - first ignored match index: vr-width - (current_len - n) ]0...16] - */ - vfeebs %v17,%v16,%v18 /* Find c. */ - slgrk %r4,%r5,%r4 /* %r5 = current_len - n. */ - lghi %r0,16 /* Register width = 16. */ - vlgvb %r1,%v17,7 /* Extract found index or 16 if all equal. */ - slr %r0,%r4 /* %r0 = first ignored match index. */ - clrjl %r1,%r0,.Lfound2 /* Go away if miscompare is below n bytes. */ - /* c not found within n-bytes. */ -.Lnf_end: - lghi %r2,0 /* Return null. */ - br %r14 - -.Lfound48: - aghi %r5,16 -.Lfound32: - aghi %r5,16 -.Lfound16: - aghi %r5,16 -.Lfound0: - aghi %r5,16 -.Lfound: - vlgvb %r1,%v17,7 /* Load byte index of c. */ -.Lfound2: - slgfi %r5,16 /* current_len -=16 */ - algr %r5,%r1 /* Zero byte index is added to current len. */ - la %r2,0(%r5,%r2) /* Return pointer to c. */ - br %r14 - - -.Lloop64: - vl %v16,0(%r5,%r2) - vfeebs %v17,%v16,%v18 /* Find c. */ - jl .Lfound0 /* Jump away if c was found. */ - vl %v16,16(%r5,%r2) - vfeebs %v17,%v16,%v18 - jl .Lfound16 - vl %v16,32(%r5,%r2) - vfeebs %v17,%v16,%v18 - jl .Lfound32 - vl %v16,48(%r5,%r2) - vfeebs %v17,%v16,%v18 - jl .Lfound48 - - aghi %r5,64 - lgr %r0,%r5 /* If %r5 + 64 < n? -> loop64. */ - aghi %r0,64 - clgrjl %r0,%r4,.Lloop64 - - j .Llt64 -END(__memchr_vx) - -# define memchr __memchr_c -# undef libc_hidden_builtin_def -# define libc_hidden_builtin_def(name) strong_alias(__memchr_c, __GI_memchr) -#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */ - -#include diff --git a/sysdeps/s390/multiarch/memchr.c b/sysdeps/s390/multiarch/memchr.c deleted file mode 100644 index 3885eba..0000000 --- a/sysdeps/s390/multiarch/memchr.c +++ /dev/null @@ -1,27 +0,0 @@ -/* Multiple versions of memchr. - 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 memchr __redirect_memchr -# include -# undef memchr -# include - -s390_vx_libc_ifunc2_redirected (__redirect_memchr, __memchr, memchr) - -#endif diff --git a/sysdeps/s390/s390-32/memchr.S b/sysdeps/s390/s390-32/memchr.S deleted file mode 100644 index 54f9b85..0000000 --- a/sysdeps/s390/s390-32/memchr.S +++ /dev/null @@ -1,41 +0,0 @@ -/* Search a character in a block of memory. For IBM S390 - Copyright (C) 2000-2018 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com). - - 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 - . */ - -/* - * R2 = address to memory area - * R3 = character to find - * R4 = number of bytes to search - */ - -#include "sysdep.h" -#include "asm-syntax.h" - - .text -ENTRY(memchr) - lhi %r0,0xff - nr %r0,%r3 - lr %r1,%r2 - la %r2,0(%r4,%r1) -0: srst %r2,%r1 - jo 0b - brc 13,1f - slr %r2,%r2 -1: br %r14 -END(memchr) -libc_hidden_builtin_def (memchr) diff --git a/sysdeps/s390/s390-32/multiarch/memchr.c b/sysdeps/s390/s390-32/multiarch/memchr.c deleted file mode 100644 index 5e1610a..0000000 --- a/sysdeps/s390/s390-32/multiarch/memchr.c +++ /dev/null @@ -1,21 +0,0 @@ -/* Multiple versions of memchr. - 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 - . */ - -/* This wrapper-file is needed, because otherwise file - sysdeps/s390/s390-[32|64]/memchr.S will be used. */ -#include diff --git a/sysdeps/s390/s390-64/memchr.S b/sysdeps/s390/s390-64/memchr.S deleted file mode 100644 index a19fcaf..0000000 --- a/sysdeps/s390/s390-64/memchr.S +++ /dev/null @@ -1,40 +0,0 @@ -/* Search a character in a block of memory. 64 bit S/390 version. - Copyright (C) 2001-2018 Free Software Foundation, Inc. - Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com). - 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 - . */ - -/* INPUT PARAMETERS - %r2 = address to memory area - %r3 = character to find - %r4 = number of bytes to search. */ - -#include "sysdep.h" -#include "asm-syntax.h" - - .text -ENTRY(memchr) - lghi %r0,0xff - ngr %r0,%r3 - lgr %r1,%r2 - la %r2,0(%r4,%r1) -0: srst %r2,%r1 - jo 0b - brc 13,1f - slgr %r2,%r2 -1: br %r14 -END(memchr) -libc_hidden_builtin_def (memchr) diff --git a/sysdeps/s390/s390-64/multiarch/memchr.c b/sysdeps/s390/s390-64/multiarch/memchr.c deleted file mode 100644 index 5e1610a..0000000 --- a/sysdeps/s390/s390-64/multiarch/memchr.c +++ /dev/null @@ -1,21 +0,0 @@ -/* Multiple versions of memchr. - 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 - . */ - -/* This wrapper-file is needed, because otherwise file - sysdeps/s390/s390-[32|64]/memchr.S will be used. */ -#include