From b968c85edf69025e7efc5886229f16982a9165f1 Mon Sep 17 00:00:00 2001 From: Andrew Hsieh Date: Mon, 21 May 2012 14:27:59 +0800 Subject: [PATCH] Set generic_x86/BoardConfig.mk TARGET_ARCH_VARIANT to x86 Change TARGET_ARCH_VARIANT from x86-atom to x86, for the reason that atom-specific instruciton like "movbe" isn't "generic" to x86 Android devices and x86 host running emulator-x86, which may crash non-atom host in VT because "movbe" isn't supported natively. Also revert previous fix in TARGET_linux-x86.mk which conservatively disable "movbe" across the board Change-Id: Ief93a3585566ffae558fcdc29741e6213a048d7d --- core/combo/TARGET_linux-x86.mk | 5 ----- target/board/generic_x86/BoardConfig.mk | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk index cb251d388d..a4d07b51dc 100644 --- a/core/combo/TARGET_linux-x86.mk +++ b/core/combo/TARGET_linux-x86.mk @@ -132,11 +132,6 @@ TARGET_GLOBAL_CFLAGS += -mbionic # TARGET_GLOBAL_CFLAGS += -D__ANDROID__ -# instructions "movbe" is only available in Intel atom. Disable it -# for general x86 device and x86 host which runs emulator-x86 -# -TARGET_GLOBAL_CFLAGS += -mno-movbe - # XXX: This flag is probably redundant since our toolchain binaries already # generate 32-bit machine code. It probably dates back to the old days # where we were using the host toolchain on Linux to build the platform diff --git a/target/board/generic_x86/BoardConfig.mk b/target/board/generic_x86/BoardConfig.mk index 35a55201f9..c0d7a253a1 100644 --- a/target/board/generic_x86/BoardConfig.mk +++ b/target/board/generic_x86/BoardConfig.mk @@ -8,7 +8,7 @@ TARGET_NO_BOOTLOADER := true TARGET_NO_KERNEL := true TARGET_CPU_ABI := x86 TARGET_ARCH := x86 -TARGET_ARCH_VARIANT := x86-atom +TARGET_ARCH_VARIANT := x86 TARGET_PRELINK_MODULE := false # The IA emulator (qemu) uses the Goldfish devices