diff options
| author | 2014-10-23 12:48:02 +0000 | |
|---|---|---|
| committer | 2014-10-23 12:48:02 +0000 | |
| commit | e833b110876fa8fe34a08f06d2521c74488180bb (patch) | |
| tree | 909c6b29f065c79c8368a283946947cbb582d1c7 /compiler/optimizing/optimizing_compiler.cc | |
| parent | 37a7188810e865a1ee0a7bdc2d01d62c1f1ea49e (diff) | |
| parent | 5319defdf502fc4569316473846b83180ec08035 (diff) | |
Merge "ART: optimizing compiler: initial support for ARM64."
Diffstat (limited to 'compiler/optimizing/optimizing_compiler.cc')
| -rw-r--r-- | compiler/optimizing/optimizing_compiler.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc index dce8e6d78b..80e9cdb16f 100644 --- a/compiler/optimizing/optimizing_compiler.cc +++ b/compiler/optimizing/optimizing_compiler.cc @@ -215,7 +215,10 @@ CompiledMethod* OptimizingCompiler::TryCompile(const DexFile::CodeItem* code_ite } // Do not attempt to compile on architectures we do not support. - if (instruction_set != kX86 && instruction_set != kX86_64 && instruction_set != kThumb2) { + if (instruction_set != kArm64 && + instruction_set != kThumb2 && + instruction_set != kX86 && + instruction_set != kX86_64) { return nullptr; } |