diff options
| author | Christopher Ferris <cferris@google.com> | 2013-04-11 00:23:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-04-11 00:23:46 +0000 |
| commit | fc76c7d394ebe0e585777955efadf7cc8ed86636 (patch) | |
| tree | 0c17bd0d2652e1a73fa6c3f110579da9ac681fa7 /libc | |
| parent | 68fd78efa05fc61adfbdeadeb757caa45663570c (diff) | |
| parent | bf0d1ad72b35ce1cb796aa0f6d44cbf4a495bff5 (diff) | |
| download | bionic-fc76c7d394ebe0e585777955efadf7cc8ed86636.tar.gz bionic-fc76c7d394ebe0e585777955efadf7cc8ed86636.tar.bz2 bionic-fc76c7d394ebe0e585777955efadf7cc8ed86636.zip | |
Merge "Add missing branch in memcpy.S dst aligned case."
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/arch-arm/cortex-a15/bionic/memcpy.S | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libc/arch-arm/cortex-a15/bionic/memcpy.S b/libc/arch-arm/cortex-a15/bionic/memcpy.S index 9985e7f42..d29706488 100644 --- 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) |