Fix build issue on x86.

Add an undef of __stpcpy in string-inlines.c to avoid a redefinition
error on x86.

	* string/string-inlines.c: Add undef of __stpcpy to fix build issue.

diff --git a/ChangeLog b/ChangeLog
index c4cfaf64d7bcc38e436e3b4c94ccda60a5e7d095..0a21fa51f4a3be3edfdd1aeb8f98c1bb091a37d1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -122,6 +122,10 @@
        * sysdeps/x86_64/multiarch/strncpy-c.c (libc_hidden_builtin_def):
        Always Defined as empty.
 
+2017-06-12  Wilco Dijkstra  <wdijkstr@arm.com>
+
+       * string/string-inlines.c: Add undef of __stpcpy to fix build issue.
+
 2017-06-12  Wilco Dijkstra  <wdijkstr@arm.com>
 
        [BZ #15105]

diff --git a/string/string-inlines.c b/string/string-inlines.c
index 55c99845aa39e72d9d00aac9071b9b1f9dded18c..9f145366b64e6ed716aa2418f45d9bf4ec55d4b9 100644 (file)
--- a/string/string-inlines.c
+++ b/string/string-inlines.c
@@ -27,6 +27,7 @@
 #include <string.h>
 #undef index
 #undef rindex
+#undef __stpcpy
 
 #undef __NO_INLINE__
 #include <bits/string.h>