aboutsummaryrefslogtreecommitdiff
path: root/include
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 /include
parentd99431e519fdeb16edb1222b77430ac9853a2334 (diff)
downloadglibc-18b10de7ced9e9c3843299fb600e40b11af3e0af.zip
glibc-18b10de7ced9e9c3843299fb600e40b11af3e0af.tar.gz
glibc-18b10de7ced9e9c3843299fb600e40b11af3e0af.tar.bz2
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 'include')
-rw-r--r--include/string.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/string.h b/include/string.h
index ce71674..2bf2944 100644
--- a/include/string.h
+++ b/include/string.h
@@ -162,6 +162,11 @@ extern __typeof (mempcpy) mempcpy __asm__ ("__mempcpy");
extern __typeof (stpcpy) stpcpy __asm__ ("__stpcpy");
#endif
+/* Redirect internal calls to builtins. */
+#ifndef __stpcpy
+# define __stpcpy(dest, src) __builtin_stpcpy (dest, src)
+#endif
+
extern void *__memcpy_chk (void *__restrict __dest,
const void *__restrict __src, size_t __len,
size_t __destlen) __THROW;