am 1e40783d: Fix armv7-user builds by disabling the ARMv7-optimized memcpy.

Merge commit '1e40783d9ad29c88a4d547774e05080fc4327a2e' into eclair-plus-aosp

* commit '1e40783d9ad29c88a4d547774e05080fc4327a2e':
  Fix armv7-user builds by disabling the ARMv7-optimized memcpy.
This commit is contained in:
David 'Digit' Turner 2009-10-07 11:42:33 -07:00 committed by Android Git Automerger
commit 5be45ce0cf

View File

@ -28,7 +28,21 @@
#include <machine/cpu-features.h>
#if __ARM_ARCH__ == 7 || defined(__ARM_NEON__)
/* 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__) */
.text
.fpu neon