From 9983e302384c12a975c8d2d5ae239f79fd8e1996 Mon Sep 17 00:00:00 2001 From: Roland Levillain Date: Fri, 14 Jul 2017 14:34:22 +0100 Subject: Remove the old ARM code generator from ART's Optimizing compiler. The AArch32 VIXL-based code generator has been the default ARM code generator in ART for some time now. The old ARM code generator does not compile anymore; retiring it. Test: test.py Bug: 63316036 Change-Id: Iab8fbc4ac73eac2c1a809cd7b22fec6b619755db --- compiler/optimizing/code_generator.cc | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) (limited to 'compiler/optimizing/code_generator.cc') diff --git a/compiler/optimizing/code_generator.cc b/compiler/optimizing/code_generator.cc index 93234f9630..2872cf7458 100644 --- a/compiler/optimizing/code_generator.cc +++ b/compiler/optimizing/code_generator.cc @@ -17,7 +17,6 @@ #include "code_generator.h" #ifdef ART_ENABLE_CODEGEN_arm -#include "code_generator_arm.h" #include "code_generator_arm_vixl.h" #endif @@ -627,19 +626,11 @@ std::unique_ptr CodeGenerator::Create(HGraph* graph, #ifdef ART_ENABLE_CODEGEN_arm case kArm: case kThumb2: { - if (kArmUseVIXL32) { - return std::unique_ptr( - new (arena) arm::CodeGeneratorARMVIXL(graph, - *isa_features.AsArmInstructionSetFeatures(), - compiler_options, - stats)); - } else { - return std::unique_ptr( - new (arena) arm::CodeGeneratorARM(graph, - *isa_features.AsArmInstructionSetFeatures(), - compiler_options, - stats)); - } + return std::unique_ptr( + new (arena) arm::CodeGeneratorARMVIXL(graph, + *isa_features.AsArmInstructionSetFeatures(), + compiler_options, + stats)); } #endif #ifdef ART_ENABLE_CODEGEN_arm64 -- cgit v1.2.3-59-g8ed1b