commit bf0d1ad72b35ce1cb796aa0f6d44cbf4a495bff5
author Christopher Ferris <cferris@google.com> Tue Apr 02 09:19:00 2013 -0700
committer Christopher Ferris <cferris@google.com> Wed Apr 10 17:21:29 2013 -0700
tree 0c17bd0d2652e1a73fa6c3f110579da9ac681fa7
parent 68fd78efa05fc61adfbdeadeb757caa45663570c

Add missing branch in memcpy.S dst aligned case.

Merge from internal master.

(cherry-picked from commit 6ffaa931c362602a2b606a610c92326a425a876e)

Change-Id: Ifdcf01fd122866cf0d4c5b5f7a997803561d7889

libc/arch-arm/cortex-a15/bionic/memcpy.S

diff --git a/libc/arch-arm/cortex-a15/bionic/memcpy.S b/libc/arch-arm/cortex-a15/bionic/memcpy.S
index 9985e7f..d297064 100644
--- a/libc/arch-arm/cortex-a15/bionic/memcpy.S
+++ b/libc/arch-arm/cortex-a15/bionic/memcpy.S
@@ -319,7 +319,6 @@
 
         sub     r2, r2, ip
 
-        // If src is not word aligned, jump to the unaligned code.
-        ands    ip, r1, #0x3
-        beq     word_aligned
+        // Src is guaranteed to be at least word aligned by this point.
+        b       word_aligned
 END(memcpy)