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 /string/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 'string/string.h')
-rw-r--r-- | string/string.h | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/string/string.h b/string/string.h index ac872ff283..5aec0efe7f 100644 --- a/string/string.h +++ b/string/string.h @@ -487,35 +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. - - - machine-independent optimizations which do not increase the - code size significantly and which optimize mainly situations - where one or more arguments are compile-time constants. - These optimizations are used always when the compiler is - taught to optimize. - - 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 |