diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2014-11-14 13:48:39 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2014-11-14 13:48:39 +0000 |
| commit | c1b0aadcdfd1b4b56588856cdc3197f4f145677d (patch) | |
| tree | c40216176f216cce95e072cedc8a34bc7b705be9 /sysdeps/powerpc/powerpc64 | |
| parent | bf438382bd8ffcc614b01e9a273a577b3ed54f9f (diff) | |
| download | glibc-c1b0aadcdfd1b4b56588856cdc3197f4f145677d.tar.gz glibc-c1b0aadcdfd1b4b56588856cdc3197f4f145677d.tar.xz glibc-c1b0aadcdfd1b4b56588856cdc3197f4f145677d.zip | |
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.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.
Diffstat (limited to 'sysdeps/powerpc/powerpc64')
| -rw-r--r-- | sysdeps/powerpc/powerpc64/multiarch/mempcpy.c | 1 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc64/multiarch/stpcpy.c | 1 |
2 files changed, 2 insertions, 0 deletions
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 @@ <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" 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 @@ <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" |