diff options
| author | Zack Weinberg <zackw@panix.com> | 2016-11-17 09:26:27 -0500 |
|---|---|---|
| committer | Zack Weinberg <zackw@panix.com> | 2017-05-21 09:57:15 -0400 |
| commit | 474e044681c83ed270c84924ca2e2e16c27072d9 (patch) | |
| tree | edb18d31842634d25c71ccd29d6a08d0a4884fbf /include/string.h | |
| parent | 19c6eedc14a47d26df2a27150ffeb3b6b819f9c8 (diff) | |
| download | glibc-zack/no-inline-string-opts.tar.gz | |
For experimental purposes, remove bits/string.h.zack/no-inline-string-opts
* 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.
Forward __bzero to __builtin_memset, __mempcpy to builtin_mempcpy,
and __stpcpy to __builtin_stpcpy here, 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.
Diffstat (limited to 'include/string.h')
| -rw-r--r-- | include/string.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/include/string.h b/include/string.h index f777d617c4..86eaacfc12 100644 --- a/include/string.h +++ b/include/string.h @@ -44,7 +44,9 @@ extern void *__memchr (const void *__s, int __c, size_t __n) __attribute_pure__; extern void __bzero (void *__s, size_t __n) __THROW __nonnull ((1)); -#define __bzero(s, n) __builtin_memset (s, '\0', n) +#ifndef __NO_STRING_INLINES +# define __bzero(s, n) __builtin_memset (s, '\0', n) +#endif extern int __ffs (int __i) __attribute__ ((const)); @@ -77,13 +79,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) -#define __stpcpy(dest, src) __builtin_stpcpy (dest, src) +#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) |