From 4e78b45ba80323fbf7dd11d4e3cf4f24391218f9 Mon Sep 17 00:00:00 2001 From: Dylan McKay Date: Thu, 27 Oct 2016 08:09:15 +0000 Subject: [PATCH] [AVR] Compile the disassembler This also updates references of 'TheAVRTarget' to the new 'getTheAVRTarget()' method. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@285272 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/AVR/CMakeLists.txt | 1 + lib/Target/AVR/Disassembler/AVRDisassembler.cpp | 6 +----- lib/Target/AVR/MCTargetDesc/AVRMCTargetDesc.cpp | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/Target/AVR/CMakeLists.txt b/lib/Target/AVR/CMakeLists.txt index 9bd5e7d3aab..64f0fe0e649 100644 --- a/lib/Target/AVR/CMakeLists.txt +++ b/lib/Target/AVR/CMakeLists.txt @@ -25,6 +25,7 @@ add_llvm_target(AVRCodeGen add_dependencies(LLVMAVRCodeGen intrinsics_gen) add_subdirectory(AsmParser) +add_subdirectory(Disassembler) add_subdirectory(InstPrinter) add_subdirectory(MCTargetDesc) add_subdirectory(TargetInfo) diff --git a/lib/Target/AVR/Disassembler/AVRDisassembler.cpp b/lib/Target/AVR/Disassembler/AVRDisassembler.cpp index ae87d64dced..d2a21fb6463 100644 --- a/lib/Target/AVR/Disassembler/AVRDisassembler.cpp +++ b/lib/Target/AVR/Disassembler/AVRDisassembler.cpp @@ -45,10 +45,6 @@ public: }; } -namespace llvm { -extern Target TheAVRTarget; -} - static MCDisassembler *createAVRDisassembler(const Target &T, const MCSubtargetInfo &STI, MCContext &Ctx) { @@ -58,7 +54,7 @@ static MCDisassembler *createAVRDisassembler(const Target &T, extern "C" void LLVMInitializeAVRDisassembler() { // Register the disassembler. - TargetRegistry::RegisterMCDisassembler(TheAVRTarget, + TargetRegistry::RegisterMCDisassembler(getTheAVRTarget(), createAVRDisassembler); } diff --git a/lib/Target/AVR/MCTargetDesc/AVRMCTargetDesc.cpp b/lib/Target/AVR/MCTargetDesc/AVRMCTargetDesc.cpp index ad9b9a40e3e..a4fa5c0a931 100644 --- a/lib/Target/AVR/MCTargetDesc/AVRMCTargetDesc.cpp +++ b/lib/Target/AVR/MCTargetDesc/AVRMCTargetDesc.cpp @@ -102,7 +102,7 @@ extern "C" void LLVMInitializeAVRTargetMC() { createAVRMCInstPrinter); // Register the MC Code Emitter - TargetRegistry::RegisterMCCodeEmitter(TheAVRTarget, createAVRMCCodeEmitter); + TargetRegistry::RegisterMCCodeEmitter(getTheAVRTarget(), createAVRMCCodeEmitter); // Register the ELF streamer TargetRegistry::RegisterELFStreamer(getTheAVRTarget(), createMCStreamer); -- 2.49.0