[llvm] r360505 - [RISCV] Move InstPrinter files to MCTargetDesc. NFC
Richard Trieu via llvm-commits
llvm-commits at lists.llvm.org
Fri May 10 19:43:58 PDT 2019
Author: rtrieu
Date: Fri May 10 19:43:58 2019
New Revision: 360505
URL: http://llvm.org/viewvc/llvm-project?rev=360505&view=rev
Log:
[RISCV] 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/RISCV/MCTargetDesc/RISCVInstPrinter.cpp
- copied unchanged from r360504, llvm/trunk/lib/Target/RISCV/InstPrinter/RISCVInstPrinter.cpp
llvm/trunk/lib/Target/RISCV/MCTargetDesc/RISCVInstPrinter.h
- copied, changed from r360504, llvm/trunk/lib/Target/RISCV/InstPrinter/RISCVInstPrinter.h
Removed:
llvm/trunk/lib/Target/RISCV/InstPrinter/
Modified:
llvm/trunk/lib/Target/RISCV/CMakeLists.txt
llvm/trunk/lib/Target/RISCV/LLVMBuild.txt
llvm/trunk/lib/Target/RISCV/MCTargetDesc/CMakeLists.txt
llvm/trunk/lib/Target/RISCV/MCTargetDesc/LLVMBuild.txt
llvm/trunk/lib/Target/RISCV/MCTargetDesc/RISCVMCTargetDesc.cpp
llvm/trunk/lib/Target/RISCV/RISCVAsmPrinter.cpp
Modified: llvm/trunk/lib/Target/RISCV/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/RISCV/CMakeLists.txt?rev=360505&r1=360504&r2=360505&view=diff
==============================================================================
--- llvm/trunk/lib/Target/RISCV/CMakeLists.txt (original)
+++ llvm/trunk/lib/Target/RISCV/CMakeLists.txt Fri May 10 19:43:58 2019
@@ -31,7 +31,6 @@ add_llvm_target(RISCVCodeGen
add_subdirectory(AsmParser)
add_subdirectory(Disassembler)
-add_subdirectory(InstPrinter)
add_subdirectory(MCTargetDesc)
add_subdirectory(TargetInfo)
add_subdirectory(Utils)
Modified: llvm/trunk/lib/Target/RISCV/LLVMBuild.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/RISCV/LLVMBuild.txt?rev=360505&r1=360504&r2=360505&view=diff
==============================================================================
--- llvm/trunk/lib/Target/RISCV/LLVMBuild.txt (original)
+++ llvm/trunk/lib/Target/RISCV/LLVMBuild.txt Fri May 10 19:43:58 2019
@@ -15,7 +15,7 @@
;===------------------------------------------------------------------------===;
[common]
-subdirectories = AsmParser Disassembler InstPrinter TargetInfo MCTargetDesc Utils
+subdirectories = AsmParser Disassembler TargetInfo MCTargetDesc Utils
[component_0]
type = TargetGroup
@@ -29,6 +29,6 @@ has_disassembler = 1
type = Library
name = RISCVCodeGen
parent = RISCV
-required_libraries = AsmPrinter Core CodeGen MC RISCVAsmPrinter RISCVDesc
+required_libraries = AsmPrinter Core CodeGen MC RISCVDesc
RISCVInfo RISCVUtils SelectionDAG Support Target
add_to_library_groups = RISCV
Modified: llvm/trunk/lib/Target/RISCV/MCTargetDesc/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/RISCV/MCTargetDesc/CMakeLists.txt?rev=360505&r1=360504&r2=360505&view=diff
==============================================================================
--- llvm/trunk/lib/Target/RISCV/MCTargetDesc/CMakeLists.txt (original)
+++ llvm/trunk/lib/Target/RISCV/MCTargetDesc/CMakeLists.txt Fri May 10 19:43:58 2019
@@ -1,6 +1,7 @@
add_llvm_library(LLVMRISCVDesc
RISCVAsmBackend.cpp
RISCVELFObjectWriter.cpp
+ RISCVInstPrinter.cpp
RISCVMCAsmInfo.cpp
RISCVMCCodeEmitter.cpp
RISCVMCExpr.cpp
Modified: llvm/trunk/lib/Target/RISCV/MCTargetDesc/LLVMBuild.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/RISCV/MCTargetDesc/LLVMBuild.txt?rev=360505&r1=360504&r2=360505&view=diff
==============================================================================
--- llvm/trunk/lib/Target/RISCV/MCTargetDesc/LLVMBuild.txt (original)
+++ llvm/trunk/lib/Target/RISCV/MCTargetDesc/LLVMBuild.txt Fri May 10 19:43:58 2019
@@ -18,5 +18,5 @@
type = Library
name = RISCVDesc
parent = RISCV
-required_libraries = MC RISCVAsmPrinter RISCVInfo RISCVUtils Support
+required_libraries = MC RISCVInfo RISCVUtils Support
add_to_library_groups = RISCV
Copied: llvm/trunk/lib/Target/RISCV/MCTargetDesc/RISCVInstPrinter.h (from r360504, llvm/trunk/lib/Target/RISCV/InstPrinter/RISCVInstPrinter.h)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/RISCV/MCTargetDesc/RISCVInstPrinter.h?p2=llvm/trunk/lib/Target/RISCV/MCTargetDesc/RISCVInstPrinter.h&p1=llvm/trunk/lib/Target/RISCV/InstPrinter/RISCVInstPrinter.h&r1=360504&r2=360505&rev=360505&view=diff
==============================================================================
--- llvm/trunk/lib/Target/RISCV/InstPrinter/RISCVInstPrinter.h (original)
+++ llvm/trunk/lib/Target/RISCV/MCTargetDesc/RISCVInstPrinter.h Fri May 10 19:43:58 2019
@@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_LIB_TARGET_RISCV_INSTPRINTER_RISCVINSTPRINTER_H
-#define LLVM_LIB_TARGET_RISCV_INSTPRINTER_RISCVINSTPRINTER_H
+#ifndef LLVM_LIB_TARGET_RISCV_MCTARGETDESC_RISCVINSTPRINTER_H
+#define LLVM_LIB_TARGET_RISCV_MCTARGETDESC_RISCVINSTPRINTER_H
#include "MCTargetDesc/RISCVMCTargetDesc.h"
#include "llvm/MC/MCInstPrinter.h"
Modified: llvm/trunk/lib/Target/RISCV/MCTargetDesc/RISCVMCTargetDesc.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/RISCV/MCTargetDesc/RISCVMCTargetDesc.cpp?rev=360505&r1=360504&r2=360505&view=diff
==============================================================================
--- llvm/trunk/lib/Target/RISCV/MCTargetDesc/RISCVMCTargetDesc.cpp (original)
+++ llvm/trunk/lib/Target/RISCV/MCTargetDesc/RISCVMCTargetDesc.cpp Fri May 10 19:43:58 2019
@@ -11,8 +11,8 @@
//===----------------------------------------------------------------------===//
#include "RISCVMCTargetDesc.h"
-#include "InstPrinter/RISCVInstPrinter.h"
#include "RISCVELFStreamer.h"
+#include "RISCVInstPrinter.h"
#include "RISCVMCAsmInfo.h"
#include "RISCVTargetStreamer.h"
#include "llvm/ADT/STLExtras.h"
Modified: llvm/trunk/lib/Target/RISCV/RISCVAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/RISCV/RISCVAsmPrinter.cpp?rev=360505&r1=360504&r2=360505&view=diff
==============================================================================
--- llvm/trunk/lib/Target/RISCV/RISCVAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/RISCV/RISCVAsmPrinter.cpp Fri May 10 19:43:58 2019
@@ -12,7 +12,7 @@
//===----------------------------------------------------------------------===//
#include "RISCV.h"
-#include "InstPrinter/RISCVInstPrinter.h"
+#include "MCTargetDesc/RISCVInstPrinter.h"
#include "MCTargetDesc/RISCVMCExpr.h"
#include "RISCVTargetMachine.h"
#include "llvm/CodeGen/AsmPrinter.h"
More information about the llvm-commits
mailing list