From 334ab475d2f27dbf6fbf836c2d4fb86dbb02a15c Mon Sep 17 00:00:00 2001 From: Jun Nakajima Date: Wed, 2 Feb 2011 23:49:59 -0800 Subject: x86: Add x86 support. Rebase the change (20906/1) due to a minor conflict. Change-Id: Ic73cca0fc6c6e5cf74f63daa6080d00aa7c392bb Signed-off-by: Xiaohui Xin Signed-off-by: Yunhong Jiang Signed-off-by: Jun Nakajima --- android/config/config.h | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'android/config') diff --git a/android/config/config.h b/android/config/config.h index 7ceac69..fdfbe31 100644 --- a/android/config/config.h +++ b/android/config/config.h @@ -1,16 +1,23 @@ /* Automatically generated by configure - do not modify */ #include "config-host.h" -#define CONFIG_QEMU_PREFIX "/usr/gnemul/qemu-arm" -#define TARGET_ARCH "arm" -#define TARGET_ARM 1 + #define TARGET_PHYS_ADDR_BITS 32 #define CONFIG_TRACE 1 #define CONFIG_NAND 1 #define CONFIG_SHAPER 1 #define CONFIG_SOFTMMU 1 -#define CONFIG_SOFTFLOAT 1 #define CONFIG_SDL 1 #ifndef _WIN32 #define CONFIG_NAND_LIMITS 1 #endif #define CONFIG_ANDROID_SNAPSHOTS 1 + +#ifdef ARCH_FLAGS_x86 +#define TARGET_ARCH "x86" +#define TARGET_I386 1 +#else +#define TARGET_ARCH "arm" +#define TARGET_ARM 1 +#define CONFIG_SOFTFLOAT 1 +#endif + -- cgit v1.1