diff options
| author | 2016-08-15 14:22:07 +0100 | |
|---|---|---|
| committer | 2016-08-19 10:39:23 +0100 | |
| commit | ba6b679bd34449ec56508966706ca1b8d5e7cb17 (patch) | |
| tree | ec5985cc0f9e8a75c717513954d25d69e526065e /compiler/optimizing/optimizing_compiler.cc | |
| parent | f606c3a687e3eae94296ba74d2d820b6e37692ff (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/optimizing/optimizing_compiler.cc')
| -rw-r--r-- | compiler/optimizing/optimizing_compiler.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc index a1da20bae4..698b0b6d43 100644 --- a/compiler/optimizing/optimizing_compiler.cc +++ b/compiler/optimizing/optimizing_compiler.cc @@ -833,9 +833,7 @@ CodeGenerator* OptimizingCompiler::TryCompile(ArenaAllocator* arena, // Always use the Thumb-2 assembler: some runtime functionality // (like implicit stack overflow checks) assume Thumb-2. - if (instruction_set == kArm) { - instruction_set = kThumb2; - } + DCHECK_NE(instruction_set, kArm); // Do not attempt to compile on architectures we do not support. if (!IsInstructionSetSupported(instruction_set)) { |