diff options
author | Wilco Dijkstra <wdijkstr@arm.com> | 2017-06-12 15:19:38 +0100 |
---|---|---|
committer | Wilco Dijkstra <wdijkstr@arm.com> | 2017-06-12 15:22:17 +0100 |
commit | 18b10de7ced9e9c3843299fb600e40b11af3e0af (patch) | |
tree | 68bfc23bf761cdf33944780b990e22075ffce549 /string/string.h | |
parent | d99431e519fdeb16edb1222b77430ac9853a2334 (diff) | |
download | glibc-18b10de7ced9e9c3843299fb600e40b11af3e0af.tar glibc-18b10de7ced9e9c3843299fb600e40b11af3e0af.tar.gz glibc-18b10de7ced9e9c3843299fb600e40b11af3e0af.tar.bz2 glibc-18b10de7ced9e9c3843299fb600e40b11af3e0af.zip |
2017-06-12 Wilco Dijkstra <wdijkstr@arm.com>
There is no longer a need for string2.h, so remove it and all mention of it.
Move the redirect for __stpcpy to include/string.h since it is still required
until all internal uses have been renamed.
This fixes several linknamespace/localplt failures when building with -Os.
[BZ #15105]
[BZ #19463]
* include/string.h: Add internal redirect for __stpcpy.
* string/Makefile: Remove bits/string2.h.
* string/string.h: Update comment.
* string/string-inlines.c: Remove bits/string2.h include and comment.
* string/bits/string2.h: Remove file.
Diffstat (limited to 'string/string.h')
-rw-r--r-- | string/string.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/string/string.h b/string/string.h index 8eed67d77d..d1a274628f 100644 --- a/string/string.h +++ b/string/string.h @@ -501,19 +501,11 @@ extern char *basename (const char *__filename) __THROW __nonnull ((1)); __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> -/* These are generic optimizations which do not add too much inline code. */ -# include <bits/string2.h> # endif # if __USE_FORTIFY_LEVEL > 0 && defined __fortify_function |