summaryrefslogtreecommitdiffstats
path: root/libc/arch-arm/bionic
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@google.com>2009-10-07 11:48:11 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-10-07 11:48:11 -0700
commit1f2a381e844abfb364af7cfc48d8a2cb1e194637 (patch)
treedc4ff7668a6e055688c82b13e8bbc39a9a21f9f4 /libc/arch-arm/bionic
parent5be45ce0cf81a3904c697a77fa3e73bf85aead8b (diff)
parentfdc5c1f56f9d21034badb8e4b092c47098f19613 (diff)
downloadbionic-1f2a381e844abfb364af7cfc48d8a2cb1e194637.zip
bionic-1f2a381e844abfb364af7cfc48d8a2cb1e194637.tar.gz
bionic-1f2a381e844abfb364af7cfc48d8a2cb1e194637.tar.bz2
am fdc5c1f5: Re-enable ARMv7 memcpy implementation.
Merge commit 'fdc5c1f56f9d21034badb8e4b092c47098f19613' into eclair-plus-aosp * commit 'fdc5c1f56f9d21034badb8e4b092c47098f19613': Re-enable ARMv7 memcpy implementation.
Diffstat (limited to 'libc/arch-arm/bionic')
-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