summaryrefslogtreecommitdiffstats
path: root/libc/arch-arm
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2016-12-12 14:59:47 +0100
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2016-12-12 14:59:47 +0100
commit73049dc117da1f669fa7cee4004e69b3493a58c9 (patch)
tree37dafd236bb27b1c23f59c7ad41655212f7c0902 /libc/arch-arm
parent385816ce486622d72a8e56443b53ff8404d4ae3b (diff)
parent92595081575c82ace07201a3ea32004eba968c0b (diff)
downloadbionic-replicant-6.0.zip
bionic-replicant-6.0.tar.gz
bionic-replicant-6.0.tar.bz2
Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_bionic into replicant-6.0replicant-6.0-beta-0001replicant-6.0-alpha-0006replicant-6.0
Diffstat (limited to 'libc/arch-arm')
-rw-r--r--libc/arch-arm/cortex-a9/bionic/memcpy_base.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/libc/arch-arm/cortex-a9/bionic/memcpy_base.S b/libc/arch-arm/cortex-a9/bionic/memcpy_base.S
index 6ab5a69..966b9b3 100644
--- a/libc/arch-arm/cortex-a9/bionic/memcpy_base.S
+++ b/libc/arch-arm/cortex-a9/bionic/memcpy_base.S
@@ -44,7 +44,7 @@ ENTRY_PRIVATE(MEMCPY_BASE)
/* check if buffers are aligned. If so, run arm-only version */
eor r3, r0, r1
ands r3, r3, #0x3
- beq __memcpy_base_aligned
+ beq MEMCPY_BASE_ALIGNED
/* Check the upper size limit for Neon unaligned memory access in memcpy */
cmp r2, #224