commit 53bee42d0f8b454ff4fe5b7e42bdb070c786e3eb
author Mathieu Chartier <mathieuc@google.com> Fri Apr 04 16:10:05 2014 -0700
committer Mathieu Chartier <mathieuc@google.com> Fri Apr 04 16:10:05 2014 -0700
tree 9f141d43651f653220b4dd991330872a9f127fa9
parent 97a332b4476d5a2b4ad0650dacc6bfcff882fc57

Fix using kArm instead of kThumb2.

Change-Id: I0f3bf93b38d910bc57d017693675829b6a39bc18

compiler/dex/frontend.cc

diff --git a/compiler/dex/frontend.cc b/compiler/dex/frontend.cc
index e48e5bf..201dc47 100644
--- a/compiler/dex/frontend.cc
+++ b/compiler/dex/frontend.cc
@@ -155,13 +155,16 @@
   cu.compiler_driver = &driver;
   cu.class_linker = class_linker;
   cu.instruction_set = driver.GetInstructionSet();
+  if (cu.instruction_set == kArm) {
+    cu.instruction_set = kThumb2;
+  }
   cu.target64 = (cu.instruction_set == kX86_64) || (cu.instruction_set == kArm64);
   cu.compiler = compiler;
   // TODO: x86_64 & arm64 are not yet implemented.
-  DCHECK((cu.instruction_set == kThumb2) ||
-         (cu.instruction_set == kX86) ||
-         (cu.instruction_set == kX86_64) ||
-         (cu.instruction_set == kMips));
+  CHECK((cu.instruction_set == kThumb2) ||
+        (cu.instruction_set == kX86) ||
+        (cu.instruction_set == kX86_64) ||
+        (cu.instruction_set == kMips));
 
 
   /* Adjust this value accordingly once inlining is performed */