[llvm] r360485 - [XCore] Move InstPrinter files to MCTargetDesc. NFC

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


Author: rtrieu
Date: Fri May 10 16:36:49 2019
New Revision: 360485

URL: http://llvm.org/viewvc/llvm-project?rev=360485&view=rev
Log:
[XCore] 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/XCore/MCTargetDesc/XCoreInstPrinter.cpp
      - copied unchanged from r360484, llvm/trunk/lib/Target/XCore/InstPrinter/XCoreInstPrinter.cpp
    llvm/trunk/lib/Target/XCore/MCTargetDesc/XCoreInstPrinter.h
      - copied, changed from r360484, llvm/trunk/lib/Target/XCore/InstPrinter/XCoreInstPrinter.h
Removed:
    llvm/trunk/lib/Target/XCore/InstPrinter/
Modified:
    llvm/trunk/lib/Target/XCore/CMakeLists.txt
    llvm/trunk/lib/Target/XCore/LLVMBuild.txt
    llvm/trunk/lib/Target/XCore/MCTargetDesc/CMakeLists.txt
    llvm/trunk/lib/Target/XCore/MCTargetDesc/LLVMBuild.txt
    llvm/trunk/lib/Target/XCore/MCTargetDesc/XCoreMCTargetDesc.cpp
    llvm/trunk/lib/Target/XCore/XCoreAsmPrinter.cpp

Modified: llvm/trunk/lib/Target/XCore/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/XCore/CMakeLists.txt?rev=360485&r1=360484&r2=360485&view=diff
==============================================================================
--- llvm/trunk/lib/Target/XCore/CMakeLists.txt (original)
+++ llvm/trunk/lib/Target/XCore/CMakeLists.txt Fri May 10 16:36:49 2019
@@ -28,6 +28,5 @@ add_llvm_target(XCoreCodeGen
   )
 
 add_subdirectory(Disassembler)
-add_subdirectory(InstPrinter)
 add_subdirectory(MCTargetDesc)
 add_subdirectory(TargetInfo)

Modified: llvm/trunk/lib/Target/XCore/LLVMBuild.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/XCore/LLVMBuild.txt?rev=360485&r1=360484&r2=360485&view=diff
==============================================================================
--- llvm/trunk/lib/Target/XCore/LLVMBuild.txt (original)
+++ llvm/trunk/lib/Target/XCore/LLVMBuild.txt Fri May 10 16:36:49 2019
@@ -15,7 +15,7 @@
 ;===------------------------------------------------------------------------===;
 
 [common]
-subdirectories = Disassembler InstPrinter MCTargetDesc TargetInfo
+subdirectories = Disassembler MCTargetDesc TargetInfo
 
 [component_0]
 type = TargetGroup
@@ -38,7 +38,6 @@ required_libraries =
  Support
  Target
  TransformUtils
- XCoreAsmPrinter
  XCoreDesc
  XCoreInfo
 add_to_library_groups = XCore

Modified: llvm/trunk/lib/Target/XCore/MCTargetDesc/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/XCore/MCTargetDesc/CMakeLists.txt?rev=360485&r1=360484&r2=360485&view=diff
==============================================================================
--- llvm/trunk/lib/Target/XCore/MCTargetDesc/CMakeLists.txt (original)
+++ llvm/trunk/lib/Target/XCore/MCTargetDesc/CMakeLists.txt Fri May 10 16:36:49 2019
@@ -1,4 +1,5 @@
 add_llvm_library(LLVMXCoreDesc
+  XCoreInstPrinter.cpp
   XCoreMCTargetDesc.cpp
   XCoreMCAsmInfo.cpp
   )

Modified: llvm/trunk/lib/Target/XCore/MCTargetDesc/LLVMBuild.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/XCore/MCTargetDesc/LLVMBuild.txt?rev=360485&r1=360484&r2=360485&view=diff
==============================================================================
--- llvm/trunk/lib/Target/XCore/MCTargetDesc/LLVMBuild.txt (original)
+++ llvm/trunk/lib/Target/XCore/MCTargetDesc/LLVMBuild.txt Fri May 10 16:36:49 2019
@@ -18,5 +18,5 @@
 type = Library
 name = XCoreDesc
 parent = XCore
-required_libraries = MC Support XCoreAsmPrinter XCoreInfo
+required_libraries = MC Support XCoreInfo
 add_to_library_groups = XCore

Copied: llvm/trunk/lib/Target/XCore/MCTargetDesc/XCoreInstPrinter.h (from r360484, llvm/trunk/lib/Target/XCore/InstPrinter/XCoreInstPrinter.h)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/XCore/MCTargetDesc/XCoreInstPrinter.h?p2=llvm/trunk/lib/Target/XCore/MCTargetDesc/XCoreInstPrinter.h&p1=llvm/trunk/lib/Target/XCore/InstPrinter/XCoreInstPrinter.h&r1=360484&r2=360485&rev=360485&view=diff
==============================================================================
--- llvm/trunk/lib/Target/XCore/InstPrinter/XCoreInstPrinter.h (original)
+++ llvm/trunk/lib/Target/XCore/MCTargetDesc/XCoreInstPrinter.h Fri May 10 16:36:49 2019
@@ -12,8 +12,8 @@
 ///
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_LIB_TARGET_XCORE_INSTPRINTER_XCOREINSTPRINTER_H
-#define LLVM_LIB_TARGET_XCORE_INSTPRINTER_XCOREINSTPRINTER_H
+#ifndef LLVM_LIB_TARGET_XCORE_MCTARGETDESC_XCOREINSTPRINTER_H
+#define LLVM_LIB_TARGET_XCORE_MCTARGETDESC_XCOREINSTPRINTER_H
 
 #include "llvm/ADT/StringRef.h"
 #include "llvm/MC/MCInstPrinter.h"
@@ -43,4 +43,4 @@ private:
 
 } // end namespace llvm
 
-#endif // LLVM_LIB_TARGET_XCORE_INSTPRINTER_XCOREINSTPRINTER_H
+#endif // LLVM_LIB_TARGET_XCORE_MCTARGETDESC_XCOREINSTPRINTER_H

Modified: llvm/trunk/lib/Target/XCore/MCTargetDesc/XCoreMCTargetDesc.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/XCore/MCTargetDesc/XCoreMCTargetDesc.cpp?rev=360485&r1=360484&r2=360485&view=diff
==============================================================================
--- llvm/trunk/lib/Target/XCore/MCTargetDesc/XCoreMCTargetDesc.cpp (original)
+++ llvm/trunk/lib/Target/XCore/MCTargetDesc/XCoreMCTargetDesc.cpp Fri May 10 16:36:49 2019
@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "MCTargetDesc/XCoreMCTargetDesc.h"
-#include "InstPrinter/XCoreInstPrinter.h"
+#include "MCTargetDesc/XCoreInstPrinter.h"
 #include "MCTargetDesc/XCoreMCAsmInfo.h"
 #include "XCoreTargetStreamer.h"
 #include "llvm/ADT/StringRef.h"

Modified: llvm/trunk/lib/Target/XCore/XCoreAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/XCore/XCoreAsmPrinter.cpp?rev=360485&r1=360484&r2=360485&view=diff
==============================================================================
--- llvm/trunk/lib/Target/XCore/XCoreAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/XCore/XCoreAsmPrinter.cpp Fri May 10 16:36:49 2019
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "InstPrinter/XCoreInstPrinter.h"
+#include "MCTargetDesc/XCoreInstPrinter.h"
 #include "XCore.h"
 #include "XCoreInstrInfo.h"
 #include "XCoreMCInstLower.h"




More information about the llvm-commits mailing list