diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2016-09-21 16:53:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-09-21 16:53:32 +0000 |
| commit | be0f728348139a9185b08d4d5c5adfa806bee00b (patch) | |
| tree | 64e30afc9e2951679c372f1e14f23b10002dabfe /compiler/optimizing/code_generator.cc | |
| parent | ce092d0e374107fc7416416848d3f232233f84ee (diff) | |
| parent | 7863a2152865a12ad9593d8caad32698264153c1 (diff) | |
Merge "Revert "ARM: VIXL32: Add an initial code generator that passes codegen_tests.""
Diffstat (limited to 'compiler/optimizing/code_generator.cc')
| -rw-r--r-- | compiler/optimizing/code_generator.cc | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/compiler/optimizing/code_generator.cc b/compiler/optimizing/code_generator.cc index cf633df496..137cd21864 100644 --- a/compiler/optimizing/code_generator.cc +++ b/compiler/optimizing/code_generator.cc @@ -18,7 +18,6 @@ #ifdef ART_ENABLE_CODEGEN_arm #include "code_generator_arm.h" -#include "code_generator_arm_vixl.h" #endif #ifdef ART_ENABLE_CODEGEN_arm64 @@ -576,19 +575,11 @@ std::unique_ptr<CodeGenerator> CodeGenerator::Create(HGraph* graph, #ifdef ART_ENABLE_CODEGEN_arm case kArm: case kThumb2: { - if (kArmUseVIXL32) { - return std::unique_ptr<CodeGenerator>( - new (arena) arm::CodeGeneratorARMVIXL(graph, - *isa_features.AsArmInstructionSetFeatures(), - compiler_options, - stats)); - } else { - return std::unique_ptr<CodeGenerator>( - new (arena) arm::CodeGeneratorARM(graph, - *isa_features.AsArmInstructionSetFeatures(), - compiler_options, - stats)); - } + return std::unique_ptr<CodeGenerator>( + new (arena) arm::CodeGeneratorARM(graph, + *isa_features.AsArmInstructionSetFeatures(), + compiler_options, + stats)); } #endif #ifdef ART_ENABLE_CODEGEN_arm64 |