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 /dex2oat | |
| parent | 97c3d61e46a3678dac848578c686c724ec3397fa (diff) | |
| download | art-befbd5731ecca08f08780ee28a913d08ffb14656.zip art-befbd5731ecca08f08780ee28a913d08ffb14656.tar.gz art-befbd5731ecca08f08780ee28a913d08ffb14656.tar.bz2 | |
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 'dex2oat')
| -rw-r--r-- | dex2oat/dex2oat.cc | 7 |
1 files changed, 5 insertions, 2 deletions
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 @@ static void Usage(const char* fmt, ...) { 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 @@ static int dex2oat(int argc, char** argv) { } 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 |