commit 189ae8251dfb0cace95a6c21d7f8132ecb486778
author David Srbecky <dsrbecky@google.com> Sat Apr 04 10:15:17 2015 +0100
committer David Srbecky <dsrbecky@google.com> Sat Apr 04 10:15:17 2015 +0100
tree 2fcbdb3289c316abba9a7d33cd5f630f38a4c3d9
parent 934d754a53acff144273bd7fc42f4272628bb944

Proper fix for issue 20051601 - arm actually means thumb2.

Change-Id: I38e81868cbebdccec6ecbba40494612f7c1d8092

compiler/elf_writer_quick.cc

diff --git a/compiler/elf_writer_quick.cc b/compiler/elf_writer_quick.cc
index 3ce19ab..24cb364 100644
--- a/compiler/elf_writer_quick.cc
+++ b/compiler/elf_writer_quick.cc
@@ -490,14 +490,11 @@
     int code_factor_bits_ = 0;
     int isa = -1;
     switch (oat_writer->GetOatHeader().GetInstructionSet()) {
+      case kArm:  // arm actually means thumb2.
       case kThumb2:
         code_factor_bits_ = 1;  // 16-bit instuctions
         isa = 1;  // DW_ISA_ARM_thumb.
         break;
-      case kArm:
-        code_factor_bits_ = 1;  // 16-bit instructions
-        isa = 2;  // DW_ISA_ARM_arm.
-        break;
       case kArm64:
       case kMips:
       case kMips64: