diff options
| author | Ian Rogers <irogers@google.com> | 2014-03-06 01:13:39 -0800 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-03-06 01:34:07 -0800 |
| commit | befbd5731ecca08f08780ee28a913d08ffb14656 (patch) | |
| tree | ee359fc38671950afa91d96bf8c29232a799b628 /build/Android.oat.mk | |
| parent | 97c3d61e46a3678dac848578c686c724ec3397fa (diff) | |
| download | android_art-befbd5731ecca08f08780ee28a913d08ffb14656.tar.gz android_art-befbd5731ecca08f08780ee28a913d08ffb14656.tar.bz2 android_art-befbd5731ecca08f08780ee28a913d08ffb14656.zip | |
Fix host architecture for 64bit.
Also, hack x86 assembler for use as a x86-64 trampoline compiler's assembler.
Implement missing x86-64 quick resolution trampoline.
Add x86-64 to the quick elf writer.
Change-Id: I08216c67014a83492ada12898ab8000218ba7bb4
Diffstat (limited to 'build/Android.oat.mk')
| -rw-r--r-- | build/Android.oat.mk | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/build/Android.oat.mk b/build/Android.oat.mk index c25925d5a7..6012421a59 100644 --- a/build/Android.oat.mk +++ b/build/Android.oat.mk @@ -40,13 +40,19 @@ TARGET_CORE_IMG_OUT := $(ART_TEST_OUT)/core.art TARGET_INSTRUCTION_SET_FEATURES := $(DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES) +ifeq ($(BUILD_HOST_64bit),) +host_arch := x86 +else +host_arch := x86_64 +endif + $(HOST_CORE_IMG_OUT): $(HOST_CORE_DEX_FILES) $(DEX2OAT_DEPENDENCY) @echo "host dex2oat: $@ ($?)" @mkdir -p $(dir $@) $(hide) $(DEX2OAT) --runtime-arg -Xms16m --runtime-arg -Xmx16m --image-classes=$(PRELOADED_CLASSES) $(addprefix \ --dex-file=,$(HOST_CORE_DEX_FILES)) $(addprefix --dex-location=,$(HOST_CORE_DEX_LOCATIONS)) --oat-file=$(HOST_CORE_OAT_OUT) \ --oat-location=$(HOST_CORE_OAT) --image=$(HOST_CORE_IMG_OUT) --base=$(LIBART_IMG_HOST_BASE_ADDRESS) \ - --instruction-set=$(HOST_ARCH) --host --android-root=$(HOST_OUT) + --instruction-set=$(host_arch) --host --android-root=$(HOST_OUT) $(TARGET_CORE_IMG_OUT): $(TARGET_CORE_DEX_FILES) $(DEX2OAT_DEPENDENCY) @echo "target dex2oat: $@ ($?)" |