merge in klp-release history after reset to klp-dev
diff --git a/libc/arch-arm/cortex-a15/bionic/memcpy_base.S b/libc/arch-arm/cortex-a15/bionic/memcpy_base.S
index 0154676..de9e33b 100644
--- a/libc/arch-arm/cortex-a15/bionic/memcpy_base.S
+++ b/libc/arch-arm/cortex-a15/bionic/memcpy_base.S
@@ -74,8 +74,10 @@
cmp r2, #16
blo .L_copy_less_than_16_unknown_align
- cmp r2, #832
- bge .L_check_alignment
+ // TODO: The aligned copy code is extremely slow copying some large
+ // buffers so always go through the unaligned path for now.
+ //cmp r2, #832
+ //bge .L_check_alignment
.L_copy_unknown_alignment:
// Unknown alignment of src and dst.
diff --git a/libc/arch-arm/krait/bionic/memcpy_base.S b/libc/arch-arm/krait/bionic/memcpy_base.S
index d87a542..009c8f9 100644
--- a/libc/arch-arm/krait/bionic/memcpy_base.S
+++ b/libc/arch-arm/krait/bionic/memcpy_base.S
@@ -79,7 +79,7 @@
1: /* The main loop copies 64 bytes at a time */
vld1.8 {d0 - d3}, [r1]!
vld1.8 {d4 - d7}, [r1]!
- pld [r1, #(32*2)]
+ pld [r1, #(32*8)]
subs r2, r2, #64
vst1.8 {d0 - d3}, [r0, :128]!
vst1.8 {d4 - d7}, [r0, :128]!