Make memcpy memmove
Bug: http://b/63992911
Test: Change BoardConfig.mk and compile for each variant
Change-Id: Ia0cc68d8e90e3316ddb2e9ff1555a009b6a0c5be
diff --git a/libc/arch-arm64/denver64/bionic/memcpy.S b/libc/arch-arm64/denver64/bionic/memcpy.S
index fc487d3..baadb92 100644
--- a/libc/arch-arm64/denver64/bionic/memcpy.S
+++ b/libc/arch-arm64/denver64/bionic/memcpy.S
@@ -30,6 +30,6 @@
#include <private/bionic_asm.h>
-ENTRY(memcpy)
+ENTRY(__memcpy)
#include "memcpy_base.S"
-END(memcpy)
+END(__memcpy)
diff --git a/libc/arch-arm64/denver64/bionic/memmove.S b/libc/arch-arm64/denver64/bionic/memmove.S
index 739ce49..42271dc 100644
--- a/libc/arch-arm64/denver64/bionic/memmove.S
+++ b/libc/arch-arm64/denver64/bionic/memmove.S
@@ -65,7 +65,7 @@
b.lo .Ldownwards
add tmp1, src, count
cmp dstin, tmp1
- b.hs memcpy /* No overlap. */
+ b.hs __memcpy /* No overlap. */
/* Upwards move with potential overlap.
* Need to move from the tail backwards. SRC and DST point one
@@ -196,7 +196,7 @@
* DST is more than 16 bytes away from SRC. */
sub tmp1, src, #16
cmp dstin, tmp1
- b.ls memcpy /* May overlap, but not critically. */
+ b.ls __memcpy /* May overlap, but not critically. */
mov dst, dstin /* Preserve DSTIN for return value. */
cmp count, #64
@@ -326,4 +326,6 @@
END(wmemmove)
#else
END(memmove)
+
+ALIAS_SYMBOL(memcpy, memmove)
#endif