summaryrefslogtreecommitdiffstats
path: root/libc/arch-arm
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@google.com>2009-10-05 14:11:55 -0700
committerDavid 'Digit' Turner <digit@google.com>2009-10-05 14:25:10 -0700
commitfdc5c1f56f9d21034badb8e4b092c47098f19613 (patch)
treee46fc6ca820662d33e1dd48ff8fd65a84eac7e83 /libc/arch-arm
parent1e40783d9ad29c88a4d547774e05080fc4327a2e (diff)
downloadbionic-fdc5c1f56f9d21034badb8e4b092c47098f19613.zip
bionic-fdc5c1f56f9d21034badb8e4b092c47098f19613.tar.gz
bionic-fdc5c1f56f9d21034badb8e4b092c47098f19613.tar.bz2
Re-enable ARMv7 memcpy implementation.
Do not submit this patch before the one that modifies the Android emulator to work-around a weird ARMv7 emulation issue. This is done to temporarily re-allow the -user builds needed for QA.
Diffstat (limited to 'libc/arch-arm')
-rw-r--r--libc/arch-arm/bionic/memcpy.S16
1 files changed, 1 insertions, 15 deletions
diff --git a/libc/arch-arm/bionic/memcpy.S b/libc/arch-arm/bionic/memcpy.S
index 254e870..f5cc67b 100644
--- a/libc/arch-arm/bionic/memcpy.S
+++ b/libc/arch-arm/bionic/memcpy.S
@@ -28,21 +28,7 @@
#include <machine/cpu-features.h>
-/* VERY IMPORTANT NOTE:
- * The following ARMv7-optimized version of memcpy is DISABLED !
- *
- * Because the corresponding machine code is not properly emulated
- * by the Android emulator at this time, and because running the
- * dex pre-optimization pass in the emulator is required when
- * building -user images (corresponding to the system images of
- * production devices).
- *
- * The code will be re-enabled as soon as we fix the ARMv7 emulation
- * issues. An even better fix would be to *not* have to run the
- * dex pre-opt pass in the emulator, but on the build host instead.
- */
-#if 0
-/* #if __ARM_ARCH__ == 7 || defined(__ARM_NEON__) */
+#if __ARM_ARCH__ == 7 || defined(__ARM_NEON__)
.text
.fpu neon