[llvm] r360494 - [BPF] Move InstPrinter files to MCTargetDesc. NFC

Richard Trieu via llvm-commits llvm-commits at lists.llvm.org
Fri May 10 18:13:21 PDT 2019


Author: rtrieu
Date: Fri May 10 18:13:21 2019
New Revision: 360494

URL: http://llvm.org/viewvc/llvm-project?rev=360494&view=rev
Log:
[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.

Added:
    llvm/trunk/lib/Target/BPF/MCTargetDesc/BPFInstPrinter.cpp
      - copied, changed from r360493, llvm/trunk/lib/Target/BPF/InstPrinter/BPFInstPrinter.cpp
    llvm/trunk/lib/Target/BPF/MCTargetDesc/BPFInstPrinter.h
      - copied, changed from r360493, llvm/trunk/lib/Target/BPF/InstPrinter/BPFInstPrinter.h
Removed:
    llvm/trunk/lib/Target/BPF/InstPrinter/
Modified:
    llvm/trunk/lib/Target/BPF/BPFAsmPrinter.cpp
    llvm/trunk/lib/Target/BPF/CMakeLists.txt
    llvm/trunk/lib/Target/BPF/LLVMBuild.txt
    llvm/trunk/lib/Target/BPF/MCTargetDesc/BPFMCTargetDesc.cpp
    llvm/trunk/lib/Target/BPF/MCTargetDesc/CMakeLists.txt
    llvm/trunk/lib/Target/BPF/MCTargetDesc/LLVMBuild.txt

Modified: llvm/trunk/lib/Target/BPF/BPFAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/BPF/BPFAsmPrinter.cpp?rev=360494&r1=360493&r2=360494&view=diff
==============================================================================
--- llvm/trunk/lib/Target/BPF/BPFAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/BPF/BPFAsmPrinter.cpp Fri May 10 18:13:21 2019
@@ -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"

Modified: llvm/trunk/lib/Target/BPF/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/BPF/CMakeLists.txt?rev=360494&r1=360493&r2=360494&view=diff
==============================================================================
--- llvm/trunk/lib/Target/BPF/CMakeLists.txt (original)
+++ llvm/trunk/lib/Target/BPF/CMakeLists.txt Fri May 10 18:13:21 2019
@@ -30,6 +30,5 @@ add_llvm_target(BPFCodeGen
 
 add_subdirectory(AsmParser)
 add_subdirectory(Disassembler)
-add_subdirectory(InstPrinter)
 add_subdirectory(MCTargetDesc)
 add_subdirectory(TargetInfo)

Modified: llvm/trunk/lib/Target/BPF/LLVMBuild.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/BPF/LLVMBuild.txt?rev=360494&r1=360493&r2=360494&view=diff
==============================================================================
--- llvm/trunk/lib/Target/BPF/LLVMBuild.txt (original)
+++ llvm/trunk/lib/Target/BPF/LLVMBuild.txt Fri May 10 18:13:21 2019
@@ -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

Copied: llvm/trunk/lib/Target/BPF/MCTargetDesc/BPFInstPrinter.cpp (from r360493, llvm/trunk/lib/Target/BPF/InstPrinter/BPFInstPrinter.cpp)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/BPF/MCTargetDesc/BPFInstPrinter.cpp?p2=llvm/trunk/lib/Target/BPF/MCTargetDesc/BPFInstPrinter.cpp&p1=llvm/trunk/lib/Target/BPF/InstPrinter/BPFInstPrinter.cpp&r1=360493&r2=360494&rev=360494&view=diff
==============================================================================
--- llvm/trunk/lib/Target/BPF/InstPrinter/BPFInstPrinter.cpp (original)
+++ llvm/trunk/lib/Target/BPF/MCTargetDesc/BPFInstPrinter.cpp Fri May 10 18:13:21 2019
@@ -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"

Copied: llvm/trunk/lib/Target/BPF/MCTargetDesc/BPFInstPrinter.h (from r360493, llvm/trunk/lib/Target/BPF/InstPrinter/BPFInstPrinter.h)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/BPF/MCTargetDesc/BPFInstPrinter.h?p2=llvm/trunk/lib/Target/BPF/MCTargetDesc/BPFInstPrinter.h&p1=llvm/trunk/lib/Target/BPF/InstPrinter/BPFInstPrinter.h&r1=360493&r2=360494&rev=360494&view=diff
==============================================================================
--- llvm/trunk/lib/Target/BPF/InstPrinter/BPFInstPrinter.h (original)
+++ llvm/trunk/lib/Target/BPF/MCTargetDesc/BPFInstPrinter.h Fri May 10 18:13:21 2019
@@ -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"
 

Modified: llvm/trunk/lib/Target/BPF/MCTargetDesc/BPFMCTargetDesc.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/BPF/MCTargetDesc/BPFMCTargetDesc.cpp?rev=360494&r1=360493&r2=360494&view=diff
==============================================================================
--- llvm/trunk/lib/Target/BPF/MCTargetDesc/BPFMCTargetDesc.cpp (original)
+++ llvm/trunk/lib/Target/BPF/MCTargetDesc/BPFMCTargetDesc.cpp Fri May 10 18:13:21 2019
@@ -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"

Modified: llvm/trunk/lib/Target/BPF/MCTargetDesc/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/BPF/MCTargetDesc/CMakeLists.txt?rev=360494&r1=360493&r2=360494&view=diff
==============================================================================
--- llvm/trunk/lib/Target/BPF/MCTargetDesc/CMakeLists.txt (original)
+++ llvm/trunk/lib/Target/BPF/MCTargetDesc/CMakeLists.txt Fri May 10 18:13:21 2019
@@ -1,6 +1,7 @@
 add_llvm_library(LLVMBPFDesc
   BPFMCTargetDesc.cpp
   BPFAsmBackend.cpp
+  BPFInstPrinter.cpp
   BPFMCCodeEmitter.cpp
   BPFELFObjectWriter.cpp
   )

Modified: llvm/trunk/lib/Target/BPF/MCTargetDesc/LLVMBuild.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/BPF/MCTargetDesc/LLVMBuild.txt?rev=360494&r1=360493&r2=360494&view=diff
==============================================================================
--- llvm/trunk/lib/Target/BPF/MCTargetDesc/LLVMBuild.txt (original)
+++ llvm/trunk/lib/Target/BPF/MCTargetDesc/LLVMBuild.txt Fri May 10 18:13:21 2019
@@ -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




More information about the llvm-commits mailing list