[ARC] 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. llvm-svn: 360488
llvm · May 11, 2019 · dcf1ea0 · dcf1ea0
1 parent c0bd7bd
commit dcf1ea0
Showing 10 changed files with 5 additions and 31 deletions.
diff --git a/llvm/lib/Target/ARC/ARCAsmPrinter.cpp b/llvm/lib/Target/ARC/ARCAsmPrinter.cpp
@@ -17,7 +17,7 @@
 #include "ARCSubtarget.h"
 #include "ARCTargetMachine.h"
 #include "ARCTargetStreamer.h"
-#include "InstPrinter/ARCInstPrinter.h"
+#include "MCTargetDesc/ARCInstPrinter.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/CodeGen/AsmPrinter.h"

diff --git a/llvm/lib/Target/ARC/CMakeLists.txt b/llvm/lib/Target/ARC/CMakeLists.txt
@@ -27,6 +27,5 @@ add_llvm_target(ARCCodeGen
   )
 
 add_subdirectory(Disassembler)
-add_subdirectory(InstPrinter)
 add_subdirectory(MCTargetDesc)
 add_subdirectory(TargetInfo)
diff --git a/llvm/lib/Target/ARC/InstPrinter/CMakeLists.txt b/llvm/lib/Target/ARC/InstPrinter/CMakeLists.txt
diff --git a/llvm/lib/Target/ARC/InstPrinter/LLVMBuild.txt b/llvm/lib/Target/ARC/InstPrinter/LLVMBuild.txt
diff --git a/llvm/lib/Target/ARC/LLVMBuild.txt b/llvm/lib/Target/ARC/LLVMBuild.txt
@@ -15,7 +15,7 @@
 ;===------------------------------------------------------------------------===;
 
 [common]
-subdirectories = Disassembler InstPrinter MCTargetDesc TargetInfo
+subdirectories = Disassembler MCTargetDesc TargetInfo
 
 [component_0]
 type = TargetGroup
@@ -38,7 +38,6 @@ required_libraries =
  Support
  Target
  TransformUtils
- ARCAsmPrinter
  ARCDesc
  ARCInfo
 add_to_library_groups = ARC
diff --git a/...Target/ARC/InstPrinter/ARCInstPrinter.cpp → ...arget/ARC/MCTargetDesc/ARCInstPrinter.cpp b/...Target/ARC/InstPrinter/ARCInstPrinter.cpp → ...arget/ARC/MCTargetDesc/ARCInstPrinter.cpp
diff --git a/...b/Target/ARC/InstPrinter/ARCInstPrinter.h → .../Target/ARC/MCTargetDesc/ARCInstPrinter.h b/...b/Target/ARC/InstPrinter/ARCInstPrinter.h → .../Target/ARC/MCTargetDesc/ARCInstPrinter.h
diff --git a/llvm/lib/Target/ARC/MCTargetDesc/ARCMCTargetDesc.cpp b/llvm/lib/Target/ARC/MCTargetDesc/ARCMCTargetDesc.cpp
@@ -11,9 +11,9 @@
 //===----------------------------------------------------------------------===//
 
 #include "ARCMCTargetDesc.h"
+#include "ARCInstPrinter.h"
 #include "ARCMCAsmInfo.h"
 #include "ARCTargetStreamer.h"
-#include "InstPrinter/ARCInstPrinter.h"
 #include "llvm/MC/MCDwarf.h"
 #include "llvm/MC/MCInstrInfo.h"
 #include "llvm/MC/MCRegisterInfo.h"

diff --git a/llvm/lib/Target/ARC/MCTargetDesc/CMakeLists.txt b/llvm/lib/Target/ARC/MCTargetDesc/CMakeLists.txt
@@ -1,4 +1,5 @@
 add_llvm_library(LLVMARCDesc
+  ARCInstPrinter.cpp
   ARCMCTargetDesc.cpp
   ARCMCAsmInfo.cpp
   )
diff --git a/llvm/lib/Target/ARC/MCTargetDesc/LLVMBuild.txt b/llvm/lib/Target/ARC/MCTargetDesc/LLVMBuild.txt
@@ -18,5 +18,5 @@
 type = Library
 name = ARCDesc
 parent = ARC
-required_libraries = MC Support ARCAsmPrinter ARCInfo
+required_libraries = MC Support ARCInfo
 add_to_library_groups = ARC