[llvm] r360510 - [SystemZ] Move InstPrinter files to MCTargetDesc. NFC

Richard Trieu via llvm-commits llvm-commits at lists.llvm.org
Fri May 10 20:36:16 PDT 2019


Author: rtrieu
Date: Fri May 10 20:36:16 2019
New Revision: 360510

URL: http://llvm.org/viewvc/llvm-project?rev=360510&view=rev
Log:
[SystemZ] 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/SystemZ/MCTargetDesc/SystemZInstPrinter.cpp
      - copied unchanged from r360509, llvm/trunk/lib/Target/SystemZ/InstPrinter/SystemZInstPrinter.cpp
    llvm/trunk/lib/Target/SystemZ/MCTargetDesc/SystemZInstPrinter.h
      - copied, changed from r360509, llvm/trunk/lib/Target/SystemZ/InstPrinter/SystemZInstPrinter.h
Removed:
    llvm/trunk/lib/Target/SystemZ/InstPrinter/
Modified:
    llvm/trunk/lib/Target/SystemZ/AsmParser/LLVMBuild.txt
    llvm/trunk/lib/Target/SystemZ/AsmParser/SystemZAsmParser.cpp
    llvm/trunk/lib/Target/SystemZ/CMakeLists.txt
    llvm/trunk/lib/Target/SystemZ/LLVMBuild.txt
    llvm/trunk/lib/Target/SystemZ/MCTargetDesc/CMakeLists.txt
    llvm/trunk/lib/Target/SystemZ/MCTargetDesc/LLVMBuild.txt
    llvm/trunk/lib/Target/SystemZ/MCTargetDesc/SystemZMCTargetDesc.cpp
    llvm/trunk/lib/Target/SystemZ/SystemZAsmPrinter.cpp

Modified: llvm/trunk/lib/Target/SystemZ/AsmParser/LLVMBuild.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/SystemZ/AsmParser/LLVMBuild.txt?rev=360510&r1=360509&r2=360510&view=diff
==============================================================================
--- llvm/trunk/lib/Target/SystemZ/AsmParser/LLVMBuild.txt (original)
+++ llvm/trunk/lib/Target/SystemZ/AsmParser/LLVMBuild.txt Fri May 10 20:36:16 2019
@@ -18,5 +18,5 @@
 type = Library
 name = SystemZAsmParser
 parent = SystemZ
-required_libraries = MC MCParser Support SystemZDesc SystemZInfo SystemZAsmPrinter
+required_libraries = MC MCParser Support SystemZDesc SystemZInfo
 add_to_library_groups = SystemZ

Modified: llvm/trunk/lib/Target/SystemZ/AsmParser/SystemZAsmParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/SystemZ/AsmParser/SystemZAsmParser.cpp?rev=360510&r1=360509&r2=360510&view=diff
==============================================================================
--- llvm/trunk/lib/Target/SystemZ/AsmParser/SystemZAsmParser.cpp (original)
+++ llvm/trunk/lib/Target/SystemZ/AsmParser/SystemZAsmParser.cpp Fri May 10 20:36:16 2019
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "InstPrinter/SystemZInstPrinter.h"
+#include "MCTargetDesc/SystemZInstPrinter.h"
 #include "MCTargetDesc/SystemZMCTargetDesc.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/SmallVector.h"

Modified: llvm/trunk/lib/Target/SystemZ/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/SystemZ/CMakeLists.txt?rev=360510&r1=360509&r2=360510&view=diff
==============================================================================
--- llvm/trunk/lib/Target/SystemZ/CMakeLists.txt (original)
+++ llvm/trunk/lib/Target/SystemZ/CMakeLists.txt Fri May 10 20:36:16 2019
@@ -39,6 +39,5 @@ add_llvm_target(SystemZCodeGen
 
 add_subdirectory(AsmParser)
 add_subdirectory(Disassembler)
-add_subdirectory(InstPrinter)
 add_subdirectory(MCTargetDesc)
 add_subdirectory(TargetInfo)

Modified: llvm/trunk/lib/Target/SystemZ/LLVMBuild.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/SystemZ/LLVMBuild.txt?rev=360510&r1=360509&r2=360510&view=diff
==============================================================================
--- llvm/trunk/lib/Target/SystemZ/LLVMBuild.txt (original)
+++ llvm/trunk/lib/Target/SystemZ/LLVMBuild.txt Fri May 10 20:36:16 2019
@@ -15,7 +15,7 @@
 ;===------------------------------------------------------------------------===;
 
 [common]
-subdirectories = AsmParser Disassembler InstPrinter MCTargetDesc TargetInfo
+subdirectories = AsmParser Disassembler MCTargetDesc TargetInfo
 
 [component_0]
 type = TargetGroup
@@ -30,5 +30,5 @@ has_jit = 1
 type = Library
 name = SystemZCodeGen
 parent = SystemZ
-required_libraries = Analysis AsmPrinter CodeGen Core MC Scalar SelectionDAG Support SystemZAsmPrinter SystemZDesc SystemZInfo Target
+required_libraries = Analysis AsmPrinter CodeGen Core MC Scalar SelectionDAG Support SystemZDesc SystemZInfo Target
 add_to_library_groups = SystemZ

Modified: llvm/trunk/lib/Target/SystemZ/MCTargetDesc/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/SystemZ/MCTargetDesc/CMakeLists.txt?rev=360510&r1=360509&r2=360510&view=diff
==============================================================================
--- llvm/trunk/lib/Target/SystemZ/MCTargetDesc/CMakeLists.txt (original)
+++ llvm/trunk/lib/Target/SystemZ/MCTargetDesc/CMakeLists.txt Fri May 10 20:36:16 2019
@@ -1,4 +1,5 @@
 add_llvm_library(LLVMSystemZDesc
+  SystemZInstPrinter.cpp
   SystemZMCAsmBackend.cpp
   SystemZMCAsmInfo.cpp
   SystemZMCCodeEmitter.cpp

Modified: llvm/trunk/lib/Target/SystemZ/MCTargetDesc/LLVMBuild.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/SystemZ/MCTargetDesc/LLVMBuild.txt?rev=360510&r1=360509&r2=360510&view=diff
==============================================================================
--- llvm/trunk/lib/Target/SystemZ/MCTargetDesc/LLVMBuild.txt (original)
+++ llvm/trunk/lib/Target/SystemZ/MCTargetDesc/LLVMBuild.txt Fri May 10 20:36:16 2019
@@ -18,5 +18,5 @@
 type = Library
 name = SystemZDesc
 parent = SystemZ
-required_libraries = MC Support SystemZAsmPrinter SystemZInfo
+required_libraries = MC Support SystemZInfo
 add_to_library_groups = SystemZ

Copied: llvm/trunk/lib/Target/SystemZ/MCTargetDesc/SystemZInstPrinter.h (from r360509, llvm/trunk/lib/Target/SystemZ/InstPrinter/SystemZInstPrinter.h)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/SystemZ/MCTargetDesc/SystemZInstPrinter.h?p2=llvm/trunk/lib/Target/SystemZ/MCTargetDesc/SystemZInstPrinter.h&p1=llvm/trunk/lib/Target/SystemZ/InstPrinter/SystemZInstPrinter.h&r1=360509&r2=360510&rev=360510&view=diff
==============================================================================
--- llvm/trunk/lib/Target/SystemZ/InstPrinter/SystemZInstPrinter.h (original)
+++ llvm/trunk/lib/Target/SystemZ/MCTargetDesc/SystemZInstPrinter.h Fri May 10 20:36:16 2019
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_LIB_TARGET_SYSTEMZ_INSTPRINTER_SYSTEMZINSTPRINTER_H
-#define LLVM_LIB_TARGET_SYSTEMZ_INSTPRINTER_SYSTEMZINSTPRINTER_H
+#ifndef LLVM_LIB_TARGET_SYSTEMZ_MCTARGETDESC_SYSTEMZINSTPRINTER_H
+#define LLVM_LIB_TARGET_SYSTEMZ_MCTARGETDESC_SYSTEMZINSTPRINTER_H
 
 #include "llvm/MC/MCInstPrinter.h"
 #include <cstdint>
@@ -74,4 +74,4 @@ private:
 
 } // end namespace llvm
 
-#endif // LLVM_LIB_TARGET_SYSTEMZ_INSTPRINTER_SYSTEMZINSTPRINTER_H
+#endif // LLVM_LIB_TARGET_SYSTEMZ_MCTARGETDESC_SYSTEMZINSTPRINTER_H

Modified: llvm/trunk/lib/Target/SystemZ/MCTargetDesc/SystemZMCTargetDesc.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/SystemZ/MCTargetDesc/SystemZMCTargetDesc.cpp?rev=360510&r1=360509&r2=360510&view=diff
==============================================================================
--- llvm/trunk/lib/Target/SystemZ/MCTargetDesc/SystemZMCTargetDesc.cpp (original)
+++ llvm/trunk/lib/Target/SystemZ/MCTargetDesc/SystemZMCTargetDesc.cpp Fri May 10 20:36:16 2019
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "SystemZMCTargetDesc.h"
-#include "InstPrinter/SystemZInstPrinter.h"
+#include "SystemZInstPrinter.h"
 #include "SystemZMCAsmInfo.h"
 #include "llvm/MC/MCDwarf.h"
 #include "llvm/MC/MCInstrInfo.h"

Modified: llvm/trunk/lib/Target/SystemZ/SystemZAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/SystemZ/SystemZAsmPrinter.cpp?rev=360510&r1=360509&r2=360510&view=diff
==============================================================================
--- llvm/trunk/lib/Target/SystemZ/SystemZAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/SystemZ/SystemZAsmPrinter.cpp Fri May 10 20:36:16 2019
@@ -12,7 +12,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "SystemZAsmPrinter.h"
-#include "InstPrinter/SystemZInstPrinter.h"
+#include "MCTargetDesc/SystemZInstPrinter.h"
 #include "SystemZConstantPoolValue.h"
 #include "SystemZMCInstLower.h"
 #include "llvm/CodeGen/MachineModuleInfoImpls.h"




More information about the llvm-commits mailing list