diff options
author | Andreas Gampe <agampe@google.com> | 2015-01-15 19:34:25 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-01-15 19:34:26 +0000 |
commit | 0223a19fa4fc39ba89de2b87b03b98a5fd97778b (patch) | |
tree | 0d1fdc9eb33ba27ec5fcb784ac8fee794936d8ce /dex2oat | |
parent | 726078d229fdb2857f3d8794fa50783f571cb7a2 (diff) | |
parent | 57b34294758e9c00993913ebe43c7ee4698a5cc6 (diff) | |
download | art-0223a19fa4fc39ba89de2b87b03b98a5fd97778b.zip art-0223a19fa4fc39ba89de2b87b03b98a5fd97778b.tar.gz art-0223a19fa4fc39ba89de2b87b03b98a5fd97778b.tar.bz2 |
Merge "ART: Allow to compile interpret-only mips64 files"
Diffstat (limited to 'dex2oat')
-rw-r--r-- | dex2oat/dex2oat.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc index 147700f..b576ca2 100644 --- a/dex2oat/dex2oat.cc +++ b/dex2oat/dex2oat.cc @@ -148,7 +148,7 @@ static void UsageError(const char* fmt, ...) { UsageError(" Example: --android-root=out/host/linux-x86"); UsageError(" Default: $ANDROID_ROOT"); UsageError(""); - UsageError(" --instruction-set=(arm|arm64|mips|x86|x86_64): compile for a particular"); + UsageError(" --instruction-set=(arm|arm64|mips|mips64|x86|x86_64): compile for a particular"); UsageError(" instruction set."); UsageError(" Example: --instruction-set=x86"); UsageError(" Default: arm"); @@ -870,6 +870,7 @@ class Dex2Oat FINAL { // TODO: fix compiler for Mips32r6. compiler_filter_string = "interpret-only"; } else if (instruction_set_ == kMips64) { + // For Mips64, can only compile in interpreter mode. // TODO: fix compiler for Mips64. compiler_filter_string = "interpret-only"; } else if (image_) { |