diff --git a/libc/arch-arm/krait/bionic/memcpy.S b/libc/arch-arm/krait/bionic/memcpy.S
index 3b4fca4..e433402 100644
--- a/libc/arch-arm/krait/bionic/memcpy.S
+++ b/libc/arch-arm/krait/bionic/memcpy.S
@@ -55,22 +55,23 @@
 ENTRY(memcpy)
         .cfi_startproc
         pld     [r1, #64]
-        .save   {r0, lr}
         stmfd   sp!, {r0, lr}
+        .save   {r0, lr}
         .cfi_def_cfa_offset 8
         .cfi_rel_offset r0, 0
         .cfi_rel_offset lr, 4
-
-        #include "memcpy_base.S"
         .cfi_endproc
 END(memcpy)
 
-        .fnstart
+#define MEMCPY_BASE         __memcpy_base
+#define MEMCPY_BASE_ALIGNED __memcpy_base_aligned
+#include "memcpy_base.S"
+
+ENTRY(__memcpy_chk_fail)
         .cfi_startproc
-__memcpy_chk_fail:
         // Preserve lr for backtrace.
-        .save   {lr}
         push    {lr}
+        .save   {lr}
         .cfi_def_cfa_offset 4
         .cfi_rel_offset lr, 0
 
@@ -84,7 +85,7 @@
 error_message:
         .word   error_string-(1b+4)
         .cfi_endproc
-        .fnend
+END(__memcpy_chk_fail)
 
         .data
 error_string: