aboutsummaryrefslogtreecommitdiff
path: root/string/string-inlines.c
diff options
context:
space:
mode:
authorWilco Dijkstra <wdijkstr@arm.com>2017-06-12 15:19:38 +0100
committerWilco Dijkstra <wdijkstr@arm.com>2017-06-12 15:22:17 +0100
commit18b10de7ced9e9c3843299fb600e40b11af3e0af (patch)
tree68bfc23bf761cdf33944780b990e22075ffce549 /string/string-inlines.c
parentd99431e519fdeb16edb1222b77430ac9853a2334 (diff)
downloadglibc-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-inlines.c')
-rw-r--r--string/string-inlines.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/string/string-inlines.c b/string/string-inlines.c
index fa4a1594b2..55c99845aa 100644
--- a/string/string-inlines.c
+++ b/string/string-inlines.c
@@ -15,9 +15,8 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-/* <bits/string.h> and <bits/string2.h> declare some extern inline
- functions. These functions are declared additionally here if
- inlining is not possible. */
+/* <bits/string.h> may declare some extern inline functions.
+ These functions are defined here if inlining is not possible. */
#undef __USE_STRING_INLINES
#define __USE_STRING_INLINES
@@ -31,8 +30,6 @@
#undef __NO_INLINE__
#include <bits/string.h>
-#include <bits/string2.h>
-
#include "shlib-compat.h"
#if SHLIB_COMPAT (libc, GLIBC_2_1_1, GLIBC_2_25)