about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAdhemerval Zanella <azanella@linux.vnet.ibm.com>2015-02-25 07:49:51 -0500
committerAdhemerval Zanella <azanella@linux.vnet.ibm.com>2015-02-25 13:25:54 -0500
commit115e0de72a2aa6f4999f0c0c0184cbabdfec6c63 (patch)
treeaba2fe9532c6806e1000c3296a7f60634c3bd2b6
parent137cef7d433407bd2ded8bcc5bea70e5858df47a (diff)
downloadglibc-115e0de72a2aa6f4999f0c0c0184cbabdfec6c63.tar.gz
glibc-115e0de72a2aa6f4999f0c0c0184cbabdfec6c63.tar.xz
glibc-115e0de72a2aa6f4999f0c0c0184cbabdfec6c63.zip
powerpc: Fix memmove static build
This patch fixes the missing "__memcpy_ppc" symbol for memmove-ppc64
object in static builds.  Since memcpy ifunc is not enabled in static
mode, the specialized symbols are not provided.  The patch changed the
it to just "__memcpy" instead.
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/powerpc/powerpc64/multiarch/memmove-ppc64.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 296f5e8630..bf23bc139c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-25  Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
+
+	* sysdeps/powerpc/powerpc64/multiarch/memmove-ppc64.c: Define memcpy
+	to __memcpy_ppc only for static builds.
+
 2015-02-25  Joseph Myers  <joseph@codesourcery.com>
 
 	[BZ #18020]
diff --git a/sysdeps/powerpc/powerpc64/multiarch/memmove-ppc64.c b/sysdeps/powerpc/powerpc64/multiarch/memmove-ppc64.c
index a2d8790030..b433a27c65 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/memmove-ppc64.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/memmove-ppc64.c
@@ -32,7 +32,9 @@ extern __typeof (memmove) __memmove_ppc attribute_hidden;
 #define MEMMOVE __memmove_ppc
 
 extern __typeof (memcpy) __memcpy_ppc attribute_hidden;
-#define memcpy __memcpy_ppc
+#ifdef SHARED
+# define memcpy __memcpy_ppc
+#endif
 
 #if IS_IN (libc) && defined(SHARED)
 # undef libc_hidden_builtin_def