mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-24 19:51:11 +00:00
09a596cc2c
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.
201 lines
6.7 KiB
C
201 lines
6.7 KiB
C
#ifndef _STRING_H
|
|
|
|
#ifndef _ISOMAC
|
|
/* Some of these are defined as macros in the real string.h, so we must
|
|
prototype them before including it. */
|
|
#include <sys/types.h>
|
|
|
|
extern void *__memccpy (void *__dest, const void *__src,
|
|
int __c, size_t __n);
|
|
|
|
extern size_t __strnlen (const char *__string, size_t __maxlen)
|
|
__attribute_pure__;
|
|
|
|
extern char *__strsep (char **__stringp, const char *__delim);
|
|
|
|
extern int __strverscmp (const char *__s1, const char *__s2)
|
|
__attribute_pure__;
|
|
|
|
extern int __strncasecmp (const char *__s1, const char *__s2,
|
|
size_t __n)
|
|
__attribute_pure__;
|
|
|
|
extern int __strcasecmp (const char *__s1, const char *__s2)
|
|
__attribute_pure__;
|
|
|
|
extern char *__strcasestr (const char *__haystack, const char *__needle)
|
|
__attribute_pure__;
|
|
|
|
extern char *__strdup (const char *__string)
|
|
__attribute_malloc__;
|
|
extern char *__strndup (const char *__string, size_t __n)
|
|
__attribute_malloc__;
|
|
|
|
extern void *__rawmemchr (const void *__s, int __c)
|
|
__attribute_pure__;
|
|
|
|
extern char *__strchrnul (const char *__s, int __c)
|
|
__attribute_pure__;
|
|
|
|
extern void *__memrchr (const void *__s, int __c, size_t __n)
|
|
__attribute_pure__;
|
|
|
|
extern void *__memchr (const void *__s, int __c, size_t __n)
|
|
__attribute_pure__;
|
|
|
|
extern void __bzero (void *__s, size_t __n) __THROW __nonnull ((1));
|
|
|
|
extern int __ffs (int __i) __attribute__ ((const));
|
|
|
|
extern char *__strerror_r (int __errnum, char *__buf, size_t __buflen);
|
|
|
|
/* Get _STRING_ARCH_unaligned. */
|
|
#include <string_private.h>
|
|
#endif
|
|
|
|
#include <string/string.h>
|
|
|
|
#ifndef _ISOMAC
|
|
extern __typeof (strcoll_l) __strcoll_l;
|
|
extern __typeof (strxfrm_l) __strxfrm_l;
|
|
extern __typeof (strcasecmp_l) __strcasecmp_l;
|
|
extern __typeof (strncasecmp_l) __strncasecmp_l;
|
|
|
|
/* Alternative version which doesn't pollute glibc's namespace. */
|
|
#if IS_IN (libc)
|
|
# undef strndupa
|
|
# define strndupa(s, n) \
|
|
(__extension__ \
|
|
({ \
|
|
const char *__old = (s); \
|
|
size_t __len = __strnlen (__old, (n)); \
|
|
char *__new = (char *) __builtin_alloca (__len + 1); \
|
|
__new[__len] = '\0'; \
|
|
(char *) memcpy (__new, __old, __len); \
|
|
}))
|
|
#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)
|
|
libc_hidden_proto (__strverscmp)
|
|
libc_hidden_proto (basename)
|
|
extern char *__basename (const char *__filename) __THROW __nonnull ((1));
|
|
libc_hidden_proto (__basename)
|
|
libc_hidden_proto (strcoll)
|
|
libc_hidden_proto (__strcoll_l)
|
|
libc_hidden_proto (__strxfrm_l)
|
|
libc_hidden_proto (__strtok_r)
|
|
extern char *__strsep_g (char **__stringp, const char *__delim);
|
|
libc_hidden_proto (__strsep_g)
|
|
libc_hidden_proto (strnlen)
|
|
libc_hidden_proto (__strnlen)
|
|
libc_hidden_proto (memmem)
|
|
extern __typeof (memmem) __memmem;
|
|
libc_hidden_proto (__memmem)
|
|
libc_hidden_proto (__ffs)
|
|
|
|
#if IS_IN (libc)
|
|
/* Avoid hidden reference to IFUNC symbol __explicit_bzero_chk. */
|
|
void __explicit_bzero_chk_internal (void *, size_t, size_t)
|
|
__THROW __nonnull ((1)) attribute_hidden;
|
|
# define explicit_bzero(buf, len) \
|
|
__explicit_bzero_chk_internal (buf, len, __bos0 (buf))
|
|
#elif !IS_IN (nonlib)
|
|
void __explicit_bzero_chk (void *, size_t, size_t) __THROW __nonnull ((1));
|
|
# define explicit_bzero(buf, len) __explicit_bzero_chk (buf, len, __bos0 (buf))
|
|
#endif
|
|
|
|
libc_hidden_builtin_proto (memchr)
|
|
libc_hidden_builtin_proto (memcpy)
|
|
libc_hidden_builtin_proto (mempcpy)
|
|
libc_hidden_builtin_proto (memcmp)
|
|
libc_hidden_builtin_proto (memmove)
|
|
libc_hidden_builtin_proto (memset)
|
|
libc_hidden_builtin_proto (strcat)
|
|
libc_hidden_builtin_proto (strchr)
|
|
libc_hidden_builtin_proto (strcmp)
|
|
libc_hidden_builtin_proto (strcpy)
|
|
libc_hidden_builtin_proto (strcspn)
|
|
libc_hidden_builtin_proto (strlen)
|
|
libc_hidden_builtin_proto (strncmp)
|
|
libc_hidden_builtin_proto (strncpy)
|
|
libc_hidden_builtin_proto (strpbrk)
|
|
libc_hidden_builtin_proto (stpcpy)
|
|
libc_hidden_builtin_proto (strrchr)
|
|
libc_hidden_builtin_proto (strspn)
|
|
libc_hidden_builtin_proto (strstr)
|
|
libc_hidden_builtin_proto (ffs)
|
|
|
|
#if IS_IN (rtld)
|
|
extern __typeof (__stpcpy) __stpcpy attribute_hidden;
|
|
extern __typeof (__strdup) __strdup attribute_hidden;
|
|
extern __typeof (__strerror_r) __strerror_r attribute_hidden;
|
|
extern __typeof (__strsep_g) __strsep_g attribute_hidden;
|
|
|
|
extern __typeof (memchr) memchr attribute_hidden;
|
|
extern __typeof (memcmp) memcmp attribute_hidden;
|
|
extern __typeof (memcpy) memcpy attribute_hidden;
|
|
extern __typeof (memmove) memmove attribute_hidden;
|
|
extern __typeof (memset) memset attribute_hidden;
|
|
extern __typeof (rawmemchr) rawmemchr attribute_hidden;
|
|
extern __typeof (stpcpy) stpcpy attribute_hidden;
|
|
extern __typeof (strchr) strchr attribute_hidden;
|
|
extern __typeof (strcmp) strcmp attribute_hidden;
|
|
extern __typeof (strlen) strlen attribute_hidden;
|
|
extern __typeof (strnlen) strnlen attribute_hidden;
|
|
extern __typeof (strsep) strsep attribute_hidden;
|
|
#endif
|
|
|
|
#if (!IS_IN (libc) || !defined SHARED) \
|
|
&& !defined NO_MEMPCPY_STPCPY_REDIRECT
|
|
/* Redirect calls to __builtin_mempcpy and __builtin_stpcpy to call
|
|
__mempcpy and __stpcpy if not inlined. */
|
|
extern __typeof (mempcpy) mempcpy __asm__ ("__mempcpy");
|
|
extern __typeof (stpcpy) stpcpy __asm__ ("__stpcpy");
|
|
#endif
|
|
|
|
extern void *__memcpy_chk (void *__restrict __dest,
|
|
const void *__restrict __src, size_t __len,
|
|
size_t __destlen) __THROW;
|
|
extern void *__memmove_chk (void *__dest, const void *__src, size_t __len,
|
|
size_t __destlen) __THROW;
|
|
extern void *__mempcpy_chk (void *__restrict __dest,
|
|
const void *__restrict __src, size_t __len,
|
|
size_t __destlen) __THROW;
|
|
extern void *__memset_chk (void *__dest, int __ch, size_t __len,
|
|
size_t __destlen) __THROW;
|
|
extern char *__strcpy_chk (char *__restrict __dest,
|
|
const char *__restrict __src,
|
|
size_t __destlen) __THROW;
|
|
extern char *__stpcpy_chk (char *__restrict __dest,
|
|
const char *__restrict __src,
|
|
size_t __destlen) __THROW;
|
|
extern char *__strncpy_chk (char *__restrict __dest,
|
|
const char *__restrict __src,
|
|
size_t __len, size_t __destlen) __THROW;
|
|
extern char *__strcat_chk (char *__restrict __dest,
|
|
const char *__restrict __src,
|
|
size_t __destlen) __THROW;
|
|
extern char *__strncat_chk (char *__restrict __dest,
|
|
const char *__restrict __src,
|
|
size_t __len, size_t __destlen) __THROW;
|
|
#endif
|
|
|
|
#endif
|