From ea54b823a3a02f65c865e11bbbccb327a273c039 Mon Sep 17 00:00:00 2001 From: Alex Light Date: Fri, 10 Jul 2020 18:28:56 +0000 Subject: Revert "Switch to LLVM prebuilt tools for ART gtests" This reverts commit 8070443ce4b31a6787c22490f18f838f8f6ed4be. Reason for revert: Failing on chrome buildbots. Test: None Bug: 137817558 Change-Id: I4cbb4898e859ce33560592dd63cbf4a413048662 --- compiler/utils/assembler_test_base.h | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'compiler/utils/assembler_test_base.h') diff --git a/compiler/utils/assembler_test_base.h b/compiler/utils/assembler_test_base.h index 736a292667..1567367b67 100644 --- a/compiler/utils/assembler_test_base.h +++ b/compiler/utils/assembler_test_base.h @@ -135,24 +135,22 @@ class AssemblerTestBase : public testing::Test { } virtual std::vector GetAssemblerCommand() { - InstructionSet isa = GetIsa(); - switch (isa) { + switch (GetIsa()) { case InstructionSet::kX86: - return {FindTool("clang"), "--compile", "-target", "i386-linux-gnu"}; + return {FindTool("as"), "--32"}; case InstructionSet::kX86_64: - return {FindTool("clang"), "--compile", "-target", "x86_64-linux-gnu"}; + return {FindTool("as"), "--64"}; default: - LOG(FATAL) << "Unknown instruction set: " << isa; - UNREACHABLE(); + return {FindTool("as")}; } } virtual std::vector GetDisassemblerCommand() { switch (GetIsa()) { case InstructionSet::kThumb2: - return {FindTool("llvm-objdump"), "--disassemble", "-triple", "thumbv7a-linux-gnueabi"}; + return {FindTool("objdump"), "--disassemble", "-M", "force-thumb"}; default: - return {FindTool("llvm-objdump"), "--disassemble", "--no-show-raw-insn"}; + return {FindTool("objdump"), "--disassemble", "--no-show-raw-insn"}; } } -- cgit v1.2.3-59-g8ed1b