[llvm] r360496 - [Lanai] Move InstPrinter files to MCTargetDesc. NFC
Richard Trieu via llvm-commits
llvm-commits at lists.llvm.org
Fri May 10 18:25:58 PDT 2019
Author: rtrieu
Date: Fri May 10 18:25:58 2019
New Revision: 360496
URL: http://llvm.org/viewvc/llvm-project?rev=360496&view=rev
Log:
[Lanai] 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/Lanai/MCTargetDesc/LanaiInstPrinter.cpp
- copied, changed from r360495, llvm/trunk/lib/Target/Lanai/InstPrinter/LanaiInstPrinter.cpp
llvm/trunk/lib/Target/Lanai/MCTargetDesc/LanaiInstPrinter.h
- copied, changed from r360495, llvm/trunk/lib/Target/Lanai/InstPrinter/LanaiInstPrinter.h
Removed:
llvm/trunk/lib/Target/Lanai/InstPrinter/
Modified:
llvm/trunk/lib/Target/Lanai/CMakeLists.txt
llvm/trunk/lib/Target/Lanai/LLVMBuild.txt
llvm/trunk/lib/Target/Lanai/LanaiAsmPrinter.cpp
llvm/trunk/lib/Target/Lanai/MCTargetDesc/CMakeLists.txt
llvm/trunk/lib/Target/Lanai/MCTargetDesc/LLVMBuild.txt
llvm/trunk/lib/Target/Lanai/MCTargetDesc/LanaiMCTargetDesc.cpp
Modified: llvm/trunk/lib/Target/Lanai/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Lanai/CMakeLists.txt?rev=360496&r1=360495&r2=360496&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Lanai/CMakeLists.txt (original)
+++ llvm/trunk/lib/Target/Lanai/CMakeLists.txt Fri May 10 18:25:58 2019
@@ -31,6 +31,5 @@ add_llvm_target(LanaiCodeGen
add_subdirectory(AsmParser)
add_subdirectory(Disassembler)
-add_subdirectory(InstPrinter)
add_subdirectory(MCTargetDesc)
add_subdirectory(TargetInfo)
Modified: llvm/trunk/lib/Target/Lanai/LLVMBuild.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Lanai/LLVMBuild.txt?rev=360496&r1=360495&r2=360496&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Lanai/LLVMBuild.txt (original)
+++ llvm/trunk/lib/Target/Lanai/LLVMBuild.txt Fri May 10 18:25:58 2019
@@ -15,7 +15,7 @@
;===------------------------------------------------------------------------===;
[common]
-subdirectories = AsmParser Disassembler InstPrinter MCTargetDesc TargetInfo
+subdirectories = AsmParser Disassembler MCTargetDesc TargetInfo
[component_0]
type = TargetGroup
@@ -35,7 +35,6 @@ required_libraries =
LanaiAsmParser
LanaiDesc
LanaiInfo
- LanaiAsmPrinter
MC
SelectionDAG
Support
Modified: llvm/trunk/lib/Target/Lanai/LanaiAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Lanai/LanaiAsmPrinter.cpp?rev=360496&r1=360495&r2=360496&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Lanai/LanaiAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/Lanai/LanaiAsmPrinter.cpp Fri May 10 18:25:58 2019
@@ -11,7 +11,7 @@
//
//===----------------------------------------------------------------------===//
-#include "InstPrinter/LanaiInstPrinter.h"
+#include "MCTargetDesc/LanaiInstPrinter.h"
#include "Lanai.h"
#include "LanaiInstrInfo.h"
#include "LanaiMCInstLower.h"
Modified: llvm/trunk/lib/Target/Lanai/MCTargetDesc/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Lanai/MCTargetDesc/CMakeLists.txt?rev=360496&r1=360495&r2=360496&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Lanai/MCTargetDesc/CMakeLists.txt (original)
+++ llvm/trunk/lib/Target/Lanai/MCTargetDesc/CMakeLists.txt Fri May 10 18:25:58 2019
@@ -1,6 +1,7 @@
add_llvm_library(LLVMLanaiDesc
LanaiAsmBackend.cpp
LanaiELFObjectWriter.cpp
+ LanaiInstPrinter.cpp
LanaiMCAsmInfo.cpp
LanaiMCCodeEmitter.cpp
LanaiMCExpr.cpp
Modified: llvm/trunk/lib/Target/Lanai/MCTargetDesc/LLVMBuild.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Lanai/MCTargetDesc/LLVMBuild.txt?rev=360496&r1=360495&r2=360496&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Lanai/MCTargetDesc/LLVMBuild.txt (original)
+++ llvm/trunk/lib/Target/Lanai/MCTargetDesc/LLVMBuild.txt Fri May 10 18:25:58 2019
@@ -18,5 +18,5 @@
type = Library
name = LanaiDesc
parent = Lanai
-required_libraries = LanaiInfo LanaiAsmPrinter MC MCDisassembler Support
+required_libraries = LanaiInfo MC MCDisassembler Support
add_to_library_groups = Lanai
Copied: llvm/trunk/lib/Target/Lanai/MCTargetDesc/LanaiInstPrinter.cpp (from r360495, llvm/trunk/lib/Target/Lanai/InstPrinter/LanaiInstPrinter.cpp)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Lanai/MCTargetDesc/LanaiInstPrinter.cpp?p2=llvm/trunk/lib/Target/Lanai/MCTargetDesc/LanaiInstPrinter.cpp&p1=llvm/trunk/lib/Target/Lanai/InstPrinter/LanaiInstPrinter.cpp&r1=360495&r2=360496&rev=360496&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Lanai/InstPrinter/LanaiInstPrinter.cpp (original)
+++ llvm/trunk/lib/Target/Lanai/MCTargetDesc/LanaiInstPrinter.cpp Fri May 10 18:25:58 2019
@@ -12,7 +12,7 @@
#include "LanaiInstPrinter.h"
#include "Lanai.h"
-#include "MCTargetDesc/LanaiMCExpr.h"
+#include "LanaiMCExpr.h"
#include "llvm/MC/MCAsmInfo.h"
#include "llvm/MC/MCExpr.h"
#include "llvm/MC/MCInst.h"
Copied: llvm/trunk/lib/Target/Lanai/MCTargetDesc/LanaiInstPrinter.h (from r360495, llvm/trunk/lib/Target/Lanai/InstPrinter/LanaiInstPrinter.h)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Lanai/MCTargetDesc/LanaiInstPrinter.h?p2=llvm/trunk/lib/Target/Lanai/MCTargetDesc/LanaiInstPrinter.h&p1=llvm/trunk/lib/Target/Lanai/InstPrinter/LanaiInstPrinter.h&r1=360495&r2=360496&rev=360496&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Lanai/InstPrinter/LanaiInstPrinter.h (original)
+++ llvm/trunk/lib/Target/Lanai/MCTargetDesc/LanaiInstPrinter.h Fri May 10 18:25:58 2019
@@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_LIB_TARGET_LANAI_INSTPRINTER_LANAIINSTPRINTER_H
-#define LLVM_LIB_TARGET_LANAI_INSTPRINTER_LANAIINSTPRINTER_H
+#ifndef LLVM_LIB_TARGET_LANAI_MCTARGETDESC_LANAIINSTPRINTER_H
+#define LLVM_LIB_TARGET_LANAI_MCTARGETDESC_LANAIINSTPRINTER_H
#include "llvm/ADT/StringRef.h"
#include "llvm/MC/MCInstPrinter.h"
@@ -62,4 +62,4 @@ private:
} // end namespace llvm
-#endif // LLVM_LIB_TARGET_LANAI_INSTPRINTER_LANAIINSTPRINTER_H
+#endif // LLVM_LIB_TARGET_LANAI_MCTARGETDESC_LANAIINSTPRINTER_H
Modified: llvm/trunk/lib/Target/Lanai/MCTargetDesc/LanaiMCTargetDesc.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Lanai/MCTargetDesc/LanaiMCTargetDesc.cpp?rev=360496&r1=360495&r2=360496&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Lanai/MCTargetDesc/LanaiMCTargetDesc.cpp (original)
+++ llvm/trunk/lib/Target/Lanai/MCTargetDesc/LanaiMCTargetDesc.cpp Fri May 10 18:25:58 2019
@@ -11,7 +11,7 @@
//===----------------------------------------------------------------------===//
#include "LanaiMCTargetDesc.h"
-#include "InstPrinter/LanaiInstPrinter.h"
+#include "LanaiInstPrinter.h"
#include "LanaiMCAsmInfo.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/ADT/Triple.h"
More information about the llvm-commits
mailing list