commit 71a6e8984ea24f531e40fb5ce07cdbe6568eaa7f
author Vladimir Marko <vmarko@google.com> Fri Mar 19 17:04:28 2021 +0000
committer Treehugger Robot <treehugger-gerrit@google.com> Fri Mar 19 21:02:26 2021 +0000
tree 6a09450b06cf34706920de8bbdfb1d96515b214a
parent e7ff7ef6e5dc2bbb52f3f5c96f14535e5fc1dca0

Fix DCHECK() in ElfBuilder.

Test: testrunner.py --target --32 --jit --debugable
Bug: 110133331
Change-Id: Idc558f156b432278479c65418b3efb37174fdd1c

libelffile/elf/elf_builder.h

diff --git a/libelffile/elf/elf_builder.h b/libelffile/elf/elf_builder.h
index 10541ec..4dde150 100644
--- a/libelffile/elf/elf_builder.h
+++ b/libelffile/elf/elf_builder.h
@@ -849,7 +849,8 @@
         LOG(FATAL) << "Unknown instruction set " << isa;
       }
     }
-    DCHECK_EQ(GetIsaFromHeader(elf_header), isa);
+    DCHECK_EQ(GetIsaFromHeader(elf_header),
+              (isa == InstructionSet::kArm) ? InstructionSet::kThumb2 : isa);
 
     elf_header.e_ident[EI_MAG0]       = ELFMAG0;
     elf_header.e_ident[EI_MAG1]       = ELFMAG1;