commit 8a0f0ed5e7c2bc5665583db646876808cc3c2bc7
author Haibo Huang <hhb@google.com> Thu May 24 20:39:18 2018 -0700
committer Haibo Huang <hhb@google.com> Mon Jun 11 18:12:45 2018 +0000
tree e37fb7e4c3706931a9bfde2d865b4d90589610f6
parent 42596b7bf0652e44edff0370f75e1d5387c5cc7b

Make memcpy memmove

Bug: http://b/63992911
Test: Change BoardConfig.mk and compile for each variant
Change-Id: Ia0cc68d8e90e3316ddb2e9ff1555a009b6a0c5be

libc/arch-arm64/generic/bionic/memcpy.S

diff --git a/libc/arch-arm64/generic/bionic/memcpy.S b/libc/arch-arm64/generic/bionic/memcpy.S
index fc487d3..baadb92 100644
--- a/libc/arch-arm64/generic/bionic/memcpy.S
+++ b/libc/arch-arm64/generic/bionic/memcpy.S
@@ -30,6 +30,6 @@
 
 #include <private/bionic_asm.h>
 
-ENTRY(memcpy)
+ENTRY(__memcpy)
   #include "memcpy_base.S"
-END(memcpy)
+END(__memcpy)

libc/arch-arm64/generic/bionic/memmove.S

diff --git a/libc/arch-arm64/generic/bionic/memmove.S b/libc/arch-arm64/generic/bionic/memmove.S
index c50112d9..335b7d6 100644
--- a/libc/arch-arm64/generic/bionic/memmove.S
+++ b/libc/arch-arm64/generic/bionic/memmove.S
@@ -92,7 +92,7 @@
 	sub	tmp1, dstin, src
 	cmp	count, 96
 	ccmp	tmp1, count, 2, hi
-	b.hs	memcpy
+	b.hs	__memcpy
 
 	cbz	tmp1, 3f
 	add	dstend, dstin, count
@@ -150,4 +150,6 @@
 END(wmemmove)
 #else
 END(memmove)
+
+ALIAS_SYMBOL(memcpy, memmove)
 #endif