Add missing branch in memcpy.S dst aligned case.

Merge from internal master. (cherry-picked from commit 6ffaa931c3) Change-Id: Ifdcf01fd122866cf0d4c5b5f7a997803561d7889
2013-04-02 09:19:00 -07:00 · 2013-04-02 09:19:00 -07:00 · bf0d1ad72b
parent 68fd78efa0
commit bf0d1ad72b
1 changed files with 2 additions and 3 deletions
--- a/libc/arch-arm/cortex-a15/bionic/memcpy.S
+++ b/libc/arch-arm/cortex-a15/bionic/memcpy.S
@ -319,7 +319,6 @@ dst_not_word_aligned:

        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)