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/Makefile | |
parent | d99431e519fdeb16edb1222b77430ac9853a2334 (diff) | |
download | glibc-18b10de7ced9e9c3843299fb600e40b11af3e0af.tar.gz |
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/Makefile')
-rw-r--r-- | string/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/string/Makefile b/string/Makefile index f317d02a8c..8d0d6b0873 100644 --- a/string/Makefile +++ b/string/Makefile @@ -24,8 +24,8 @@ 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/string2.h bits/string3.h \ - bits/strings_fortified.h bits/uintn-identity.h + bits/string.h bits/string3.h bits/strings_fortified.h \ + bits/uintn-identity.h routines := strcat strchr strcmp strcoll strcpy strcspn \ strverscmp strdup strndup \ |