From 099af04decdec8859a2eefdc61aa059b37fa9110 Mon Sep 17 00:00:00 2001 From: Richard Trieu Date: Sat, 11 May 2019 01:58:52 +0000 Subject: [PATCH] [MSP430] 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@360498 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/MSP430/CMakeLists.txt | 1 - lib/Target/MSP430/InstPrinter/CMakeLists.txt | 3 --- lib/Target/MSP430/InstPrinter/LLVMBuild.txt | 22 ------------------- lib/Target/MSP430/LLVMBuild.txt | 4 ++-- lib/Target/MSP430/MCTargetDesc/CMakeLists.txt | 1 + lib/Target/MSP430/MCTargetDesc/LLVMBuild.txt | 2 +- .../MSP430InstPrinter.cpp | 0 .../MSP430InstPrinter.h | 4 ++-- .../MCTargetDesc/MSP430MCTargetDesc.cpp | 2 +- lib/Target/MSP430/MSP430AsmPrinter.cpp | 2 +- 10 files changed, 8 insertions(+), 33 deletions(-) delete mode 100644 lib/Target/MSP430/InstPrinter/CMakeLists.txt delete mode 100644 lib/Target/MSP430/InstPrinter/LLVMBuild.txt rename lib/Target/MSP430/{InstPrinter => MCTargetDesc}/MSP430InstPrinter.cpp (100%) rename lib/Target/MSP430/{InstPrinter => MCTargetDesc}/MSP430InstPrinter.h (93%) diff --git a/lib/Target/MSP430/CMakeLists.txt b/lib/Target/MSP430/CMakeLists.txt index 2a0848fb308..4902cee5de2 100644 --- a/lib/Target/MSP430/CMakeLists.txt +++ b/lib/Target/MSP430/CMakeLists.txt @@ -26,7 +26,6 @@ add_llvm_target(MSP430CodeGen MSP430MCInstLower.cpp ) -add_subdirectory(InstPrinter) add_subdirectory(MCTargetDesc) add_subdirectory(TargetInfo) add_subdirectory(AsmParser) diff --git a/lib/Target/MSP430/InstPrinter/CMakeLists.txt b/lib/Target/MSP430/InstPrinter/CMakeLists.txt deleted file mode 100644 index 580a9ce71d9..00000000000 --- a/lib/Target/MSP430/InstPrinter/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_llvm_library(LLVMMSP430AsmPrinter - MSP430InstPrinter.cpp - ) diff --git a/lib/Target/MSP430/InstPrinter/LLVMBuild.txt b/lib/Target/MSP430/InstPrinter/LLVMBuild.txt deleted file mode 100644 index a8c9e970a88..00000000000 --- a/lib/Target/MSP430/InstPrinter/LLVMBuild.txt +++ /dev/null @@ -1,22 +0,0 @@ -;===- ./lib/Target/MSP430/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 = MSP430AsmPrinter -parent = MSP430 -required_libraries = MC Support -add_to_library_groups = MSP430 diff --git a/lib/Target/MSP430/LLVMBuild.txt b/lib/Target/MSP430/LLVMBuild.txt index 935f42f565a..046301f90e3 100644 --- a/lib/Target/MSP430/LLVMBuild.txt +++ b/lib/Target/MSP430/LLVMBuild.txt @@ -15,7 +15,7 @@ ;===------------------------------------------------------------------------===; [common] -subdirectories = AsmParser Disassembler InstPrinter MCTargetDesc TargetInfo +subdirectories = AsmParser Disassembler MCTargetDesc TargetInfo [component_0] type = TargetGroup @@ -29,5 +29,5 @@ has_disassembler = 1 type = Library name = MSP430CodeGen parent = MSP430 -required_libraries = AsmPrinter CodeGen Core MC MSP430AsmPrinter MSP430Desc MSP430Info SelectionDAG Support Target +required_libraries = AsmPrinter CodeGen Core MC MSP430Desc MSP430Info SelectionDAG Support Target add_to_library_groups = MSP430 diff --git a/lib/Target/MSP430/MCTargetDesc/CMakeLists.txt b/lib/Target/MSP430/MCTargetDesc/CMakeLists.txt index a2f468779f5..b3edd496409 100644 --- a/lib/Target/MSP430/MCTargetDesc/CMakeLists.txt +++ b/lib/Target/MSP430/MCTargetDesc/CMakeLists.txt @@ -2,6 +2,7 @@ add_llvm_library(LLVMMSP430Desc MSP430AsmBackend.cpp MSP430ELFObjectWriter.cpp MSP430ELFStreamer.cpp + MSP430InstPrinter.cpp MSP430MCAsmInfo.cpp MSP430MCCodeEmitter.cpp MSP430MCTargetDesc.cpp diff --git a/lib/Target/MSP430/MCTargetDesc/LLVMBuild.txt b/lib/Target/MSP430/MCTargetDesc/LLVMBuild.txt index cc12d654a8e..a2a0dd268d1 100644 --- a/lib/Target/MSP430/MCTargetDesc/LLVMBuild.txt +++ b/lib/Target/MSP430/MCTargetDesc/LLVMBuild.txt @@ -18,5 +18,5 @@ type = Library name = MSP430Desc parent = MSP430 -required_libraries = MC MSP430AsmPrinter MSP430Info Support +required_libraries = MC MSP430Info Support add_to_library_groups = MSP430 diff --git a/lib/Target/MSP430/InstPrinter/MSP430InstPrinter.cpp b/lib/Target/MSP430/MCTargetDesc/MSP430InstPrinter.cpp similarity index 100% rename from lib/Target/MSP430/InstPrinter/MSP430InstPrinter.cpp rename to lib/Target/MSP430/MCTargetDesc/MSP430InstPrinter.cpp diff --git a/lib/Target/MSP430/InstPrinter/MSP430InstPrinter.h b/lib/Target/MSP430/MCTargetDesc/MSP430InstPrinter.h similarity index 93% rename from lib/Target/MSP430/InstPrinter/MSP430InstPrinter.h rename to lib/Target/MSP430/MCTargetDesc/MSP430InstPrinter.h index a2f527807a4..25451033236 100644 --- a/lib/Target/MSP430/InstPrinter/MSP430InstPrinter.h +++ b/lib/Target/MSP430/MCTargetDesc/MSP430InstPrinter.h @@ -10,8 +10,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LLVM_LIB_TARGET_MSP430_INSTPRINTER_MSP430INSTPRINTER_H -#define LLVM_LIB_TARGET_MSP430_INSTPRINTER_MSP430INSTPRINTER_H +#ifndef LLVM_LIB_TARGET_MSP430_MCTARGETDESC_MSP430INSTPRINTER_H +#define LLVM_LIB_TARGET_MSP430_MCTARGETDESC_MSP430INSTPRINTER_H #include "llvm/MC/MCInstPrinter.h" diff --git a/lib/Target/MSP430/MCTargetDesc/MSP430MCTargetDesc.cpp b/lib/Target/MSP430/MCTargetDesc/MSP430MCTargetDesc.cpp index 7bb966f5889..76eb03988a5 100644 --- a/lib/Target/MSP430/MCTargetDesc/MSP430MCTargetDesc.cpp +++ b/lib/Target/MSP430/MCTargetDesc/MSP430MCTargetDesc.cpp @@ -11,7 +11,7 @@ //===----------------------------------------------------------------------===// #include "MSP430MCTargetDesc.h" -#include "InstPrinter/MSP430InstPrinter.h" +#include "MSP430InstPrinter.h" #include "MSP430MCAsmInfo.h" #include "llvm/MC/MCInstrInfo.h" #include "llvm/MC/MCRegisterInfo.h" diff --git a/lib/Target/MSP430/MSP430AsmPrinter.cpp b/lib/Target/MSP430/MSP430AsmPrinter.cpp index 90f7ff99b4c..786ff5f8525 100644 --- a/lib/Target/MSP430/MSP430AsmPrinter.cpp +++ b/lib/Target/MSP430/MSP430AsmPrinter.cpp @@ -11,7 +11,7 @@ // //===----------------------------------------------------------------------===// -#include "InstPrinter/MSP430InstPrinter.h" +#include "MCTargetDesc/MSP430InstPrinter.h" #include "MSP430.h" #include "MSP430InstrInfo.h" #include "MSP430MCInstLower.h" -- 2.50.1