[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

10 files changed, 5 insertions, 31 deletions

diff --git a/llvm/lib/Target/ARC/ARCAsmPrinter.cpp b/llvm/lib/Target/ARC/ARCAsmPrinter.cpp
index 487360ebc13..668f6ca7a15 100644
--- 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
index b99ba203aad..a1604792f6e 100644
--- 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
deleted file mode 100644
index fd6b469cdfb..00000000000
--- a/llvm/lib/Target/ARC/InstPrinter/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-add_llvm_library(LLVMARCAsmPrinter
-  ARCInstPrinter.cpp
-  )
diff --git a/llvm/lib/Target/ARC/InstPrinter/LLVMBuild.txt b/llvm/lib/Target/ARC/InstPrinter/LLVMBuild.txt
deleted file mode 100644
index 5133da1ef12..00000000000
--- a/llvm/lib/Target/ARC/InstPrinter/LLVMBuild.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-;===- ./lib/Target/ARC/InstPrinter/LLVMBuild.txt -------------*- Conf -*--===;
-;
-; Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-; See https://llvm.org/LICENSE.txt for license information.
-; SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-;
-;===------------------------------------------------------------------------===;
-;
-; This is an LLVMBuild description file for the components in this subdirectory.
-;
-; For more information on the LLVMBuild system, please see:
-;
-;   http://llvm.org/docs/LLVMBuild.html
-;
-;===------------------------------------------------------------------------===;
-
-[component_0]
-type = Library
-name = ARCAsmPrinter
-parent = ARC
-required_libraries = MC Support
-add_to_library_groups = ARC
diff --git a/llvm/lib/Target/ARC/LLVMBuild.txt b/llvm/lib/Target/ARC/LLVMBuild.txt
index a8113f65e3a..365805a0d79 100644
--- 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/llvm/lib/Target/ARC/InstPrinter/ARCInstPrinter.cpp b/llvm/lib/Target/ARC/MCTargetDesc/ARCInstPrinter.cpp
index e3e0ea48995..e3e0ea48995 100644
--- a/llvm/lib/Target/ARC/InstPrinter/ARCInstPrinter.cpp
+++ b/llvm/lib/Target/ARC/MCTargetDesc/ARCInstPrinter.cpp
diff --git a/llvm/lib/Target/ARC/InstPrinter/ARCInstPrinter.h b/llvm/lib/Target/ARC/MCTargetDesc/ARCInstPrinter.h
index 5ea58407f9e..5ea58407f9e 100644
--- a/llvm/lib/Target/ARC/InstPrinter/ARCInstPrinter.h
+++ b/llvm/lib/Target/ARC/MCTargetDesc/ARCInstPrinter.h
diff --git a/llvm/lib/Target/ARC/MCTargetDesc/ARCMCTargetDesc.cpp b/llvm/lib/Target/ARC/MCTargetDesc/ARCMCTargetDesc.cpp
index 07713024809..5739866993b 100644
--- 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
index 243198d253f..108fb93cafa 100644
--- 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
index 6abf96e066e..5d2e0e6face 100644
--- 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