[llvm] r360493 - [AVR] Move InstPrinter files to MCTargetDesc. NFC

[Richard Trieu via llvm-commits]

Author: rtrieu
Date: Fri May 10 18:03:03 2019
New Revision: 360493

URL: http://llvm.org/viewvc/llvm-project?rev=360493&view=rev
Log:
[AVR] Move InstPrinter files to MCTargetDesc.  NFC

For some targets, there is a circular dependency between InstPrinter and
MCTargetDesc.  Merging them together will fix this.  For the other targets,
the merging is to maintain consistency so all targets will have the same
structure.

Added:
    llvm/trunk/lib/Target/AVR/MCTargetDesc/AVRInstPrinter.cpp
      - copied unchanged from r360492, llvm/trunk/lib/Target/AVR/InstPrinter/AVRInstPrinter.cpp
    llvm/trunk/lib/Target/AVR/MCTargetDesc/AVRInstPrinter.h
      - copied unchanged from r360492, llvm/trunk/lib/Target/AVR/InstPrinter/AVRInstPrinter.h
Removed:
    llvm/trunk/lib/Target/AVR/InstPrinter/
Modified:
    llvm/trunk/lib/Target/AVR/AVRAsmPrinter.cpp
    llvm/trunk/lib/Target/AVR/CMakeLists.txt
    llvm/trunk/lib/Target/AVR/LLVMBuild.txt
    llvm/trunk/lib/Target/AVR/MCTargetDesc/AVRMCTargetDesc.cpp
    llvm/trunk/lib/Target/AVR/MCTargetDesc/CMakeLists.txt
    llvm/trunk/lib/Target/AVR/MCTargetDesc/LLVMBuild.txt

Modified: llvm/trunk/lib/Target/AVR/AVRAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AVR/AVRAsmPrinter.cpp?rev=360493&r1=360492&r2=360493&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AVR/AVRAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/AVR/AVRAsmPrinter.cpp Fri May 10 18:03:03 2019
@@ -14,7 +14,7 @@
 #include "AVR.h"
 #include "AVRMCInstLower.h"
 #include "AVRSubtarget.h"
-#include "InstPrinter/AVRInstPrinter.h"
+#include "MCTargetDesc/AVRInstPrinter.h"
 
 #include "llvm/CodeGen/AsmPrinter.h"
 #include "llvm/CodeGen/MachineFunction.h"

Modified: llvm/trunk/lib/Target/AVR/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AVR/CMakeLists.txt?rev=360493&r1=360492&r2=360493&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AVR/CMakeLists.txt (original)
+++ llvm/trunk/lib/Target/AVR/CMakeLists.txt Fri May 10 18:03:03 2019
@@ -32,6 +32,5 @@ add_llvm_target(AVRCodeGen
 
 add_subdirectory(AsmParser)
 add_subdirectory(Disassembler)
-add_subdirectory(InstPrinter)
 add_subdirectory(MCTargetDesc)
 add_subdirectory(TargetInfo)

Modified: llvm/trunk/lib/Target/AVR/LLVMBuild.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AVR/LLVMBuild.txt?rev=360493&r1=360492&r2=360493&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AVR/LLVMBuild.txt (original)
+++ llvm/trunk/lib/Target/AVR/LLVMBuild.txt Fri May 10 18:03:03 2019
@@ -15,7 +15,7 @@
 ;===------------------------------------------------------------------------===;
 
 [common]
-subdirectories = AsmParser Disassembler InstPrinter MCTargetDesc TargetInfo
+subdirectories = AsmParser Disassembler MCTargetDesc TargetInfo
 
 [component_0]
 type = TargetGroup
@@ -29,6 +29,6 @@ has_disassembler = 1
 type = Library
 name = AVRCodeGen
 parent = AVR
-required_libraries = AsmPrinter CodeGen Core MC AVRAsmPrinter AVRDesc AVRInfo SelectionDAG Support Target
+required_libraries = AsmPrinter CodeGen Core MC AVRDesc AVRInfo SelectionDAG Support Target
 add_to_library_groups = AVR
 

Modified: llvm/trunk/lib/Target/AVR/MCTargetDesc/AVRMCTargetDesc.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AVR/MCTargetDesc/AVRMCTargetDesc.cpp?rev=360493&r1=360492&r2=360493&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AVR/MCTargetDesc/AVRMCTargetDesc.cpp (original)
+++ llvm/trunk/lib/Target/AVR/MCTargetDesc/AVRMCTargetDesc.cpp Fri May 10 18:03:03 2019
@@ -11,11 +11,11 @@
 //===----------------------------------------------------------------------===//
 
 #include "AVRELFStreamer.h"
+#include "AVRInstPrinter.h"
 #include "AVRMCAsmInfo.h"
 #include "AVRMCELFStreamer.h"
 #include "AVRMCTargetDesc.h"
 #include "AVRTargetStreamer.h"
-#include "InstPrinter/AVRInstPrinter.h"
 
 #include "llvm/MC/MCAsmBackend.h"
 #include "llvm/MC/MCELFStreamer.h"

Modified: llvm/trunk/lib/Target/AVR/MCTargetDesc/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AVR/MCTargetDesc/CMakeLists.txt?rev=360493&r1=360492&r2=360493&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AVR/MCTargetDesc/CMakeLists.txt (original)
+++ llvm/trunk/lib/Target/AVR/MCTargetDesc/CMakeLists.txt Fri May 10 18:03:03 2019
@@ -2,6 +2,7 @@ add_llvm_library(LLVMAVRDesc
   AVRAsmBackend.cpp
   AVRELFObjectWriter.cpp
   AVRELFStreamer.cpp
+  AVRInstPrinter.cpp
   AVRMCAsmInfo.cpp
   AVRMCCodeEmitter.cpp
   AVRMCELFStreamer.cpp

Modified: llvm/trunk/lib/Target/AVR/MCTargetDesc/LLVMBuild.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AVR/MCTargetDesc/LLVMBuild.txt?rev=360493&r1=360492&r2=360493&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AVR/MCTargetDesc/LLVMBuild.txt (original)
+++ llvm/trunk/lib/Target/AVR/MCTargetDesc/LLVMBuild.txt Fri May 10 18:03:03 2019
@@ -18,5 +18,5 @@
 type = Library
 name = AVRDesc
 parent = AVR
-required_libraries = MC AVRAsmPrinter AVRInfo Support
+required_libraries = MC AVRInfo Support
 add_to_library_groups = AVR