diff options
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/aarch64/bits/string.h | 24 | ||||
| -rw-r--r-- | sysdeps/i386/i686/multiarch/strncat-c.c | 7 | ||||
| -rw-r--r-- | sysdeps/i386/string-inlines.c | 185 | ||||
| -rw-r--r-- | sysdeps/m68k/m680x0/m68020/bits/string.h | 24 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc32/power4/multiarch/mempcpy.c | 3 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc64/multiarch/mempcpy.c | 3 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc64/multiarch/stpcpy.c | 1 | ||||
| -rw-r--r-- | sysdeps/s390/bits/string.h | 252 | ||||
| -rw-r--r-- | sysdeps/s390/multiarch/mempcpy.c | 4 | ||||
| -rw-r--r-- | sysdeps/s390/multiarch/strncat-c.c | 2 | ||||
| -rw-r--r-- | sysdeps/sparc/bits/string.h | 31 | ||||
| -rw-r--r-- | sysdeps/x86/bits/string.h | 1996 | ||||
| -rw-r--r-- | sysdeps/x86_64/multiarch/strncat-c.c | 7 |
13 files changed, 181 insertions, 2358 deletions
diff --git a/sysdeps/aarch64/bits/string.h b/sysdeps/aarch64/bits/string.h deleted file mode 100644 index 295eeb7be9..0000000000 --- a/sysdeps/aarch64/bits/string.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Optimized, inlined string functions. AArch64 version. - Copyright (C) 2015-2017 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 - <http://www.gnu.org/licenses/>. */ - -#ifndef _STRING_H -# error "Never use <bits/string.h> directly; include <string.h> instead." -#endif - -/* AArch64 uses the aligned string inline ABI. */ -#define _STRING_INLINE_unaligned 0 diff --git a/sysdeps/i386/i686/multiarch/strncat-c.c b/sysdeps/i386/i686/multiarch/strncat-c.c index 132a000545..aa58a61846 100644 --- a/sysdeps/i386/i686/multiarch/strncat-c.c +++ b/sysdeps/i386/i686/multiarch/strncat-c.c @@ -1,8 +1,3 @@ #define STRNCAT __strncat_ia32 -#ifdef SHARED -#undef libc_hidden_def -#define libc_hidden_def(name) \ - __hidden_ver1 (__strncat_ia32, __GI___strncat, __strncat_ia32); -#endif - +#define STRNCAT_PRIMARY #include "string/strncat.c" diff --git a/sysdeps/i386/string-inlines.c b/sysdeps/i386/string-inlines.c index d023bc3aa3..1a3cc84f2a 100644 --- a/sysdeps/i386/string-inlines.c +++ b/sysdeps/i386/string-inlines.c @@ -15,33 +15,194 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -/* This is to avoid PLT entries for the x86 version. */ -#define __memcpy_g __memcpy_g_internal -#define __strchr_g __strchr_g_internal #include <string/string-inlines.c> +#if SHLIB_COMPAT (libc, GLIBC_2_1_1, GLIBC_2_26) +/* Additional compatibility shims for the former + sysdeps/x86/bits/string.h. */ void * -(__memcpy_c) (void *d, const void *s, size_t n) +__old_memcpy_c (void *d, const void *s, size_t n) { return memcpy (d, s, n); } +strong_alias (__old_memcpy_c, __old_memcpy_g); +strong_alias (__old_memcpy_c, __old_memcpy_by4); +strong_alias (__old_memcpy_c, __old_memcpy_by2); +compat_symbol (libc, __old_memcpy_c, __memcpy_c, GLIBC_2_1_1); +compat_symbol (libc, __old_memcpy_g, __memcpy_g, GLIBC_2_1_1); +compat_symbol (libc, __old_memcpy_by4, __memcpy_by4, GLIBC_2_1_1); +compat_symbol (libc, __old_memcpy_by2, __memcpy_by2, GLIBC_2_1_1); void * -__memset_cc (void *s, unsigned long int pattern, size_t n) +__old_memset_cc (void *s, unsigned long int pattern, size_t n) { return memset (s, pattern & 0xff, n); } -strong_alias (__memset_cc, __memset_cg) +strong_alias (__old_memset_cc, __old_memset_cg); +strong_alias (__old_memset_cc, __old_memset_ccn_by2); +strong_alias (__old_memset_cc, __old_memset_ccn_by4); +compat_symbol (libc, __old_memset_cc, __memset_cc, GLIBC_2_1_1); +compat_symbol (libc, __old_memset_cg, __memset_cg, GLIBC_2_1_1); +compat_symbol (libc, __old_memset_ccn_by4, __memset_ccn_by4, GLIBC_2_1_1); +compat_symbol (libc, __old_memset_ccn_by2, __memset_ccn_by2, GLIBC_2_1_1); void * -__memset_gg (void *s, char c, size_t n) +__old_memset_gg (void *s, char c, size_t n) { return memset (s, c, n); } +strong_alias (__old_memset_gg, __old_memset_gcn_by4); +strong_alias (__old_memset_gg, __old_memset_gcn_by2); +compat_symbol (libc, __old_memset_gg, __memset_gg, GLIBC_2_1_1); +compat_symbol (libc, __old_memset_gcn_by4, __memset_gcn_by4, GLIBC_2_1_1); +compat_symbol (libc, __old_memset_gcn_by2, __memset_gcn_by2, GLIBC_2_1_1); + +size_t +__old_strlen_g (const char *str) +{ + return strlen (str); +} +compat_symbol (libc, __old_strlen_g, __strlen_g, GLIBC_2_1_1); + +char * +__old_strcpy_g (char *dest, const char *src) +{ + return strcpy (dest, src); +} +compat_symbol (libc, __old_strcpy_g, __strcpy_g, GLIBC_2_1_1); + +void * +__old_mempcpy_byn (void *dest, const void *src, size_t len) +{ + return __mempcpy (dest, src, len); +} +strong_alias (__old_mempcpy_byn, __old_mempcpy_by4); +strong_alias (__old_mempcpy_byn, __old_mempcpy_by2); +compat_symbol (libc, __old_mempcpy_byn, __mempcpy_byn, GLIBC_2_1_1); +compat_symbol (libc, __old_mempcpy_by4, __mempcpy_by4, GLIBC_2_1_1); +compat_symbol (libc, __old_mempcpy_by2, __mempcpy_by2, GLIBC_2_1_1); + +char * +__old_stpcpy_g (char *dest, const char *src) +{ + return __stpcpy (dest, src); +} +compat_symbol (libc, __old_stpcpy_g, __stpcpy_g, GLIBC_2_1_1); + +char * +__old_strncpy_byn (char *dest, const char *src, size_t srclen, size_t n) +{ + return strncpy (dest, src, n); +} +strong_alias (__old_strncpy_byn, __old_strncpy_by4); +strong_alias (__old_strncpy_byn, __old_strncpy_by2); +compat_symbol (libc, __old_strncpy_byn, __strncpy_byn, GLIBC_2_1_1); +compat_symbol (libc, __old_strncpy_by4, __strncpy_by4, GLIBC_2_1_1); +compat_symbol (libc, __old_strncpy_by2, __strncpy_by2, GLIBC_2_1_1); + +char * +__old_strncpy_gg (char *dest, const char *src, size_t n) +{ + return strncpy (dest, src, n); +} +compat_symbol (libc, __old_strncpy_gg, __strncpy_gg, GLIBC_2_1_1); + +/* __strcat_c took a third argument, which we ignore. */ +char * +__old_strcat_g (char *dest, const char *src) +{ + return strcat (dest, src); +} +strong_alias (__old_strcat_g, __old_strcat_c); +compat_symbol (libc, __old_strcat_g, __strcat_g, GLIBC_2_1_1); +compat_symbol (libc, __old_strcat_c, __strcat_c, GLIBC_2_1_1); + +char * +__old_strncat_g (char *dest, const char *src, size_t n) +{ + return __strncat (dest, src, n); +} +compat_symbol (libc, __old_strncat_g, __strncat_g, GLIBC_2_1_1); + +int +__old_strcmp_gg (const char *s1, const char *s2) +{ + return strcmp (s1, s2); +} +compat_symbol (libc, __old_strcmp_gg, __strcmp_gg, GLIBC_2_1_1); + +int +__old_strncmp_g (const char *s1, const char *s2, size_t n) +{ + return strncmp (s1, s2, n); +} +compat_symbol (libc, __old_strncmp_g, __strncmp_g, GLIBC_2_1_1); + +char * +__old_strchr_g (const char *s, int c) +{ + return strchr (s, c); +} +strong_alias (__old_strchr_g, __old_strchr_c); +compat_symbol (libc, __old_strchr_g, __strchr_g, GLIBC_2_1_1); +compat_symbol (libc, __old_strchr_c, __strchr_c, GLIBC_2_1_1); + +char * +__old_strchrnul_g (const char *s, int c) +{ + return __strchrnul (s, c); +} +strong_alias (__old_strchrnul_g, __old_strchrnul_c); +compat_symbol (libc, __old_strchrnul_g, __strchrnul_g, GLIBC_2_1_1); +compat_symbol (libc, __old_strchrnul_c, __strchrnul_c, GLIBC_2_1_1); + +char * +__old_strrchr_g (const char *s, int c) +{ + return strrchr (s, c); +} +strong_alias (__old_strrchr_g, __old_strrchr_c); +compat_symbol (libc, __old_strrchr_g, __strrchr_g, GLIBC_2_1_1); +compat_symbol (libc, __old_strrchr_c, __strrchr_c, GLIBC_2_1_1); + +/* __strcspn_cg took a third argument, which we ignore. */ +size_t +__old_strcspn_g (const char *s, const char *reject) +{ + return strcspn (s, reject); +} +strong_alias (__old_strcspn_g, __old_strcspn_cg); +compat_symbol (libc, __old_strcspn_g, __strcspn_g, GLIBC_2_1_1); +compat_symbol (libc, __old_strcspn_cg, __strcspn_cg, GLIBC_2_1_1); + +/* __strspn_cg took a third argument, which we ignore. */ +size_t +__old_strspn_g (const char *s, const char *accept) +{ + return strspn (s, accept); +} +strong_alias (__old_strspn_g, __old_strspn_cg); +compat_symbol (libc, __old_strspn_g, __strspn_g, GLIBC_2_1_1); +compat_symbol (libc, __old_strspn_cg, __strspn_cg, GLIBC_2_1_1); + +/* __strpbrk_cg took a third argument, which we ignore. */ +const char * +__old_strpbrk_g (const char *s, const char *accept) +{ + return strpbrk (s, accept); +} +strong_alias (__old_strpbrk_g, __old_strpbrk_cg); +compat_symbol (libc, __old_strpbrk_g, __strpbrk_g, GLIBC_2_1_1); +compat_symbol (libc, __old_strpbrk_cg, __strpbrk_cg, GLIBC_2_1_1); + +/* __strstr_cg took a third argument, which we ignore. */ +const char * +__old_strstr_g (const char *s, const char *accept) +{ + return strstr (s, accept); +} +strong_alias (__old_strstr_g, __old_strstr_cg); +compat_symbol (libc, __old_strstr_g, __strstr_g, GLIBC_2_1_1); +compat_symbol (libc, __old_strstr_cg, __strstr_cg, GLIBC_2_1_1); -#ifdef __memcpy_c -# undef __memcpy_g -strong_alias (__memcpy_g_internal, __memcpy_g) -# undef __strchr_g -strong_alias (__strchr_g_internal, __strchr_g) #endif diff --git a/sysdeps/m68k/m680x0/m68020/bits/string.h b/sysdeps/m68k/m680x0/m68020/bits/string.h deleted file mode 100644 index 120afc0d79..0000000000 --- a/sysdeps/m68k/m680x0/m68020/bits/string.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Optimized, inlined string functions. m680x0 version, x >= 2. - Copyright (C) 1997-2017 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 - <http://www.gnu.org/licenses/>. */ - -#ifndef _STRING_H -# error "Never use <bits/string.h> directly; include <string.h> instead." -#endif - -/* Use the unaligned string inline ABI. */ -#define _STRING_INLINE_unaligned 1 diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/mempcpy.c b/sysdeps/powerpc/powerpc32/power4/multiarch/mempcpy.c index 0c7250a4bf..21014b8e3d 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/mempcpy.c +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/mempcpy.c @@ -20,8 +20,7 @@ # define mempcpy __redirect_mempcpy # define __mempcpy __redirect___mempcpy # define NO_MEMPCPY_STPCPY_REDIRECT -/* Omit the mempcpy inline definitions because it would redefine mempcpy. */ -# define _HAVE_STRING_ARCH_mempcpy 1 +# define __NO_STRING_INLINES # include <string.h> # include <shlib-compat.h> # include "init-arch.h" diff --git a/sysdeps/powerpc/powerpc64/multiarch/mempcpy.c b/sysdeps/powerpc/powerpc64/multiarch/mempcpy.c index 430557ee0a..92391d3333 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/mempcpy.c +++ b/sysdeps/powerpc/powerpc64/multiarch/mempcpy.c @@ -20,8 +20,7 @@ # define mempcpy __redirect_mempcpy # define __mempcpy __redirect___mempcpy # define NO_MEMPCPY_STPCPY_REDIRECT -/* Omit the mempcpy inline definitions because it would redefine mempcpy. */ -# define _HAVE_STRING_ARCH_mempcpy 1 +# define __NO_STRING_INLINES # include <string.h> # include <shlib-compat.h> # include "init-arch.h" diff --git a/sysdeps/powerpc/powerpc64/multiarch/stpcpy.c b/sysdeps/powerpc/powerpc64/multiarch/stpcpy.c index 3e34e3cafe..aa01adba7b 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/stpcpy.c +++ b/sysdeps/powerpc/powerpc64/multiarch/stpcpy.c @@ -17,6 +17,7 @@ <http://www.gnu.org/licenses/>. */ #if defined SHARED && IS_IN (libc) +# define __NO_STRING_INLINES # define NO_MEMPCPY_STPCPY_REDIRECT # include <string.h> # include <shlib-compat.h> diff --git a/sysdeps/s390/bits/string.h b/sysdeps/s390/bits/string.h deleted file mode 100644 index 1e794f925d..0000000000 --- a/sysdeps/s390/bits/string.h +++ /dev/null @@ -1,252 +0,0 @@ -/* Optimized, inlined string functions. S/390 version. - Copyright (C) 2000-2017 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 - <http://www.gnu.org/licenses/>. */ - -#ifndef _STRING_H -# error "Never use <bits/string.h> directly; include <string.h> instead." -#endif - -/* Use the unaligned string inline ABI. */ -#define _STRING_INLINE_unaligned 1 - -/* We only provide optimizations if the user selects them and if - GNU CC is used. */ -#if !defined __NO_STRING_INLINES && defined __USE_STRING_INLINES \ - && defined __GNUC__ && __GNUC__ >= 2 - -#ifndef __STRING_INLINE -# ifndef __extern_inline -# define __STRING_INLINE inline -# else -# define __STRING_INLINE __extern_inline -# endif -#endif - -#define _HAVE_STRING_ARCH_strlen 1 -#ifndef _FORCE_INLINES -#define strlen(str) __strlen_g ((str)) - -__STRING_INLINE size_t __strlen_g (const char *) __asm__ ("strlen"); - -__STRING_INLINE size_t -__strlen_g (const char *__str) -{ - char *__ptr, *__tmp; - - __ptr = (char *) 0; - __tmp = (char *) __str; - __asm__ __volatile__ (" la 0,0\n" - "0: srst %0,%1\n" - " jo 0b\n" - : "+&a" (__ptr), "+&a" (__tmp) : - : "cc", "memory", "0" ); - return (size_t) (__ptr - __str); -} -#endif - -/* Copy SRC to DEST. */ -#define _HAVE_STRING_ARCH_strcpy 1 -#ifndef _FORCE_INLINES -#define strcpy(dest, src) __strcpy_g ((dest), (src)) - -__STRING_INLINE char *__strcpy_g (char *, const char *) __asm__ ("strcpy"); - -__STRING_INLINE char * -__strcpy_g (char *__dest, const char *__src) -{ - char *tmp = __dest; - - __asm__ __volatile__ (" la 0,0\n" - "0: mvst %0,%1\n" - " jo 0b" - : "+&a" (__dest), "+&a" (__src) : - : "cc", "memory", "0" ); - return tmp; -} -#endif - -#define _HAVE_STRING_ARCH_strncpy 1 -#ifndef _FORCE_INLINES -#define strncpy(dest, src, n) __strncpy_g ((dest), (src), (n)) - -__STRING_INLINE char *__strncpy_g (char *, const char *, size_t) - __asm__ ("strncpy"); - -__STRING_INLINE char * -__strncpy_g (char *__dest, const char *__src, size_t __n) -{ - char *__ret = __dest; - char *__ptr; - size_t __diff; - - if (__n > 0) { - __diff = (size_t) (__dest - __src); - __ptr = (char *) __src; - __asm__ __volatile__ (" j 1f\n" - "0: la %0,1(%0)\n" - "1: icm 0,1,0(%0)\n" - " stc 0,0(%2,%0)\n" - " jz 3f\n" -#if defined(__s390x__) - " brctg %1,0b\n" -#else - " brct %1,0b\n" -#endif - " j 4f\n" - "2: la %0,1(%0)\n" - " stc 0,0(%2,%0)\n" -#if defined(__s390x__) - "3: brctg %1,2b\n" -#else - "3: brct %1,2b\n" -#endif - "4:" - : "+&a" (__ptr), "+&a" (__n) : "a" (__diff) - : "cc", "memory", "0" ); - } - return __ret; -} -#endif - -/* Append SRC onto DEST. */ -#define _HAVE_STRING_ARCH_strcat 1 -#ifndef _FORCE_INLINES -#define strcat(dest, src) __strcat_g ((dest), (src)) - -__STRING_INLINE char *__strcat_g (char *, const char *) __asm__ ("strcat"); - -__STRING_INLINE char * -__strcat_g (char *__dest, const char *__src) -{ - char *__ret = __dest; - char *__ptr, *__tmp; - - /* Move __ptr to the end of __dest. */ - __ptr = (char *) 0; - __tmp = __dest; - __asm__ __volatile__ (" la 0,0\n" - "0: srst %0,%1\n" - " jo 0b\n" - : "+&a" (__ptr), "+&a" (__tmp) : - : "cc", "0" ); - - /* Now do the copy. */ - __asm__ __volatile__ (" la 0,0\n" - "0: mvst %0,%1\n" - " jo 0b" - : "+&a" (__ptr), "+&a" (__src) : - : "cc", "memory", "0" ); - return __ret; -} -#endif - -/* Append no more than N characters from SRC onto DEST. */ -#define _HAVE_STRING_ARCH_strncat 1 -#ifndef _FORCE_INLINES -#define strncat(dest, src, n) __strncat_g ((dest), (src), (n)) - -__STRING_INLINE char *__strncat_g (char *, const char *, size_t) - __asm__ ("strncat"); - -__STRING_INLINE char * -__strncat_g (char *__dest, const char *__src, size_t __n) -{ - char *__ret = __dest; - char *__ptr, *__tmp; - size_t __diff; - - if (__n > 0) { - /* Move __ptr to the end of __dest. */ - __ptr = (char *) 0; - __tmp = __dest; - __asm__ __volatile__ (" la 0,0\n" - "0: srst %0,%1\n" - " jo 0b\n" - : "+&a" (__ptr), "+&a" (__tmp) : - : "cc", "memory", "0" ); - - __diff = (size_t) (__ptr - __src); - __tmp = (char *) __src; - __asm__ __volatile__ (" j 1f\n" - "0: la %0,1(%0)\n" - "1: icm 0,1,0(%0)\n" - " stc 0,0(%2,%0)\n" - " jz 2f\n" -#if defined(__s390x__) - " brctg %1,0b\n" -#else - " brct %1,0b\n" -#endif - " slr 0,0\n" - " stc 0,1(%2,%0)\n" - "2:" - : "+&a" (__tmp), "+&a" (__n) : "a" (__diff) - : "cc", "memory", "0" ); - - } - return __ret; -} -#endif - -/* Search N bytes of S for C. */ -#define _HAVE_STRING_ARCH_memchr 1 -#ifndef _FORCE_INLINES -__STRING_INLINE void * -memchr (const void *__str, int __c, size_t __n) -{ - char *__ptr, *__tmp; - - __tmp = (char *) __str; - __ptr = (char *) __tmp + __n; - __asm__ __volatile__ (" lhi 0,0xff\n" - " nr 0,%2\n" - "0: srst %0,%1\n" - " jo 0b\n" - " brc 13,1f\n" - " la %0,0\n" - "1:" - : "+&a" (__ptr), "+&a" (__tmp) : "d" (__c) - : "cc", "memory", "0" ); - return __ptr; -} -#endif - -/* Compare S1 and S2. */ -#define _HAVE_STRING_ARCH_strcmp 1 -#ifndef _FORCE_INLINES -__STRING_INLINE int -strcmp (const char *__s1, const char *__s2) -{ - char *__p1, *__p2; - int __ret; - - __p1 = (char *) __s1; - __p2 = (char *) __s2; - __asm__ __volatile__ (" slr 0,0\n" - "0: clst %1,%2\n" - " jo 0b\n" - " ipm %0\n" - " srl %0,28" - : "=d" (__ret), "+&a" (__p1), "+&a" (__p2) : - : "cc", "memory", "0" ); - __ret = (__ret == 0) ? 0 : (__ret == 1) ? -1 : 1; - return __ret; -} -#endif - -#endif /* Use string inlines && GNU CC. */ diff --git a/sysdeps/s390/multiarch/mempcpy.c b/sysdeps/s390/multiarch/mempcpy.c index bf111a3aea..ba59062956 100644 --- a/sysdeps/s390/multiarch/mempcpy.c +++ b/sysdeps/s390/multiarch/mempcpy.c @@ -20,8 +20,8 @@ #if defined SHARED && IS_IN (libc) # define mempcpy __redirect_mempcpy # define __mempcpy __redirect___mempcpy -/* Omit the mempcpy inline definitions because it would redefine mempcpy. */ -# define _HAVE_STRING_ARCH_mempcpy 1 +# define __NO_STRING_INLINES +# define NO_MEMPCPY_STPCPY_REDIRECT # include <string.h> # undef mempcpy # undef __mempcpy diff --git a/sysdeps/s390/multiarch/strncat-c.c b/sysdeps/s390/multiarch/strncat-c.c index e72d778fb4..d894811e83 100644 --- a/sysdeps/s390/multiarch/strncat-c.c +++ b/sysdeps/s390/multiarch/strncat-c.c @@ -18,6 +18,6 @@ #if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) # define STRNCAT __strncat_c - +# define STRNCAT_PRIMARY # include <string/strncat.c> #endif diff --git a/sysdeps/sparc/bits/string.h b/sysdeps/sparc/bits/string.h deleted file mode 100644 index 4fd4e8d1de..0000000000 --- a/sysdeps/sparc/bits/string.h +++ /dev/null @@ -1,31 +0,0 @@ -/* Optimized, inlined string functions. SPARC version. - Copyright (C) 2000-2017 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. - |