From fdc5c1f56f9d21034badb8e4b092c47098f19613 Mon Sep 17 00:00:00 2001 From: David 'Digit' Turner Date: Mon, 5 Oct 2009 14:11:55 -0700 Subject: 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. --- libc/arch-arm/bionic/memcpy.S | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'libc/arch-arm') 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 -/* 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 -- cgit v1.1