Remove bits/string.h.
These machine-dependent inline string functions have never been on by default, and even if they were a good idea at the time they were introduced, they haven't really been touched in ten to fifteen years and probably aren't a good idea on current-gen processors. Current thinking is that this class of optimization is best left to the compiler. * bits/string.h, string/bits/string.h * sysdeps/aarch64/bits/string.h * sysdeps/m68k/m680x0/m68020/bits/string.h * sysdeps/s390/bits/string.h, sysdeps/sparc/bits/string.h * sysdeps/x86/bits/string.h: Delete file. * string/string.h: Don't include bits/string.h. * string/bits/string3.h: Rename to bits/string_fortified.h. No need to undef various symbols that the removed headers might have defined as macros. * string/Makefile (headers): Remove bits/string.h, change bits/string3.h to bits/string_fortified.h. * string/string-inlines.c: Update commentary. Remove definitions of various macros that nothing looks at anymore. Don't directly include bits/string.h. Set _STRING_INLINE_unaligned here, based on compiler-predefined macros. * string/strncat.c: If STRNCAT is not defined, or STRNCAT_PRIMARY _is_ defined, provide internal hidden alias __strncat. * include/string.h: Declare internal hidden alias __strncat. Only forward __stpcpy to __builtin_stpcpy if __NO_STRING_INLINES is not defined. * include/bits/string3.h: Rename to bits/string_fortified.h, update to match above. * sysdeps/i386/string-inlines.c: Define compat symbols for everything formerly defined by sysdeps/x86/bits/string.h. Make existing definitions into compat symbols as well. Remove some no-longer-necessary messing around with macros. * sysdeps/powerpc/powerpc32/power4/multiarch/mempcpy.c * sysdeps/powerpc/powerpc64/multiarch/mempcpy.c * sysdeps/powerpc/powerpc64/multiarch/stpcpy.c * sysdeps/s390/multiarch/mempcpy.c No need to define _HAVE_STRING_ARCH_mempcpy. Do define __NO_STRING_INLINES and NO_MEMPCPY_STPCPY_REDIRECT. * sysdeps/i386/i686/multiarch/strncat-c.c * sysdeps/s390/multiarch/strncat-c.c * sysdeps/x86_64/multiarch/strncat-c.c Define STRNCAT_PRIMARY. Don't change definition of libc_hidden_def.
This commit is contained in:
Zack Weinberg
parent
b8216e8278
commit
09a596cc2c
43
ChangeLog
43
ChangeLog
|
|
@ -1,3 +1,46 @@
|
|||
2017-06-20 Zack Weinberg <zackw@panix.com>
|
||||
|
||||
* bits/string.h, string/bits/string.h
|
||||
* sysdeps/aarch64/bits/string.h
|
||||
* sysdeps/m68k/m680x0/m68020/bits/string.h
|
||||
* sysdeps/s390/bits/string.h, sysdeps/sparc/bits/string.h
|
||||
* sysdeps/x86/bits/string.h: Delete file.
|
||||
|
||||
* string/string.h: Don't include bits/string.h.
|
||||
* string/bits/string3.h: Rename to bits/string_fortified.h.
|
||||
No need to undef various symbols that the removed headers
|
||||
might have defined as macros.
|
||||
* string/Makefile (headers): Remove bits/string.h, change
|
||||
bits/string3.h to bits/string_fortified.h.
|
||||
* string/string-inlines.c: Update commentary. Remove definitions
|
||||
of various macros that nothing looks at anymore. Don't directly
|
||||
include bits/string.h. Set _STRING_INLINE_unaligned here, based on
|
||||
compiler-predefined macros.
|
||||
* string/strncat.c: If STRNCAT is not defined, or STRNCAT_PRIMARY
|
||||
_is_ defined, provide internal hidden alias __strncat.
|
||||
* include/string.h: Declare internal hidden alias __strncat.
|
||||
Only forward __stpcpy to __builtin_stpcpy if __NO_STRING_INLINES is
|
||||
not defined.
|
||||
* include/bits/string3.h: Rename to bits/string_fortified.h,
|
||||
update to match above.
|
||||
|
||||
* sysdeps/i386/string-inlines.c: Define compat symbols for
|
||||
everything formerly defined by sysdeps/x86/bits/string.h.
|
||||
Make existing definitions into compat symbols as well.
|
||||
Remove some no-longer-necessary messing around with macros.
|
||||
|
||||
* sysdeps/powerpc/powerpc32/power4/multiarch/mempcpy.c
|
||||
* sysdeps/powerpc/powerpc64/multiarch/mempcpy.c
|
||||
* sysdeps/powerpc/powerpc64/multiarch/stpcpy.c
|
||||
* sysdeps/s390/multiarch/mempcpy.c
|
||||
No need to define _HAVE_STRING_ARCH_mempcpy.
|
||||
Do define __NO_STRING_INLINES and NO_MEMPCPY_STPCPY_REDIRECT.
|
||||
|
||||
* sysdeps/i386/i686/multiarch/strncat-c.c
|
||||
* sysdeps/s390/multiarch/strncat-c.c
|
||||
* sysdeps/x86_64/multiarch/strncat-c.c
|
||||
Define STRNCAT_PRIMARY. Don't change definition of libc_hidden_def.
|
||||
|
||||
2017-06-20 Rical Jasan <ricaljasan@pacific.net>
|
||||
|
||||
* manual/lang.texi (LDBL_MANT_DIG): Add annotation.
|
||||
|
|
|
|||
|
|
@ -1,18 +0,0 @@
|
|||
/* This file should provide inline versions of string functions.
|
||||
|
||||
Surround GCC-specific parts with #ifdef __GNUC__, and use `__extern_inline'.
|
||||
|
||||
This file should define __STRING_INLINES if functions are actually defined
|
||||
as inlines. */
|
||||
|
||||
#ifndef _BITS_STRING_H
|
||||
#define _BITS_STRING_H 1
|
||||
|
||||
/* Define whether to use the unaligned string inline ABI.
|
||||
The string inline functions are an external ABI, thus cannot be changed
|
||||
after the first release of a new target (unlike _STRING_ARCH_unaligned
|
||||
which may be changed from release to release). Targets must support
|
||||
unaligned accesses in hardware if either define is set to true. */
|
||||
#define _STRING_INLINE_unaligned 0
|
||||
|
||||
#endif /* bits/string.h */
|
||||
|
|
@ -1 +0,0 @@
|
|||
#include <string/bits/string3.h>
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <string/bits/string_fortified.h>
|
||||
|
|
@ -76,12 +76,20 @@ extern __typeof (strncasecmp_l) __strncasecmp_l;
|
|||
#endif
|
||||
|
||||
libc_hidden_proto (__mempcpy)
|
||||
#ifndef __NO_STRING_INLINES
|
||||
# define __mempcpy(dest, src, n) __builtin_mempcpy (dest, src, n)
|
||||
#endif
|
||||
libc_hidden_proto (__stpcpy)
|
||||
#ifndef __NO_STRING_INLINES
|
||||
# define __stpcpy(dest, src) __builtin_stpcpy (dest, src)
|
||||
#endif
|
||||
libc_hidden_proto (__stpncpy)
|
||||
libc_hidden_proto (__rawmemchr)
|
||||
libc_hidden_proto (__strcasecmp)
|
||||
libc_hidden_proto (__strcasecmp_l)
|
||||
libc_hidden_proto (__strncasecmp_l)
|
||||
extern __typeof (strncat) __strncat;
|
||||
libc_hidden_proto (__strncat)
|
||||
libc_hidden_proto (__strdup)
|
||||
libc_hidden_proto (__strndup)
|
||||
libc_hidden_proto (__strerror_r)
|
||||
|
|
@ -162,11 +170,6 @@ extern __typeof (mempcpy) mempcpy __asm__ ("__mempcpy");
|
|||
extern __typeof (stpcpy) stpcpy __asm__ ("__stpcpy");
|
||||
#endif
|
||||
|
||||
/* Redirect internal calls to builtins. */
|
||||
#ifndef __stpcpy
|
||||
# define __stpcpy(dest, src) __builtin_stpcpy (dest, src)
|
||||
#endif
|
||||
|
||||
extern void *__memcpy_chk (void *__restrict __dest,
|
||||
const void *__restrict __src, size_t __len,
|
||||
size_t __destlen) __THROW;
|
||||
|
|
|
|||
|
|
@ -22,10 +22,11 @@ subdir := string
|
|||
|
||||
include ../Makeconfig
|
||||
|
||||
headers := string.h strings.h memory.h endian.h bits/endian.h \
|
||||
argz.h envz.h byteswap.h bits/byteswap.h bits/byteswap-16.h \
|
||||
bits/string.h bits/string3.h bits/strings_fortified.h \
|
||||
bits/uintn-identity.h
|
||||
headers := string.h bits/string_fortified.h \
|
||||
strings.h bits/strings_fortified.h \
|
||||
byteswap.h bits/byteswap.h bits/byteswap-16.h \
|
||||
endian.h bits/endian.h bits/uintn-identity.h \
|
||||
memory.h argz.h envz.h
|
||||
|
||||
routines := strcat strchr strcmp strcoll strcpy strcspn \
|
||||
strverscmp strdup strndup \
|
||||
|
|
|
|||
|
|
@ -15,8 +15,11 @@
|
|||
License along with the GNU C Library; if not, see
|
||||
<http://www.gnu.org/licenses/>. */
|
||||
|
||||
#ifndef _BITS_STRING_FORTIFIED_H
|
||||
#define _BITS_STRING_FORTIFIED_H 1
|
||||
|
||||
#ifndef _STRING_H
|
||||
# error "Never use <bits/string3.h> directly; include <string.h> instead."
|
||||
# error "Never use <bits/string_fortified.h> directly; include <string.h> instead."
|
||||
#endif
|
||||
|
||||
#if !__GNUC_PREREQ (5,0)
|
||||
|
|
@ -24,28 +27,6 @@ __warndecl (__warn_memset_zero_len,
|
|||
"memset used with constant zero length parameter; this could be due to transposed parameters");
|
||||
#endif
|
||||
|
||||
#ifndef __cplusplus
|
||||
/* XXX This is temporarily. We should not redefine any of the symbols
|
||||
and instead integrate the error checking into the original
|
||||
definitions. */
|
||||
# undef memcpy
|
||||
# undef memmove
|
||||
# undef memset
|
||||
# undef strcat
|
||||
# undef strcpy
|
||||
# undef strncat
|
||||
# undef strncpy
|
||||
# ifdef __USE_GNU
|
||||
# undef mempcpy
|
||||
# undef stpcpy
|
||||
# endif
|
||||
# ifdef __USE_MISC
|
||||
# undef bcopy
|
||||
# undef bzero
|
||||
# endif
|
||||
#endif
|
||||
|
||||
|
||||
__fortify_function void *
|
||||
__NTH (memcpy (void *__restrict __dest, const void *__restrict __src,
|
||||
size_t __len))
|
||||
|
|
@ -154,3 +135,5 @@ __NTH (strncat (char *__restrict __dest, const char *__restrict __src,
|
|||
{
|
||||
return __builtin___strncat_chk (__dest, __src, __len, __bos (__dest));
|
||||
}
|
||||
|
||||
#endif /* bits/string_fortified.h */
|
||||
|
|
@ -15,28 +15,17 @@
|
|||
License along with the GNU C Library; if not, see
|
||||
<http://www.gnu.org/licenses/>. */
|
||||
|
||||
/* <bits/string.h> may declare some extern inline functions.
|
||||
These functions are defined here if inlining is not possible. */
|
||||
|
||||
#undef __USE_STRING_INLINES
|
||||
#define __USE_STRING_INLINES
|
||||
#define _FORCE_INLINES
|
||||
#define __STRING_INLINE /* empty */
|
||||
#define __NO_INLINE__
|
||||
/* This file contains compatibility definitions of functions that were
|
||||
formerly defined as "extern inline" in string.h; it's conceivable
|
||||
that old binaries contain references to them. */
|
||||
|
||||
#define __NO_STRING_INLINES
|
||||
#include <string.h>
|
||||
#undef index
|
||||
#undef rindex
|
||||
#undef __stpcpy
|
||||
|
||||
#undef __NO_INLINE__
|
||||
#include <bits/string.h>
|
||||
#include "shlib-compat.h"
|
||||
|
||||
#if SHLIB_COMPAT (libc, GLIBC_2_1_1, GLIBC_2_25)
|
||||
/* The inline functions are not used from GLIBC 2.25 and forward, however
|
||||
they are required to provide the symbols through string-inlines.c
|
||||
(if inlining is not possible for compatibility reasons). */
|
||||
/* These functions were removed from string.h in glibc 2.25. */
|
||||
|
||||
char *
|
||||
__old_strtok_r_1c (char *__s, char __sep, char **__nextp)
|
||||
|
|
@ -128,9 +117,8 @@ compat_symbol (libc, __old_strsep_3c, __strsep_3c, GLIBC_2_1_1);
|
|||
#endif
|
||||
|
||||
#if SHLIB_COMPAT (libc, GLIBC_2_1_1, GLIBC_2_24)
|
||||
/* The inline functions are not used from GLIBC 2.24 and forward, however
|
||||
they are required to provide the symbols through string-inlines.c
|
||||
(if inlining is not possible for compatibility reasons). */
|
||||
/* These functions were removed from string.h in glibc 2.24. */
|
||||
|
||||
size_t
|
||||
__old_strcspn_c1 (const char *__s, int __reject)
|
||||
{
|
||||
|
|
@ -220,9 +208,13 @@ __old_strpbrk_c3 (const char *__s, int __accept1, int __accept2, int __accept3)
|
|||
}
|
||||
compat_symbol (libc, __old_strpbrk_c3, __strpbrk_c3, GLIBC_2_1_1);
|
||||
|
||||
# if defined __mc68020__ || defined __s390__ || defined __i386__
|
||||
# define _STRING_INLINE_unaligned 1
|
||||
# else
|
||||
# define _STRING_INLINE_unaligned 0
|
||||
/* These are a few types we need for the optimizations if we cannot
|
||||
use unaligned memory accesses. */
|
||||
# define __STRING2_COPY_TYPE(N) \
|
||||
# define __STRING2_COPY_TYPE(N) \
|
||||
typedef struct { unsigned char __arr[N]; } \
|
||||
__attribute__ ((__packed__)) __STRING2_COPY_ARR##N
|
||||
__STRING2_COPY_TYPE (2);
|
||||
|
|
@ -232,8 +224,8 @@ __STRING2_COPY_TYPE (5);
|
|||
__STRING2_COPY_TYPE (6);
|
||||
__STRING2_COPY_TYPE (7);
|
||||
__STRING2_COPY_TYPE (8);
|
||||
# undef __STRING2_COPY_TYPE
|
||||
|
||||
# undef __STRING2_COPY_TYPE
|
||||
# endif
|
||||
|
||||
# if _STRING_INLINE_unaligned
|
||||
void *
|
||||
|
|
|
|||
|
|
@ -487,30 +487,10 @@ extern char *basename (const char *__filename) __THROW __nonnull ((1));
|
|||
# endif
|
||||
#endif
|
||||
|
||||
|
||||
#if __GNUC_PREREQ (3,4)
|
||||
# if defined __OPTIMIZE__ && !defined __OPTIMIZE_SIZE__ \
|
||||
&& !defined __NO_INLINE__ && !defined __cplusplus
|
||||
/* When using GNU CC we provide some optimized versions of selected
|
||||
functions from this header. There are two kinds of optimizations:
|
||||
|
||||
- machine-dependent optimizations, most probably using inline
|
||||
assembler code; these might be quite expensive since the code
|
||||
size can increase significantly.
|
||||
These optimizations are not used unless the symbol
|
||||
__USE_STRING_INLINES
|
||||
is defined before including this header.
|
||||
|
||||
One can inhibit all optimizations by defining __NO_STRING_INLINES. */
|
||||
|
||||
/* Get the machine-dependent optimizations (if any). */
|
||||
# include <bits/string.h>
|
||||
|
||||
# endif
|
||||
|
||||
# if __USE_FORTIFY_LEVEL > 0 && defined __fortify_function
|
||||
/* Functions with security checks. */
|
||||
# include <bits/string3.h>
|
||||
# include <bits/string_fortified.h>
|
||||
# endif
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@
|
|||
#ifndef STRNCAT
|
||||
# undef strncat
|
||||
# define STRNCAT strncat
|
||||
# define STRNCAT_PRIMARY
|
||||
#endif
|
||||
|
||||
char *
|
||||
|
|
@ -37,3 +38,7 @@ STRNCAT (char *s1, const char *s2, size_t n)
|
|||
|
||||
return s;
|
||||
}
|
||||
#ifdef STRNCAT_PRIMARY
|
||||
strong_alias (STRNCAT, __strncat)
|
||||
libc_hidden_def (__strncat)
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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. */
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
||||
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
|
||||
|
||||
/* sparc uses the aligned string inline ABI. */
|
||||
#define _STRING_INLINE_unaligned 0
|
||||
|
||||
/* sparc32 and sparc64 strchr(x, '\0') perform better than
|
||||
__rawmemchr(x, '\0'). */
|
||||
#define _HAVE_STRING_ARCH_strchr 1
|
||||
|
||||
/* Don't inline mempcpy into memcpy as sparc has an optimized mempcpy. */
|
||||
#define _HAVE_STRING_ARCH_mempcpy 1
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,8 +1,3 @@
|
|||
#define STRNCAT __strncat_sse2
|
||||
#ifdef SHARED
|
||||
#undef libc_hidden_def
|
||||
#define libc_hidden_def(name) \
|
||||
__hidden_ver1 (__strncat_sse2, __GI___strncat, __strncat_sse2);
|
||||
#endif
|
||||
|
||||
#define STRNCAT_PRIMARY
|
||||
#include "string/strncat.c"
|
||||
|
|
|
|||
Loading…
Reference in New Issue