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
diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc
index ec2713a..67a9e06 100644
--- a/dex2oat/dex2oat.cc
+++ b/dex2oat/dex2oat.cc
@@ -139,7 +139,7 @@
UsageError(" Example: --android-root=out/host/linux-x86");
UsageError(" Default: $ANDROID_ROOT");
UsageError("");
- UsageError(" --instruction-set=(arm|mips|x86): compile for a particular instruction");
+ UsageError(" --instruction-set=(arm|mips|x86|x86_64): compile for a particular instruction");
UsageError(" set.");
UsageError(" Example: --instruction-set=x86");
UsageError(" Default: arm");
@@ -992,7 +992,10 @@
}
if (compiler_filter_string == NULL) {
- if (image) {
+ if (instruction_set == kX86_64) {
+ // TODO: currently x86-64 is only interpreted.
+ compiler_filter_string = "interpret-only";
+ } else if (image) {
compiler_filter_string = "speed";
} else {
#if ART_SMALL_MODE