commit 6fa65e7cd54aeffbb2eb2116e30d2d34a5b655a2
author Christopher Ferris <cferris@google.com> Tue Apr 28 20:28:41 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 28 20:28:42 2015 +0000
tree 2ddd96ede5e104e7f2816e5b7bd8332b03f9fa44
parent 42d7468f99a49bd598fca9c3cebba33b9bdd0e57
parent e0905c94d37ad8bc0dd259d37866da5d18fb9ccd

Merge "cortex-a9: Fix reference to __memcpy_base_aligned."

libc/arch-arm/cortex-a9/bionic/memcpy_base.S

diff --git a/libc/arch-arm/cortex-a9/bionic/memcpy_base.S b/libc/arch-arm/cortex-a9/bionic/memcpy_base.S
index 5e81305..bb08b94 100644
--- a/libc/arch-arm/cortex-a9/bionic/memcpy_base.S
+++ b/libc/arch-arm/cortex-a9/bionic/memcpy_base.S
@@ -44,7 +44,7 @@
         /* check if buffers are aligned. If so, run arm-only version */
         eor         r3, r0, r1
         ands        r3, r3, #0x3
-        beq         __memcpy_base_aligned
+        beq         MEMCPY_BASE_ALIGNED
 
         /* Check the upper size limit for Neon unaligned memory access in memcpy */
         cmp         r2, #224