summaryrefslogtreecommitdiff
path: root/compiler/driver/compiler_driver.cc
diff options
context:
space:
mode:
author Artem Serov <artem.serov@linaro.org> 2016-08-15 14:22:07 +0100
committer Artem Serov <artem.serov@linaro.org> 2016-08-19 10:39:23 +0100
commitba6b679bd34449ec56508966706ca1b8d5e7cb17 (patch)
treeec5985cc0f9e8a75c717513954d25d69e526065e /compiler/driver/compiler_driver.cc
parentf606c3a687e3eae94296ba74d2d820b6e37692ff (diff)
ARM: Purge Arm32Assembler.
Use Thumb2Assembler always. This originated from finding out that the JNI tests are run using the Arm32Assembler however in real world Thumb2Assembler is used for JNI. Therefore Arm32Assembler code is dead except its own tests and the illegitimate use in JNI tests. Change-Id: I9ca6b83582bf97149a46690518ccb9312b1a3b68
Diffstat (limited to 'compiler/driver/compiler_driver.cc')
-rw-r--r--compiler/driver/compiler_driver.cc2
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"),