aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--NEWS2
-rw-r--r--include/string.h7
3 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1a798b5..f33d582 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2014-11-12 Joseph Myers <joseph@codesourcery.com>
+ [BZ #17573]
+ * include/string.h [NOT_IN_libc || !SHARED] (mempcpy): Declare
+ with asm name __mempcpy.
+ [NOT_IN_libc || !SHARED] (stpcpy): Declare with asm name __stpcpy.
+
[BZ #17572]
* sysdeps/x86_64/rawmemchr.S (rawmemchr): Rename to __rawmemchr
and define as weak alias of __rawmemchr.
diff --git a/NEWS b/NEWS
index e94ba06..befd5e5 100644
--- a/NEWS
+++ b/NEWS
@@ -11,7 +11,7 @@ Version 2.21
6652, 12926, 14132, 14138, 14171, 15215, 15884, 17266, 17344, 17363,
17370, 17371, 17411, 17460, 17475, 17485, 17501, 17506, 17508, 17522,
- 17555, 17570, 17571, 17572, 17583, 17584.
+ 17555, 17570, 17571, 17572, 17573, 17583, 17584.
* New locales: tu_IN, bh_IN.
diff --git a/include/string.h b/include/string.h
index 8323412..2603e9c 100644
--- a/include/string.h
+++ b/include/string.h
@@ -113,6 +113,13 @@ libc_hidden_builtin_proto (strspn)
libc_hidden_builtin_proto (strstr)
libc_hidden_builtin_proto (ffs)
+#if defined NOT_IN_libc || !defined SHARED
+/* Redirect calls to __builtin_mempcpy and __builtin_stpcpy to call
+ __mempcpy and __stpcpy if not inlined. */
+extern __typeof (mempcpy) mempcpy __asm__ ("__mempcpy");
+extern __typeof (stpcpy) stpcpy __asm__ ("__stpcpy");
+#endif
+
# ifndef _ISOMAC
# ifndef index
# define index(s, c) (strchr ((s), (c)))