+2014-11-14 Joseph Myers <joseph@codesourcery.com>
+
+ * include/string.h [NO_MEMPCPY_STPCPY_REDIRECT] (mempcpy): Do not
+ redeclare with asm name.
+ [NO_MEMPCPY_STPCPY_REDIRECT] (stpcpy): Likewise.
+ * string/mempcpy.c (NO_MEMPCPY_STPCPY_REDIRECT): Define before
+ including <string.h>.
+ * string/stpcpy.c (NO_MEMPCPY_STPCPY_REDIRECT): Likewise.
+ * sysdeps/powerpc/powerpc32/power4/multiarch/mempcpy.c
+ [!NOT_IN_libc] (NO_MEMPCPY_STPCPY_REDIRECT): Likewise.
+ * sysdeps/powerpc/powerpc64/multiarch/mempcpy.c
+ [!NOT_IN_libc] (NO_MEMPCPY_STPCPY_REDIRECT): Likewise.
+ * sysdeps/powerpc/powerpc64/multiarch/stpcpy.c
+ [SHARED && !NOT_IN_libc] (NO_MEMPCPY_STPCPY_REDIRECT): Likewise.
+
2014-11-13 Joseph Myers <joseph@codesourcery.com>
* stdlib/strtol.c (__strtol): Use prototype definition.
libc_hidden_builtin_proto (strstr)
libc_hidden_builtin_proto (ffs)
-#if defined NOT_IN_libc || !defined SHARED
+#if (defined NOT_IN_libc || !defined SHARED) \
+ && !defined NO_MEMPCPY_STPCPY_REDIRECT
/* Redirect calls to __builtin_mempcpy and __builtin_stpcpy to call
__mempcpy and __stpcpy if not inlined. */
extern __typeof (mempcpy) mempcpy __asm__ ("__mempcpy");
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
+#define NO_MEMPCPY_STPCPY_REDIRECT
#include <string.h>
#undef mempcpy
# include <config.h>
#endif
+#define NO_MEMPCPY_STPCPY_REDIRECT
#include <string.h>
#undef __stpcpy
<http://www.gnu.org/licenses/>. */
#ifndef NOT_IN_libc
+# define NO_MEMPCPY_STPCPY_REDIRECT
# include <string.h>
# include <shlib-compat.h>
# include "init-arch.h"
<http://www.gnu.org/licenses/>. */
#ifndef NOT_IN_libc
+# define NO_MEMPCPY_STPCPY_REDIRECT
# include <string.h>
# include <shlib-compat.h>
# include "init-arch.h"
<http://www.gnu.org/licenses/>. */
#if defined SHARED && !defined NOT_IN_libc
+# define NO_MEMPCPY_STPCPY_REDIRECT
# include <string.h>
# include <shlib-compat.h>
# include "init-arch.h"