[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.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@360488 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Target/ARC/ARCAsmPrinter.cpp b/lib/Target/ARC/ARCAsmPrinter.cpp
index 487360ebc13c7f41dbf94d062fd2179b53b17a8a..668f6ca7a15dee36cce2a59d50270dbb35a1e474 100644 (file)
--- a/lib/Target/ARC/ARCAsmPrinter.cpp
+++ b/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/lib/Target/ARC/CMakeLists.txt b/lib/Target/ARC/CMakeLists.txt
index b99ba203aad5857c60207abe5ba7d1fb4ce6a14c..a1604792f6ec86a4d54e9164986a9db94ab308fe 100644 (file)
--- a/lib/Target/ARC/CMakeLists.txt
+++ b/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/lib/Target/ARC/InstPrinter/CMakeLists.txt b/lib/Target/ARC/InstPrinter/CMakeLists.txt
deleted file mode 100644 (file)
index fd6b469..0000000
--- a/lib/Target/ARC/InstPrinter/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-add_llvm_library(LLVMARCAsmPrinter
-  ARCInstPrinter.cpp
-  )

diff --git a/lib/Target/ARC/InstPrinter/LLVMBuild.txt b/lib/Target/ARC/InstPrinter/LLVMBuild.txt
deleted file mode 100644 (file)
index 5133da1..0000000
--- a/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/lib/Target/ARC/LLVMBuild.txt b/lib/Target/ARC/LLVMBuild.txt
index a8113f65e3a93631dd7404ffb6f9a06f0bb4c363..365805a0d79d09b31a889033a782a96e650b4eea 100644 (file)
--- a/lib/Target/ARC/LLVMBuild.txt
+++ b/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/lib/Target/ARC/InstPrinter/ARCInstPrinter.cpp b/lib/Target/ARC/MCTargetDesc/ARCInstPrinter.cpp
similarity index 100%
rename from lib/Target/ARC/InstPrinter/ARCInstPrinter.cpp
rename to lib/Target/ARC/MCTargetDesc/ARCInstPrinter.cpp

diff --git a/lib/Target/ARC/InstPrinter/ARCInstPrinter.h b/lib/Target/ARC/MCTargetDesc/ARCInstPrinter.h
similarity index 100%
rename from lib/Target/ARC/InstPrinter/ARCInstPrinter.h
rename to lib/Target/ARC/MCTargetDesc/ARCInstPrinter.h

diff --git a/lib/Target/ARC/MCTargetDesc/ARCMCTargetDesc.cpp b/lib/Target/ARC/MCTargetDesc/ARCMCTargetDesc.cpp
index 0771302480922ccc263b19d2c5ec54aa2f8b3cc9..5739866993be4d65eb625a55993b10f572d6c8aa 100644 (file)
--- a/lib/Target/ARC/MCTargetDesc/ARCMCTargetDesc.cpp
+++ b/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/lib/Target/ARC/MCTargetDesc/CMakeLists.txt b/lib/Target/ARC/MCTargetDesc/CMakeLists.txt
index 243198d253fe8281a475103a70b4ef79be37144a..108fb93cafa5b61171cec38f2126c8ac430e8d45 100644 (file)
--- a/lib/Target/ARC/MCTargetDesc/CMakeLists.txt
+++ b/lib/Target/ARC/MCTargetDesc/CMakeLists.txt
@@ -1,4 +1,5 @@
 add_llvm_library(LLVMARCDesc
+  ARCInstPrinter.cpp
   ARCMCTargetDesc.cpp
   ARCMCAsmInfo.cpp
   )

diff --git a/lib/Target/ARC/MCTargetDesc/LLVMBuild.txt b/lib/Target/ARC/MCTargetDesc/LLVMBuild.txt
index 6abf96e066e08c61f2bef48dd07701a588e25a15..5d2e0e6facead5bd65f6bbca2087e2939d0f01f6 100644 (file)
--- a/lib/Target/ARC/MCTargetDesc/LLVMBuild.txt
+++ b/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