[llvm] r360490 - [ARM] Move InstPrinter files to MCTargetDesc. NFC
Richard Trieu via llvm-commits
llvm-commits at lists.llvm.org
Fri May 10 17:34:07 PDT 2019
Author: rtrieu
Date: Fri May 10 17:34:07 2019
New Revision: 360490
URL: http://llvm.org/viewvc/llvm-project?rev=360490&view=rev
Log:
[ARM] 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/ARM/MCTargetDesc/ARMInstPrinter.cpp
- copied unchanged from r360489, llvm/trunk/lib/Target/ARM/InstPrinter/ARMInstPrinter.cpp
llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMInstPrinter.h
- copied, changed from r360489, llvm/trunk/lib/Target/ARM/InstPrinter/ARMInstPrinter.h
Removed:
llvm/trunk/lib/Target/ARM/InstPrinter/
Modified:
llvm/trunk/lib/Target/ARM/ARMAsmPrinter.cpp
llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
llvm/trunk/lib/Target/ARM/AsmParser/LLVMBuild.txt
llvm/trunk/lib/Target/ARM/CMakeLists.txt
llvm/trunk/lib/Target/ARM/LLVMBuild.txt
llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp
llvm/trunk/lib/Target/ARM/MCTargetDesc/CMakeLists.txt
llvm/trunk/lib/Target/ARM/MCTargetDesc/LLVMBuild.txt
Modified: llvm/trunk/lib/Target/ARM/ARMAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMAsmPrinter.cpp?rev=360490&r1=360489&r2=360490&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/ARM/ARMAsmPrinter.cpp Fri May 10 17:34:07 2019
@@ -17,8 +17,8 @@
#include "ARMMachineFunctionInfo.h"
#include "ARMTargetMachine.h"
#include "ARMTargetObjectFile.h"
-#include "InstPrinter/ARMInstPrinter.h"
#include "MCTargetDesc/ARMAddressingModes.h"
+#include "MCTargetDesc/ARMInstPrinter.h"
#include "MCTargetDesc/ARMMCExpr.h"
#include "llvm/ADT/SetVector.h"
#include "llvm/ADT/SmallString.h"
Modified: llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp?rev=360490&r1=360489&r2=360490&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp (original)
+++ llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp Fri May 10 17:34:07 2019
@@ -7,10 +7,10 @@
//===----------------------------------------------------------------------===//
#include "ARMFeatures.h"
-#include "InstPrinter/ARMInstPrinter.h"
#include "Utils/ARMBaseInfo.h"
#include "MCTargetDesc/ARMAddressingModes.h"
#include "MCTargetDesc/ARMBaseInfo.h"
+#include "MCTargetDesc/ARMInstPrinter.h"
#include "MCTargetDesc/ARMMCExpr.h"
#include "MCTargetDesc/ARMMCTargetDesc.h"
#include "llvm/ADT/APFloat.h"
Modified: llvm/trunk/lib/Target/ARM/AsmParser/LLVMBuild.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/AsmParser/LLVMBuild.txt?rev=360490&r1=360489&r2=360490&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/AsmParser/LLVMBuild.txt (original)
+++ llvm/trunk/lib/Target/ARM/AsmParser/LLVMBuild.txt Fri May 10 17:34:07 2019
@@ -18,5 +18,5 @@
type = Library
name = ARMAsmParser
parent = ARM
-required_libraries = ARMDesc ARMInfo ARMAsmPrinter MC MCParser Support ARMUtils
+required_libraries = ARMDesc ARMInfo MC MCParser Support ARMUtils
add_to_library_groups = ARM
Modified: llvm/trunk/lib/Target/ARM/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/CMakeLists.txt?rev=360490&r1=360489&r2=360490&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/CMakeLists.txt (original)
+++ llvm/trunk/lib/Target/ARM/CMakeLists.txt Fri May 10 17:34:07 2019
@@ -61,7 +61,6 @@ add_llvm_target(ARMCodeGen
add_subdirectory(AsmParser)
add_subdirectory(Disassembler)
-add_subdirectory(InstPrinter)
add_subdirectory(MCTargetDesc)
add_subdirectory(TargetInfo)
add_subdirectory(Utils)
Modified: llvm/trunk/lib/Target/ARM/LLVMBuild.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/LLVMBuild.txt?rev=360490&r1=360489&r2=360490&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/LLVMBuild.txt (original)
+++ llvm/trunk/lib/Target/ARM/LLVMBuild.txt Fri May 10 17:34:07 2019
@@ -15,7 +15,7 @@
;===------------------------------------------------------------------------===;
[common]
-subdirectories = AsmParser Disassembler InstPrinter MCTargetDesc TargetInfo Utils
+subdirectories = AsmParser Disassembler MCTargetDesc TargetInfo Utils
[component_0]
type = TargetGroup
@@ -30,5 +30,5 @@ has_jit = 1
type = Library
name = ARMCodeGen
parent = ARM
-required_libraries = ARMAsmPrinter ARMDesc ARMInfo Analysis AsmPrinter CodeGen Core MC Scalar SelectionDAG Support Target GlobalISel ARMUtils TransformUtils
+required_libraries = ARMDesc ARMInfo Analysis AsmPrinter CodeGen Core MC Scalar SelectionDAG Support Target GlobalISel ARMUtils TransformUtils
add_to_library_groups = ARM
Copied: llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMInstPrinter.h (from r360489, llvm/trunk/lib/Target/ARM/InstPrinter/ARMInstPrinter.h)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMInstPrinter.h?p2=llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMInstPrinter.h&p1=llvm/trunk/lib/Target/ARM/InstPrinter/ARMInstPrinter.h&r1=360489&r2=360490&rev=360490&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/InstPrinter/ARMInstPrinter.h (original)
+++ llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMInstPrinter.h Fri May 10 17:34:07 2019
@@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_LIB_TARGET_ARM_INSTPRINTER_ARMINSTPRINTER_H
-#define LLVM_LIB_TARGET_ARM_INSTPRINTER_ARMINSTPRINTER_H
+#ifndef LLVM_LIB_TARGET_ARM_MCTARGETDESC_ARMINSTPRINTER_H
+#define LLVM_LIB_TARGET_ARM_MCTARGETDESC_ARMINSTPRINTER_H
#include "MCTargetDesc/ARMMCTargetDesc.h"
#include "llvm/MC/MCInstPrinter.h"
@@ -246,4 +246,4 @@ private:
} // end namespace llvm
-#endif // LLVM_LIB_TARGET_ARM_INSTPRINTER_ARMINSTPRINTER_H
+#endif // LLVM_LIB_TARGET_ARM_MCTARGETDESC_ARMINSTPRINTER_H
Modified: llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp?rev=360490&r1=360489&r2=360490&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp (original)
+++ llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp Fri May 10 17:34:07 2019
@@ -12,8 +12,8 @@
#include "ARMMCTargetDesc.h"
#include "ARMBaseInfo.h"
+#include "ARMInstPrinter.h"
#include "ARMMCAsmInfo.h"
-#include "InstPrinter/ARMInstPrinter.h"
#include "llvm/ADT/Triple.h"
#include "llvm/MC/MCAsmBackend.h"
#include "llvm/MC/MCCodeEmitter.h"
Modified: llvm/trunk/lib/Target/ARM/MCTargetDesc/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/MCTargetDesc/CMakeLists.txt?rev=360490&r1=360489&r2=360490&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/MCTargetDesc/CMakeLists.txt (original)
+++ llvm/trunk/lib/Target/ARM/MCTargetDesc/CMakeLists.txt Fri May 10 17:34:07 2019
@@ -2,6 +2,7 @@ add_llvm_library(LLVMARMDesc
ARMAsmBackend.cpp
ARMELFObjectWriter.cpp
ARMELFStreamer.cpp
+ ARMInstPrinter.cpp
ARMMachObjectWriter.cpp
ARMMachORelocationInfo.cpp
ARMMCAsmInfo.cpp
Modified: llvm/trunk/lib/Target/ARM/MCTargetDesc/LLVMBuild.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/MCTargetDesc/LLVMBuild.txt?rev=360490&r1=360489&r2=360490&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/MCTargetDesc/LLVMBuild.txt (original)
+++ llvm/trunk/lib/Target/ARM/MCTargetDesc/LLVMBuild.txt Fri May 10 17:34:07 2019
@@ -18,5 +18,5 @@
type = Library
name = ARMDesc
parent = ARM
-required_libraries = ARMAsmPrinter ARMInfo MC MCDisassembler Support
+required_libraries = ARMInfo ARMUtils MC MCDisassembler Support
add_to_library_groups = ARM
More information about the llvm-commits
mailing list