From c1b0aadcdfd1b4b56588856cdc3197f4f145677d Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Fri, 14 Nov 2014 13:48:39 +0000 Subject: Fix build of C mempcpy and stpcpy. This patch fixes the build of C mempcpy and stpcpy by disabling the redirection to __mempcpy and __stpcpy asm names if NO_MEMPCPY_STPCPY_REDIRECT is defined, and defining that macro in the relevant source files. Tested for powerpc32 that the build is fixed. * 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/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. --- string/mempcpy.c | 1 + string/stpcpy.c | 1 + 2 files changed, 2 insertions(+) (limited to 'string') diff --git a/string/mempcpy.c b/string/mempcpy.c index 9749863eaf..aab1bed986 100644 --- a/string/mempcpy.c +++ b/string/mempcpy.c @@ -19,6 +19,7 @@ License along with the GNU C Library; if not, see . */ +#define NO_MEMPCPY_STPCPY_REDIRECT #include #undef mempcpy diff --git a/string/stpcpy.c b/string/stpcpy.c index fc5ae5534f..9185acc034 100644 --- a/string/stpcpy.c +++ b/string/stpcpy.c @@ -19,6 +19,7 @@ # include #endif +#define NO_MEMPCPY_STPCPY_REDIRECT #include #undef __stpcpy -- cgit 1.4.1