aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Hsieh <andrewhsieh@google.com>2012-03-23 17:35:11 +0800
committerAndrew Hsieh <andrewhsieh@google.com>2012-03-23 17:35:11 +0800
commitd0f2ab6936edd2601fe5edac934a1af63d0715ae (patch)
tree1b2145a9c21741c3225e110f63c28f8f7c08c81a
parentefc1f78eb19df182e8d6cd49e228c15f360691d4 (diff)
downloadexternal_qemu-d0f2ab6936edd2601fe5edac934a1af63d0715ae.zip
external_qemu-d0f2ab6936edd2601fe5edac934a1af63d0715ae.tar.gz
external_qemu-d0f2ab6936edd2601fe5edac934a1af63d0715ae.tar.bz2
Re-enable Linux 64-bit emulator
Restore rules in Makefiles for Linux 64-bit emulator, now that all the dependencies are merged (toolchain, lib64*.{a,so}, etc) Change-Id: I25ecc53837ad9f10ceafb89d9e1d7a3124ce2d71
-rw-r--r--Makefile.android12
-rw-r--r--Makefile.common9
-rw-r--r--Makefile.target4
3 files changed, 12 insertions, 13 deletions
diff --git a/Makefile.android b/Makefile.android
index c526172..6fccf71 100644
--- a/Makefile.android
+++ b/Makefile.android
@@ -98,13 +98,13 @@ ifneq ($(BUILD_STANDALONE_EMULATOR),true)
# which contains the relevant headers and 32-bit libraries for audio (The host 64-bit
# Lucid doesn't provide these anymore, only their 64-bit versions).
ifeq ($(HOST_OS),linux)
- HOST_SDK_TOOLCHAIN_PREFIX := prebuilt/linux-x86/toolchain/i686-linux-glibc2.7-4.4.3/bin/i686-linux
+ HOST_SDK_TOOLCHAIN_PREFIX := prebuilts/tools/gcc-sdk
# Don't do anything if the toolchain is not there
- ifneq (,$(strip $(wildcard $(HOST_SDK_TOOLCHAIN_PREFIX)-gcc)))
- MY_CC := $(HOST_SDK_TOOLCHAIN_PREFIX)-gcc
- MY_CXX := $(HOST_SDK_TOOLCHAIN_PREFIX)-g++
- MY_AR := $(HOST_SDK_TOOLCHAIN_PREFIX)-ar
- endif # $(HOST_SDK_TOOLCHAIN_PREFIX)-gcc exists
+ ifneq (,$(strip $(wildcard $(HOST_SDK_TOOLCHAIN_PREFIX)/gcc)))
+ MY_CC := $(HOST_SDK_TOOLCHAIN_PREFIX)/gcc
+ MY_CXX := $(HOST_SDK_TOOLCHAIN_PREFIX)/g++
+ MY_AR := $(HOST_SDK_TOOLCHAIN_PREFIX)/ar
+ endif # $(HOST_SDK_TOOLCHAIN_PREFIX)/gcc exists
endif # HOST_OS == linux
ifneq ($(USE_CCACHE),)
diff --git a/Makefile.common b/Makefile.common
index cecbf28..a72d719 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -139,12 +139,11 @@ $(call gen-hw-config-defs)
$(call end-emulator-library)
## another for 64-bit
-##### NOTE: disable 64-bit for now until new 64-bit prebuilts/gcc toolchain exist in AOSP
# NOTE: only linux in non-standalone mode is supported, because
# 1) For Windows: amd64-mingw32msvc-gcc doesn't work, see http://b/issue?id=5949152.
# 2) For MacOSX: 64-bit libSDL*.a 1.2.x depends on NSQuickDrawView doesn't exist
# 3) Standalone has --try-64
-ifeq ($(HOST_OS),)
+ifeq ($(HOST_OS),linux)
ifneq ($(BUILD_STANDALONE_EMULATOR),true)
$(call start-emulator-library, emulator64-common)
LOCAL_CFLAGS += $(common_LOCAL_CFLAGS) -m64
@@ -295,7 +294,7 @@ $(call end-emulator-library)
## another for 64-bit, see note in emulator64-common
-ifeq ($(HOST_OS),)
+ifeq ($(HOST_OS),linux)
ifneq ($(BUILD_STANDALONE_EMULATOR),true)
$(call start-emulator-library, emulator64-libui)
LOCAL_CFLAGS += $(common_LOCAL_CFLAGS) -m64
@@ -617,7 +616,7 @@ $(call end-emulator-library)
## another for 64-bit, see note in emulator64-common
-ifeq ($(HOST_OS),)
+ifeq ($(HOST_OS),linux)
ifneq ($(BUILD_STANDALONE_EMULATOR),true)
$(call start-emulator-library, emulator64-libqemu)
# gdbstub-xml.c contains C-compilable arrays corresponding to the content
@@ -711,7 +710,7 @@ $(call end-emulator-library)
## another for 64-bit, see note in emulator64-common
-ifeq ($(HOST_OS),)
+ifeq ($(HOST_OS),linux)
ifneq ($(BUILD_STANDALONE_EMULATOR),true)
$(call start-emulator-library, emulator64-libelff)
LOCAL_CPP_EXTENSION := .cc
diff --git a/Makefile.target b/Makefile.target
index 92ac855..1961acf 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -246,7 +246,7 @@ $(call gen-hx-header,qemu-options.hx,qemu-options.def,os-posix.c os-win32.c)
$(call end-emulator-library)
## another for 64-bit, see note in file Makefile.common emulator64-common
-ifeq ($(HOST_OS),)
+ifeq ($(HOST_OS),linux)
ifneq ($(BUILD_STANDALONE_EMULATOR),true)
$(call start-emulator-library, emulator64-target-$(EMULATOR_TARGET_CPU))
LOCAL_CFLAGS += $(common_LOCAL_CFLAGS) -m64
@@ -433,7 +433,7 @@ $(call end-emulator-program)
## another for 64-bit, see note in file Makefile.common emulator64-common
-ifeq ($(HOST_OS),)
+ifeq ($(HOST_OS),linux)
ifneq ($(BUILD_STANDALONE_EMULATOR),true)
$(call start-emulator-program, emulator64-$(EMULATOR_TARGET_ARCH))
LOCAL_STATIC_LIBRARIES += \