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
This commit is contained in:
Andrew Hsieh 2012-05-21 14:27:59 +08:00
parent d172e30aed
commit b968c85edf
2 changed files with 1 additions and 6 deletions

View File

@ -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

View File

@ -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