From 6e03a1fc306c99a4eeb3e90f7b43927dad03af38 Mon Sep 17 00:00:00 2001 From: Richard Trieu Date: Sat, 11 May 2019 01:13:21 +0000 Subject: [PATCH] [BPF] 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@360494 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/BPF/BPFAsmPrinter.cpp | 2 +- lib/Target/BPF/CMakeLists.txt | 1 - lib/Target/BPF/InstPrinter/CMakeLists.txt | 3 --- lib/Target/BPF/InstPrinter/LLVMBuild.txt | 22 ---------------------- lib/Target/BPF/LLVMBuild.txt | 3 +-- .../BPFInstPrinter.cpp | 2 +- .../{InstPrinter => MCTargetDesc}/BPFInstPrinter.h | 4 ++-- lib/Target/BPF/MCTargetDesc/BPFMCTargetDesc.cpp | 2 +- lib/Target/BPF/MCTargetDesc/CMakeLists.txt | 1 + lib/Target/BPF/MCTargetDesc/LLVMBuild.txt | 2 +- 10 files changed, 8 insertions(+), 34 deletions(-) delete mode 100644 lib/Target/BPF/InstPrinter/CMakeLists.txt delete mode 100644 lib/Target/BPF/InstPrinter/LLVMBuild.txt rename lib/Target/BPF/{InstPrinter => MCTargetDesc}/BPFInstPrinter.cpp (98%) rename lib/Target/BPF/{InstPrinter => MCTargetDesc}/BPFInstPrinter.h (92%) diff --git a/lib/Target/BPF/BPFAsmPrinter.cpp b/lib/Target/BPF/BPFAsmPrinter.cpp index ba4dfa4810d..fa114b257da 100644 --- a/lib/Target/BPF/BPFAsmPrinter.cpp +++ b/lib/Target/BPF/BPFAsmPrinter.cpp @@ -16,7 +16,7 @@ #include "BPFMCInstLower.h" #include "BPFTargetMachine.h" #include "BTFDebug.h" -#include "InstPrinter/BPFInstPrinter.h" +#include "MCTargetDesc/BPFInstPrinter.h" #include "llvm/CodeGen/AsmPrinter.h" #include "llvm/CodeGen/MachineConstantPool.h" #include "llvm/CodeGen/MachineFunctionPass.h" diff --git a/lib/Target/BPF/CMakeLists.txt b/lib/Target/BPF/CMakeLists.txt index c18adf859d3..37c03aa511e 100644 --- a/lib/Target/BPF/CMakeLists.txt +++ b/lib/Target/BPF/CMakeLists.txt @@ -30,6 +30,5 @@ add_llvm_target(BPFCodeGen add_subdirectory(AsmParser) add_subdirectory(Disassembler) -add_subdirectory(InstPrinter) add_subdirectory(MCTargetDesc) add_subdirectory(TargetInfo) diff --git a/lib/Target/BPF/InstPrinter/CMakeLists.txt b/lib/Target/BPF/InstPrinter/CMakeLists.txt deleted file mode 100644 index f9e91619252..00000000000 --- a/lib/Target/BPF/InstPrinter/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_llvm_library(LLVMBPFAsmPrinter - BPFInstPrinter.cpp - ) diff --git a/lib/Target/BPF/InstPrinter/LLVMBuild.txt b/lib/Target/BPF/InstPrinter/LLVMBuild.txt deleted file mode 100644 index 6a5b3f546c8..00000000000 --- a/lib/Target/BPF/InstPrinter/LLVMBuild.txt +++ /dev/null @@ -1,22 +0,0 @@ -;===- ./lib/Target/BPF/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 = BPFAsmPrinter -parent = BPF -required_libraries = MC Support -add_to_library_groups = BPF diff --git a/lib/Target/BPF/LLVMBuild.txt b/lib/Target/BPF/LLVMBuild.txt index 3cafd1c0acc..9a55d0b1b9b 100644 --- a/lib/Target/BPF/LLVMBuild.txt +++ b/lib/Target/BPF/LLVMBuild.txt @@ -15,7 +15,7 @@ ;===------------------------------------------------------------------------===; [common] -subdirectories = AsmParser InstPrinter Disassembler MCTargetDesc TargetInfo +subdirectories = AsmParser Disassembler MCTargetDesc TargetInfo [component_0] type = TargetGroup @@ -33,7 +33,6 @@ required_libraries = CodeGen Core MC - BPFAsmPrinter BPFDesc BPFInfo SelectionDAG diff --git a/lib/Target/BPF/InstPrinter/BPFInstPrinter.cpp b/lib/Target/BPF/MCTargetDesc/BPFInstPrinter.cpp similarity index 98% rename from lib/Target/BPF/InstPrinter/BPFInstPrinter.cpp rename to lib/Target/BPF/MCTargetDesc/BPFInstPrinter.cpp index 91411a745d7..079202994c8 100644 --- a/lib/Target/BPF/InstPrinter/BPFInstPrinter.cpp +++ b/lib/Target/BPF/MCTargetDesc/BPFInstPrinter.cpp @@ -10,7 +10,7 @@ // //===----------------------------------------------------------------------===// -#include "BPFInstPrinter.h" +#include "MCTargetDesc/BPFInstPrinter.h" #include "llvm/MC/MCAsmInfo.h" #include "llvm/MC/MCExpr.h" #include "llvm/MC/MCInst.h" diff --git a/lib/Target/BPF/InstPrinter/BPFInstPrinter.h b/lib/Target/BPF/MCTargetDesc/BPFInstPrinter.h similarity index 92% rename from lib/Target/BPF/InstPrinter/BPFInstPrinter.h rename to lib/Target/BPF/MCTargetDesc/BPFInstPrinter.h index 3472423c466..8c9a0bc94cf 100644 --- a/lib/Target/BPF/InstPrinter/BPFInstPrinter.h +++ b/lib/Target/BPF/MCTargetDesc/BPFInstPrinter.h @@ -10,8 +10,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LLVM_LIB_TARGET_BPF_INSTPRINTER_BPFINSTPRINTER_H -#define LLVM_LIB_TARGET_BPF_INSTPRINTER_BPFINSTPRINTER_H +#ifndef LLVM_LIB_TARGET_BPF_MCTARGETDESC_BPFINSTPRINTER_H +#define LLVM_LIB_TARGET_BPF_MCTARGETDESC_BPFINSTPRINTER_H #include "llvm/MC/MCInstPrinter.h" diff --git a/lib/Target/BPF/MCTargetDesc/BPFMCTargetDesc.cpp b/lib/Target/BPF/MCTargetDesc/BPFMCTargetDesc.cpp index 037587ff7b2..6a3af28ab30 100644 --- a/lib/Target/BPF/MCTargetDesc/BPFMCTargetDesc.cpp +++ b/lib/Target/BPF/MCTargetDesc/BPFMCTargetDesc.cpp @@ -12,7 +12,7 @@ #include "MCTargetDesc/BPFMCTargetDesc.h" #include "BPF.h" -#include "InstPrinter/BPFInstPrinter.h" +#include "MCTargetDesc/BPFInstPrinter.h" #include "MCTargetDesc/BPFMCAsmInfo.h" #include "llvm/MC/MCInstrAnalysis.h" #include "llvm/MC/MCInstrInfo.h" diff --git a/lib/Target/BPF/MCTargetDesc/CMakeLists.txt b/lib/Target/BPF/MCTargetDesc/CMakeLists.txt index 5fcd8743da5..44f3dbf1ce6 100644 --- a/lib/Target/BPF/MCTargetDesc/CMakeLists.txt +++ b/lib/Target/BPF/MCTargetDesc/CMakeLists.txt @@ -1,6 +1,7 @@ add_llvm_library(LLVMBPFDesc BPFMCTargetDesc.cpp BPFAsmBackend.cpp + BPFInstPrinter.cpp BPFMCCodeEmitter.cpp BPFELFObjectWriter.cpp ) diff --git a/lib/Target/BPF/MCTargetDesc/LLVMBuild.txt b/lib/Target/BPF/MCTargetDesc/LLVMBuild.txt index adfd3e7f91c..7c9d9c71ba7 100644 --- a/lib/Target/BPF/MCTargetDesc/LLVMBuild.txt +++ b/lib/Target/BPF/MCTargetDesc/LLVMBuild.txt @@ -18,5 +18,5 @@ type = Library name = BPFDesc parent = BPF -required_libraries = MC BPFAsmPrinter BPFInfo Support +required_libraries = MC BPFInfo Support add_to_library_groups = BPF -- 2.11.0