From 03b40dc96e3940714440ac045f4d6723b10e12b2 Mon Sep 17 00:00:00 2001 From: Richard Trieu Date: Sat, 11 May 2019 02:59:02 +0000 Subject: [PATCH] [Sparc] 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@360506 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/Sparc/CMakeLists.txt | 1 - lib/Target/Sparc/InstPrinter/CMakeLists.txt | 3 --- lib/Target/Sparc/InstPrinter/LLVMBuild.txt | 22 ------------------- lib/Target/Sparc/LLVMBuild.txt | 4 ++-- lib/Target/Sparc/MCTargetDesc/CMakeLists.txt | 1 + lib/Target/Sparc/MCTargetDesc/LLVMBuild.txt | 2 +- .../SparcInstPrinter.cpp | 0 .../SparcInstPrinter.h | 4 ++-- .../Sparc/MCTargetDesc/SparcMCTargetDesc.cpp | 2 +- .../MCTargetDesc/SparcTargetStreamer.cpp | 2 +- lib/Target/Sparc/SparcAsmPrinter.cpp | 2 +- 11 files changed, 9 insertions(+), 34 deletions(-) delete mode 100644 lib/Target/Sparc/InstPrinter/CMakeLists.txt delete mode 100644 lib/Target/Sparc/InstPrinter/LLVMBuild.txt rename lib/Target/Sparc/{InstPrinter => MCTargetDesc}/SparcInstPrinter.cpp (100%) rename lib/Target/Sparc/{InstPrinter => MCTargetDesc}/SparcInstPrinter.h (94%) diff --git a/lib/Target/Sparc/CMakeLists.txt b/lib/Target/Sparc/CMakeLists.txt index e60fd4a8612..e94dc5b03f8 100644 --- a/lib/Target/Sparc/CMakeLists.txt +++ b/lib/Target/Sparc/CMakeLists.txt @@ -30,6 +30,5 @@ add_llvm_target(SparcCodeGen add_subdirectory(AsmParser) add_subdirectory(Disassembler) -add_subdirectory(InstPrinter) add_subdirectory(MCTargetDesc) add_subdirectory(TargetInfo) diff --git a/lib/Target/Sparc/InstPrinter/CMakeLists.txt b/lib/Target/Sparc/InstPrinter/CMakeLists.txt deleted file mode 100644 index a285a8337a8..00000000000 --- a/lib/Target/Sparc/InstPrinter/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_llvm_library(LLVMSparcAsmPrinter - SparcInstPrinter.cpp - ) diff --git a/lib/Target/Sparc/InstPrinter/LLVMBuild.txt b/lib/Target/Sparc/InstPrinter/LLVMBuild.txt deleted file mode 100644 index cb40190ad85..00000000000 --- a/lib/Target/Sparc/InstPrinter/LLVMBuild.txt +++ /dev/null @@ -1,22 +0,0 @@ -;===- ./lib/Target/Sparc/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 = SparcAsmPrinter -parent = Sparc -required_libraries = MC Support -add_to_library_groups = Sparc diff --git a/lib/Target/Sparc/LLVMBuild.txt b/lib/Target/Sparc/LLVMBuild.txt index b13d8445db3..b9db8e66d12 100644 --- a/lib/Target/Sparc/LLVMBuild.txt +++ b/lib/Target/Sparc/LLVMBuild.txt @@ -15,7 +15,7 @@ ;===------------------------------------------------------------------------===; [common] -subdirectories = AsmParser Disassembler InstPrinter MCTargetDesc TargetInfo +subdirectories = AsmParser Disassembler MCTargetDesc TargetInfo [component_0] type = TargetGroup @@ -30,6 +30,6 @@ has_jit = 1 type = Library name = SparcCodeGen parent = Sparc -required_libraries = AsmPrinter CodeGen Core MC SelectionDAG SparcAsmPrinter +required_libraries = AsmPrinter CodeGen Core MC SelectionDAG SparcDesc SparcInfo Support Target add_to_library_groups = Sparc diff --git a/lib/Target/Sparc/MCTargetDesc/CMakeLists.txt b/lib/Target/Sparc/MCTargetDesc/CMakeLists.txt index c4dcdb5ba66..037099d41b8 100644 --- a/lib/Target/Sparc/MCTargetDesc/CMakeLists.txt +++ b/lib/Target/Sparc/MCTargetDesc/CMakeLists.txt @@ -1,6 +1,7 @@ add_llvm_library(LLVMSparcDesc SparcAsmBackend.cpp SparcELFObjectWriter.cpp + SparcInstPrinter.cpp SparcMCAsmInfo.cpp SparcMCCodeEmitter.cpp SparcMCTargetDesc.cpp diff --git a/lib/Target/Sparc/MCTargetDesc/LLVMBuild.txt b/lib/Target/Sparc/MCTargetDesc/LLVMBuild.txt index 249a195996d..1bb88127eb3 100644 --- a/lib/Target/Sparc/MCTargetDesc/LLVMBuild.txt +++ b/lib/Target/Sparc/MCTargetDesc/LLVMBuild.txt @@ -18,5 +18,5 @@ type = Library name = SparcDesc parent = Sparc -required_libraries = MC SparcAsmPrinter SparcInfo Support +required_libraries = MC SparcInfo Support add_to_library_groups = Sparc diff --git a/lib/Target/Sparc/InstPrinter/SparcInstPrinter.cpp b/lib/Target/Sparc/MCTargetDesc/SparcInstPrinter.cpp similarity index 100% rename from lib/Target/Sparc/InstPrinter/SparcInstPrinter.cpp rename to lib/Target/Sparc/MCTargetDesc/SparcInstPrinter.cpp diff --git a/lib/Target/Sparc/InstPrinter/SparcInstPrinter.h b/lib/Target/Sparc/MCTargetDesc/SparcInstPrinter.h similarity index 94% rename from lib/Target/Sparc/InstPrinter/SparcInstPrinter.h rename to lib/Target/Sparc/MCTargetDesc/SparcInstPrinter.h index c8c52b59ca4..499bcadb0d4 100644 --- a/lib/Target/Sparc/InstPrinter/SparcInstPrinter.h +++ b/lib/Target/Sparc/MCTargetDesc/SparcInstPrinter.h @@ -10,8 +10,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LLVM_LIB_TARGET_SPARC_INSTPRINTER_SPARCINSTPRINTER_H -#define LLVM_LIB_TARGET_SPARC_INSTPRINTER_SPARCINSTPRINTER_H +#ifndef LLVM_LIB_TARGET_SPARC_MCTARGETDESC_SPARCINSTPRINTER_H +#define LLVM_LIB_TARGET_SPARC_MCTARGETDESC_SPARCINSTPRINTER_H #include "llvm/MC/MCInstPrinter.h" diff --git a/lib/Target/Sparc/MCTargetDesc/SparcMCTargetDesc.cpp b/lib/Target/Sparc/MCTargetDesc/SparcMCTargetDesc.cpp index 18d5108bb93..c62bfbf7bcf 100644 --- a/lib/Target/Sparc/MCTargetDesc/SparcMCTargetDesc.cpp +++ b/lib/Target/Sparc/MCTargetDesc/SparcMCTargetDesc.cpp @@ -11,7 +11,7 @@ //===----------------------------------------------------------------------===// #include "SparcMCTargetDesc.h" -#include "InstPrinter/SparcInstPrinter.h" +#include "SparcInstPrinter.h" #include "SparcMCAsmInfo.h" #include "SparcTargetStreamer.h" #include "llvm/MC/MCInstrInfo.h" diff --git a/lib/Target/Sparc/MCTargetDesc/SparcTargetStreamer.cpp b/lib/Target/Sparc/MCTargetDesc/SparcTargetStreamer.cpp index c5ed7f2351f..a322d49adb8 100644 --- a/lib/Target/Sparc/MCTargetDesc/SparcTargetStreamer.cpp +++ b/lib/Target/Sparc/MCTargetDesc/SparcTargetStreamer.cpp @@ -11,7 +11,7 @@ //===----------------------------------------------------------------------===// #include "SparcTargetStreamer.h" -#include "InstPrinter/SparcInstPrinter.h" +#include "SparcInstPrinter.h" #include "llvm/Support/FormattedStream.h" using namespace llvm; diff --git a/lib/Target/Sparc/SparcAsmPrinter.cpp b/lib/Target/Sparc/SparcAsmPrinter.cpp index 7e811c28e46..52305a19e52 100644 --- a/lib/Target/Sparc/SparcAsmPrinter.cpp +++ b/lib/Target/Sparc/SparcAsmPrinter.cpp @@ -11,7 +11,7 @@ // //===----------------------------------------------------------------------===// -#include "InstPrinter/SparcInstPrinter.h" +#include "MCTargetDesc/SparcInstPrinter.h" #include "MCTargetDesc/SparcMCExpr.h" #include "MCTargetDesc/SparcTargetStreamer.h" #include "Sparc.h" -- 2.40.0