From 7863a2152865a12ad9593d8caad32698264153c1 Mon Sep 17 00:00:00 2001
From: Nicolas Geoffray <ngeoffray@google.com>
Date: Wed, 21 Sep 2016 16:53:03 +0000
Subject: Revert "ARM: VIXL32: Add an initial code generator that passes
 codegen_tests."

Failing with:
art/compiler/optimizing/code_generator_arm_vixl.cc:396:47: error: too few arguments to function call, expected 3, have 2
  ValidateInvokeRuntime(instruction, slow_path);

This reverts commit b138dfbd76f9d8b64fb9dbaf1a7c25e2549b2a8c.

Change-Id: Idccfe076f5905ea92ecbe3afbc7c8c64ecda94be
---
 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 1444931b9c..2087888f4e 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
-- 
cgit v1.2.3-59-g8ed1b