Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/bionic

2013-04-02 11:06:24 -07:00 · 2013-04-02 11:06:24 -07:00 · 4ea3580749
commit 4ea3580749
parent 6517d138fd 5014f417ea
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)