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. --- sysdeps/powerpc/powerpc32/power4/multiarch/mempcpy.c | 1 + sysdeps/powerpc/powerpc64/multiarch/mempcpy.c | 1 + sysdeps/powerpc/powerpc64/multiarch/stpcpy.c | 1 + 3 files changed, 3 insertions(+) (limited to 'sysdeps/powerpc') diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/mempcpy.c b/sysdeps/powerpc/powerpc32/power4/multiarch/mempcpy.c index 38fbcc33f5..89f4912fc9 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/mempcpy.c +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/mempcpy.c @@ -17,6 +17,7 @@ . */ #ifndef NOT_IN_libc +# define NO_MEMPCPY_STPCPY_REDIRECT # include # include # include "init-arch.h" diff --git a/sysdeps/powerpc/powerpc64/multiarch/mempcpy.c b/sysdeps/powerpc/powerpc64/multiarch/mempcpy.c index 38fbcc33f5..89f4912fc9 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/mempcpy.c +++ b/sysdeps/powerpc/powerpc64/multiarch/mempcpy.c @@ -17,6 +17,7 @@ . */ #ifndef NOT_IN_libc +# define NO_MEMPCPY_STPCPY_REDIRECT # include # include # include "init-arch.h" diff --git a/sysdeps/powerpc/powerpc64/multiarch/stpcpy.c b/sysdeps/powerpc/powerpc64/multiarch/stpcpy.c index c7118d5880..28153b7266 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/stpcpy.c +++ b/sysdeps/powerpc/powerpc64/multiarch/stpcpy.c @@ -17,6 +17,7 @@ . */ #if defined SHARED && !defined NOT_IN_libc +# define NO_MEMPCPY_STPCPY_REDIRECT # include # include # include "init-arch.h" -- cgit 1.4.1