From bf0d1ad72b35ce1cb796aa0f6d44cbf4a495bff5 Mon Sep 17 00:00:00 2001 From: Christopher Ferris Date: Tue, 2 Apr 2013 09:19:00 -0700 Subject: [PATCH] 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 | 5 ++--- 1 file 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)