diff options
| author | 2016-08-25 12:19:36 +0000 | |
|---|---|---|
| committer | 2016-08-25 12:19:36 +0000 | |
| commit | a518c150add36b71aaaf9b904d9f5b4ad61b8c8c (patch) | |
| tree | 7daa4cc425a5e29179e310646f9c99ce2ebf84b1 /compiler/driver/compiler_driver.cc | |
| parent | c8cbbf518d8a23fecaedb22c71e44ef3736b08e2 (diff) | |
| parent | ba6b679bd34449ec56508966706ca1b8d5e7cb17 (diff) | |
Merge "ARM: Purge Arm32Assembler."
Diffstat (limited to 'compiler/driver/compiler_driver.cc')
| -rw-r--r-- | compiler/driver/compiler_driver.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc index 758cd936a2..77ec4b7dcc 100644 --- a/compiler/driver/compiler_driver.cc +++ b/compiler/driver/compiler_driver.cc @@ -372,7 +372,7 @@ CompilerDriver::CompilerDriver( method_inliner_map_(method_inliner_map), compiler_(Compiler::Create(this, compiler_kind)), compiler_kind_(compiler_kind), - instruction_set_(instruction_set), + instruction_set_(instruction_set == kArm ? kThumb2: instruction_set), instruction_set_features_(instruction_set_features), requires_constructor_barrier_lock_("constructor barrier lock"), compiled_classes_lock_("compiled classes lock"), |