commit 58decb041cda583084d70127a198eb67eebe46db
author Park Ju Hyung <qkrwngud825@gmail.com> Thu Aug 27 19:31:02 2020 +0900
committer rohan <purohit.rohan@gmail.com> Sat Aug 29 03:49:19 2020 -0400
tree 40fa891b609a2fa0f27b8379faf1e4dd25fe83ad
parent af0effa49328479824aca9f6e906786962ff28ce

libc: arm64: fix wmemmove

Jake undefined WMEMMOVE and then relies on its definition for ending the
assembly function.

Bad Jake.

WMEMMOVE is undefined from wmemmove.S.

Fixes: b0051ecbb ("libc: arm64: add integer memcpy/memmove from arm-optimized-routines")

Change-Id: I7acd798dc589dbc6f2716845f94b71e22871b77d
Signed-off-by: Park Ju Hyung <qkrwngud825@gmail.com>
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>

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 8e39d8f..7fd6b9a 100644
--- a/libc/arch-arm64/generic/bionic/memmove.S
+++ b/libc/arch-arm64/generic/bionic/memmove.S
@@ -62,15 +62,12 @@
 #if defined(WMEMMOVE)
 ENTRY(wmemmove)
 	lsl	x2, x2, #2
-#include "memcpy_base.S"
-#undef WMEMMOVE
 #else
-#define MEMMOVE
 ENTRY(memmove)
-#include "memcpy_base.S"
-#undef MEMMOVE
 #endif
 
+#include "memcpy_base.S"
+
 #if defined(WMEMMOVE)
 END(wmemmove)
 #else