diff options
| author | 2014-06-26 08:28:46 +0000 | |
|---|---|---|
| committer | 2014-06-24 06:22:45 +0000 | |
| commit | b1cbf58b4d0bfe58d1ac8716c1d5c4c646983478 (patch) | |
| tree | 68577e03c46875b7f22f2ba9c5b07acf1877d6d9 /compiler/optimizing/optimizing_compiler.cc | |
| parent | 0c1734665c38b3116e38a90ad06c3f152d9316c5 (diff) | |
| parent | f61b5377068f22c0be7b2f6e62961e620408beb2 (diff) | |
Merge "Re-enable tests with the optimizing compiler."
Diffstat (limited to 'compiler/optimizing/optimizing_compiler.cc')
| -rw-r--r-- | compiler/optimizing/optimizing_compiler.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc index 56029aa30b..ccacbef401 100644 --- a/compiler/optimizing/optimizing_compiler.cc +++ b/compiler/optimizing/optimizing_compiler.cc @@ -101,6 +101,10 @@ CompiledMethod* OptimizingCompiler::TryCompile(const DexFile::CodeItem* code_ite } InstructionSet instruction_set = GetCompilerDriver()->GetInstructionSet(); + // The optimizing compiler currently does not have a Thumb2 assembler. + if (instruction_set == kThumb2) { + instruction_set = kArm; + } CodeGenerator* codegen = CodeGenerator::Create(&arena, graph, instruction_set); if (codegen == nullptr) { if (shouldCompile) { |