From 1139691e3aadff751c035f38f835d436ec6cf10a Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Sun, 14 Nov 2010 18:43:56 +0000 Subject: [PATCH] move all the target's asmprinters into the main target. The piece that should be split out is the InstPrinter (if a target is mc'ized). This change makes all the targets be consistent. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@119056 91177308-0d34-0410-b5e6-96231b3b80d8 --- CMakeLists.txt | 5 ----- .../Alpha/{AsmPrinter => }/AlphaAsmPrinter.cpp | 0 lib/Target/Alpha/AsmPrinter/CMakeLists.txt | 6 ------ lib/Target/Alpha/AsmPrinter/Makefile | 15 --------------- lib/Target/Alpha/CMakeLists.txt | 1 + lib/Target/Alpha/Makefile | 2 +- lib/Target/Blackfin/AsmPrinter/CMakeLists.txt | 6 ------ lib/Target/Blackfin/AsmPrinter/Makefile | 16 ---------------- .../{AsmPrinter => }/BlackfinAsmPrinter.cpp | 0 lib/Target/Blackfin/CMakeLists.txt | 1 + lib/Target/Blackfin/Makefile | 2 +- lib/Target/CellSPU/AsmPrinter/CMakeLists.txt | 9 --------- lib/Target/CellSPU/AsmPrinter/Makefile | 17 ----------------- lib/Target/CellSPU/CMakeLists.txt | 1 + lib/Target/CellSPU/Makefile | 2 +- .../CellSPU/{AsmPrinter => }/SPUAsmPrinter.cpp | 0 lib/Target/Mips/AsmPrinter/CMakeLists.txt | 9 --------- lib/Target/Mips/AsmPrinter/Makefile | 17 ----------------- lib/Target/Mips/CMakeLists.txt | 1 + lib/Target/Mips/Makefile | 2 +- .../Mips/{AsmPrinter => }/MipsAsmPrinter.cpp | 0 lib/Target/PTX/AsmPrinter/CMakeLists.txt | 6 ------ lib/Target/PTX/AsmPrinter/Makefile | 15 --------------- lib/Target/PTX/CMakeLists.txt | 1 + lib/Target/PTX/Makefile | 2 +- .../PTX/{AsmPrinter => }/PTXAsmPrinter.cpp | 0 lib/Target/Sparc/AsmPrinter/CMakeLists.txt | 6 ------ lib/Target/Sparc/AsmPrinter/Makefile | 15 --------------- lib/Target/Sparc/CMakeLists.txt | 1 + lib/Target/Sparc/Makefile | 2 +- .../Sparc/{AsmPrinter => }/SparcAsmPrinter.cpp | 0 lib/Target/SystemZ/AsmPrinter/CMakeLists.txt | 6 ------ lib/Target/SystemZ/AsmPrinter/Makefile | 15 --------------- lib/Target/SystemZ/CMakeLists.txt | 1 + lib/Target/SystemZ/Makefile | 2 +- .../{AsmPrinter => }/SystemZAsmPrinter.cpp | 0 lib/Target/XCore/AsmPrinter/CMakeLists.txt | 6 ------ lib/Target/XCore/AsmPrinter/Makefile | 16 ---------------- lib/Target/XCore/CMakeLists.txt | 1 + lib/Target/XCore/Makefile | 2 +- .../XCore/{AsmPrinter => }/XCoreAsmPrinter.cpp | 0 41 files changed, 16 insertions(+), 193 deletions(-) rename lib/Target/Alpha/{AsmPrinter => }/AlphaAsmPrinter.cpp (100%) delete mode 100644 lib/Target/Alpha/AsmPrinter/CMakeLists.txt delete mode 100644 lib/Target/Alpha/AsmPrinter/Makefile delete mode 100644 lib/Target/Blackfin/AsmPrinter/CMakeLists.txt delete mode 100644 lib/Target/Blackfin/AsmPrinter/Makefile rename lib/Target/Blackfin/{AsmPrinter => }/BlackfinAsmPrinter.cpp (100%) delete mode 100644 lib/Target/CellSPU/AsmPrinter/CMakeLists.txt delete mode 100644 lib/Target/CellSPU/AsmPrinter/Makefile rename lib/Target/CellSPU/{AsmPrinter => }/SPUAsmPrinter.cpp (100%) delete mode 100644 lib/Target/Mips/AsmPrinter/CMakeLists.txt delete mode 100644 lib/Target/Mips/AsmPrinter/Makefile rename lib/Target/Mips/{AsmPrinter => }/MipsAsmPrinter.cpp (100%) delete mode 100644 lib/Target/PTX/AsmPrinter/CMakeLists.txt delete mode 100644 lib/Target/PTX/AsmPrinter/Makefile rename lib/Target/PTX/{AsmPrinter => }/PTXAsmPrinter.cpp (100%) delete mode 100644 lib/Target/Sparc/AsmPrinter/CMakeLists.txt delete mode 100644 lib/Target/Sparc/AsmPrinter/Makefile rename lib/Target/Sparc/{AsmPrinter => }/SparcAsmPrinter.cpp (100%) delete mode 100644 lib/Target/SystemZ/AsmPrinter/CMakeLists.txt delete mode 100644 lib/Target/SystemZ/AsmPrinter/Makefile rename lib/Target/SystemZ/{AsmPrinter => }/SystemZAsmPrinter.cpp (100%) delete mode 100644 lib/Target/XCore/AsmPrinter/CMakeLists.txt delete mode 100644 lib/Target/XCore/AsmPrinter/Makefile rename lib/Target/XCore/{AsmPrinter => }/XCoreAsmPrinter.cpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index a028edf7747..d549e83593b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -328,11 +328,6 @@ foreach(t ${LLVM_TARGETS_TO_BUILD}) message(STATUS "Targeting ${t}") add_subdirectory(lib/Target/${t}) add_subdirectory(lib/Target/${t}/TargetInfo) - if( EXISTS ${LLVM_MAIN_SRC_DIR}/lib/Target/${t}/AsmPrinter/CMakeLists.txt ) - add_subdirectory(lib/Target/${t}/AsmPrinter) - set(LLVM_ENUM_ASM_PRINTERS - "${LLVM_ENUM_ASM_PRINTERS}LLVM_ASM_PRINTER(${t})\n") - endif( EXISTS ${LLVM_MAIN_SRC_DIR}/lib/Target/${t}/AsmPrinter/CMakeLists.txt ) if( EXISTS ${LLVM_MAIN_SRC_DIR}/lib/Target/${t}/InstPrinter/CMakeLists.txt ) add_subdirectory(lib/Target/${t}/InstPrinter) set(LLVM_ENUM_ASM_PRINTERS diff --git a/lib/Target/Alpha/AsmPrinter/AlphaAsmPrinter.cpp b/lib/Target/Alpha/AlphaAsmPrinter.cpp similarity index 100% rename from lib/Target/Alpha/AsmPrinter/AlphaAsmPrinter.cpp rename to lib/Target/Alpha/AlphaAsmPrinter.cpp diff --git a/lib/Target/Alpha/AsmPrinter/CMakeLists.txt b/lib/Target/Alpha/AsmPrinter/CMakeLists.txt deleted file mode 100644 index 992c2181314..00000000000 --- a/lib/Target/Alpha/AsmPrinter/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/.. ) - -add_llvm_library(LLVMAlphaAsmPrinter - AlphaAsmPrinter.cpp - ) -add_dependencies(LLVMAlphaAsmPrinter AlphaCodeGenTable_gen) diff --git a/lib/Target/Alpha/AsmPrinter/Makefile b/lib/Target/Alpha/AsmPrinter/Makefile deleted file mode 100644 index ea13c38df4a..00000000000 --- a/lib/Target/Alpha/AsmPrinter/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -##===- lib/Target/Alpha/AsmPrinter/Makefile ----------------*- Makefile -*-===## -# -# The LLVM Compiler Infrastructure -# -# This file is distributed under the University of Illinois Open Source -# License. See LICENSE.TXT for details. -# -##===----------------------------------------------------------------------===## -LEVEL = ../../../.. -LIBRARYNAME = LLVMAlphaAsmPrinter - -# Hack: we need to include 'main' alpha target directory to grab private headers -CPP.Flags += -I$(PROJ_OBJ_DIR)/.. -I$(PROJ_SRC_DIR)/.. - -include $(LEVEL)/Makefile.common diff --git a/lib/Target/Alpha/CMakeLists.txt b/lib/Target/Alpha/CMakeLists.txt index fdc1348b731..ad0d1a46ef2 100644 --- a/lib/Target/Alpha/CMakeLists.txt +++ b/lib/Target/Alpha/CMakeLists.txt @@ -11,6 +11,7 @@ tablegen(AlphaGenCallingConv.inc -gen-callingconv) tablegen(AlphaGenSubtarget.inc -gen-subtarget) add_llvm_target(AlphaCodeGen + AlphaAsmPrinter.cpp AlphaBranchSelector.cpp AlphaInstrInfo.cpp AlphaISelDAGToDAG.cpp diff --git a/lib/Target/Alpha/Makefile b/lib/Target/Alpha/Makefile index 2129ec83437..9564be680e5 100644 --- a/lib/Target/Alpha/Makefile +++ b/lib/Target/Alpha/Makefile @@ -18,6 +18,6 @@ BUILT_SOURCES = AlphaGenRegisterInfo.h.inc AlphaGenRegisterNames.inc \ AlphaGenAsmWriter.inc AlphaGenDAGISel.inc \ AlphaGenCallingConv.inc AlphaGenSubtarget.inc -DIRS = AsmPrinter TargetInfo +DIRS = TargetInfo include $(LEVEL)/Makefile.common diff --git a/lib/Target/Blackfin/AsmPrinter/CMakeLists.txt b/lib/Target/Blackfin/AsmPrinter/CMakeLists.txt deleted file mode 100644 index 795aebfe2b8..00000000000 --- a/lib/Target/Blackfin/AsmPrinter/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/.. ) - -add_llvm_library(LLVMBlackfinAsmPrinter - BlackfinAsmPrinter.cpp - ) -add_dependencies(LLVMBlackfinAsmPrinter BlackfinCodeGenTable_gen) diff --git a/lib/Target/Blackfin/AsmPrinter/Makefile b/lib/Target/Blackfin/AsmPrinter/Makefile deleted file mode 100644 index a106a2382a1..00000000000 --- a/lib/Target/Blackfin/AsmPrinter/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -##===- lib/Target/Blackfin/AsmPrinter/Makefile -------------*- Makefile -*-===## -# -# The LLVM Compiler Infrastructure -# -# This file is distributed under the University of Illinois Open Source -# License. See LICENSE.TXT for details. -# -##===----------------------------------------------------------------------===## -LEVEL = ../../../.. -LIBRARYNAME = LLVMBlackfinAsmPrinter - -# Hack: we need to include 'main' Blackfin target directory to grab private -# headers -CPP.Flags += -I$(PROJ_OBJ_DIR)/.. -I$(PROJ_SRC_DIR)/.. - -include $(LEVEL)/Makefile.common diff --git a/lib/Target/Blackfin/AsmPrinter/BlackfinAsmPrinter.cpp b/lib/Target/Blackfin/BlackfinAsmPrinter.cpp similarity index 100% rename from lib/Target/Blackfin/AsmPrinter/BlackfinAsmPrinter.cpp rename to lib/Target/Blackfin/BlackfinAsmPrinter.cpp diff --git a/lib/Target/Blackfin/CMakeLists.txt b/lib/Target/Blackfin/CMakeLists.txt index f8847d057da..718f4f270f3 100644 --- a/lib/Target/Blackfin/CMakeLists.txt +++ b/lib/Target/Blackfin/CMakeLists.txt @@ -12,6 +12,7 @@ tablegen(BlackfinGenCallingConv.inc -gen-callingconv) tablegen(BlackfinGenIntrinsics.inc -gen-tgt-intrinsic) add_llvm_target(BlackfinCodeGen + BlackfinAsmPrinter.cpp BlackfinInstrInfo.cpp BlackfinIntrinsicInfo.cpp BlackfinISelDAGToDAG.cpp diff --git a/lib/Target/Blackfin/Makefile b/lib/Target/Blackfin/Makefile index 339bef9981f..5eb8e9a992b 100644 --- a/lib/Target/Blackfin/Makefile +++ b/lib/Target/Blackfin/Makefile @@ -18,7 +18,7 @@ BUILT_SOURCES = BlackfinGenRegisterInfo.h.inc BlackfinGenRegisterNames.inc \ BlackfinGenDAGISel.inc BlackfinGenSubtarget.inc \ BlackfinGenCallingConv.inc BlackfinGenIntrinsics.inc -DIRS = AsmPrinter TargetInfo +DIRS = TargetInfo include $(LEVEL)/Makefile.common diff --git a/lib/Target/CellSPU/AsmPrinter/CMakeLists.txt b/lib/Target/CellSPU/AsmPrinter/CMakeLists.txt deleted file mode 100644 index 8a2b59a88a6..00000000000 --- a/lib/Target/CellSPU/AsmPrinter/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -include_directories( - ${CMAKE_CURRENT_BINARY_DIR}/.. - ${CMAKE_CURRENT_SOURCE_DIR}/.. - ) - -add_llvm_library(LLVMCellSPUAsmPrinter - SPUAsmPrinter.cpp - ) -add_dependencies(LLVMCellSPUAsmPrinter CellSPUCodeGenTable_gen) diff --git a/lib/Target/CellSPU/AsmPrinter/Makefile b/lib/Target/CellSPU/AsmPrinter/Makefile deleted file mode 100644 index 4ec9d04c002..00000000000 --- a/lib/Target/CellSPU/AsmPrinter/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -##===- lib/Target/CellSPU/AsmPrinter/Makefile --------------*- Makefile -*-===## -# -# The LLVM Compiler Infrastructure -# -# This file is distributed under the University of Illinois Open Source -# License. See LICENSE.TXT for details. -# -##===----------------------------------------------------------------------===## - -LEVEL = ../../../.. -LIBRARYNAME = LLVMCellSPUAsmPrinter - -# Hack: we need to include 'main' CellSPU target directory to grab -# private headers -CPP.Flags += -I$(PROJ_OBJ_DIR)/.. -I$(PROJ_SRC_DIR)/.. - -include $(LEVEL)/Makefile.common diff --git a/lib/Target/CellSPU/CMakeLists.txt b/lib/Target/CellSPU/CMakeLists.txt index 213dea9230c..901122b1c4c 100644 --- a/lib/Target/CellSPU/CMakeLists.txt +++ b/lib/Target/CellSPU/CMakeLists.txt @@ -12,6 +12,7 @@ tablegen(SPUGenSubtarget.inc -gen-subtarget) tablegen(SPUGenCallingConv.inc -gen-callingconv) add_llvm_target(CellSPUCodeGen + SPUAsmPrinter.cpp SPUFrameInfo.cpp SPUHazardRecognizers.cpp SPUInstrInfo.cpp diff --git a/lib/Target/CellSPU/Makefile b/lib/Target/CellSPU/Makefile index cbdbd3c3a5b..77c66be9e85 100644 --- a/lib/Target/CellSPU/Makefile +++ b/lib/Target/CellSPU/Makefile @@ -16,6 +16,6 @@ BUILT_SOURCES = SPUGenInstrNames.inc SPUGenRegisterNames.inc \ SPUGenInstrInfo.inc SPUGenDAGISel.inc \ SPUGenSubtarget.inc SPUGenCallingConv.inc -DIRS = AsmPrinter TargetInfo +DIRS = TargetInfo include $(LEVEL)/Makefile.common diff --git a/lib/Target/CellSPU/AsmPrinter/SPUAsmPrinter.cpp b/lib/Target/CellSPU/SPUAsmPrinter.cpp similarity index 100% rename from lib/Target/CellSPU/AsmPrinter/SPUAsmPrinter.cpp rename to lib/Target/CellSPU/SPUAsmPrinter.cpp diff --git a/lib/Target/Mips/AsmPrinter/CMakeLists.txt b/lib/Target/Mips/AsmPrinter/CMakeLists.txt deleted file mode 100644 index d3099d2a4e3..00000000000 --- a/lib/Target/Mips/AsmPrinter/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -include_directories( - ${CMAKE_CURRENT_BINARY_DIR}/.. - ${CMAKE_CURRENT_SOURCE_DIR}/.. - ) - -add_llvm_library(LLVMMipsAsmPrinter - MipsAsmPrinter.cpp - ) -add_dependencies(LLVMMipsAsmPrinter MipsCodeGenTable_gen) diff --git a/lib/Target/Mips/AsmPrinter/Makefile b/lib/Target/Mips/AsmPrinter/Makefile deleted file mode 100644 index b1efe9b9447..00000000000 --- a/lib/Target/Mips/AsmPrinter/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -##===- lib/Target/Mips/AsmPrinter/Makefile -----------------*- Makefile -*-===## -# -# The LLVM Compiler Infrastructure -# -# This file is distributed under the University of Illinois Open Source -# License. See LICENSE.TXT for details. -# -##===----------------------------------------------------------------------===## - -LEVEL = ../../../.. -LIBRARYNAME = LLVMMipsAsmPrinter - -# Hack: we need to include 'main' Mips target directory to grab -# private headers -CPP.Flags += -I$(PROJ_OBJ_DIR)/.. -I$(PROJ_SRC_DIR)/.. - -include $(LEVEL)/Makefile.common diff --git a/lib/Target/Mips/CMakeLists.txt b/lib/Target/Mips/CMakeLists.txt index 78767e52e1d..dda6da9fc3f 100644 --- a/lib/Target/Mips/CMakeLists.txt +++ b/lib/Target/Mips/CMakeLists.txt @@ -11,6 +11,7 @@ tablegen(MipsGenCallingConv.inc -gen-callingconv) tablegen(MipsGenSubtarget.inc -gen-subtarget) add_llvm_target(MipsCodeGen + MipsAsmPrinter.cpp MipsDelaySlotFiller.cpp MipsInstrInfo.cpp MipsISelDAGToDAG.cpp diff --git a/lib/Target/Mips/Makefile b/lib/Target/Mips/Makefile index 2ed8d77b85b..d16b066a624 100644 --- a/lib/Target/Mips/Makefile +++ b/lib/Target/Mips/Makefile @@ -18,7 +18,7 @@ BUILT_SOURCES = MipsGenRegisterInfo.h.inc MipsGenRegisterNames.inc \ MipsGenDAGISel.inc MipsGenCallingConv.inc \ MipsGenSubtarget.inc -DIRS = AsmPrinter TargetInfo +DIRS = TargetInfo include $(LEVEL)/Makefile.common diff --git a/lib/Target/Mips/AsmPrinter/MipsAsmPrinter.cpp b/lib/Target/Mips/MipsAsmPrinter.cpp similarity index 100% rename from lib/Target/Mips/AsmPrinter/MipsAsmPrinter.cpp rename to lib/Target/Mips/MipsAsmPrinter.cpp diff --git a/lib/Target/PTX/AsmPrinter/CMakeLists.txt b/lib/Target/PTX/AsmPrinter/CMakeLists.txt deleted file mode 100644 index 3f4257b444b..00000000000 --- a/lib/Target/PTX/AsmPrinter/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/.. ) - -add_llvm_library(LLVMPTXAsmPrinter - PTXAsmPrinter.cpp - ) -add_dependencies(LLVMPTXAsmPrinter PTXCodeGenTable_gen) diff --git a/lib/Target/PTX/AsmPrinter/Makefile b/lib/Target/PTX/AsmPrinter/Makefile deleted file mode 100644 index 67ee3bc34b3..00000000000 --- a/lib/Target/PTX/AsmPrinter/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -##===- lib/Target/PTX/AsmPrinter/Makefile ------------------*- Makefile -*-===## -# -# The LLVM Compiler Infrastructure -# -# This file is distributed under the University of Illinois Open Source -# License. See LICENSE.TXT for details. -# -##===----------------------------------------------------------------------===## -LEVEL = ../../../.. -LIBRARYNAME = LLVMPTXAsmPrinter - -# Hack: we need to include 'main' PTX target directory to grab private headers -CPP.Flags += -I$(PROJ_OBJ_DIR)/.. -I$(PROJ_SRC_DIR)/.. - -include $(LEVEL)/Makefile.common diff --git a/lib/Target/PTX/CMakeLists.txt b/lib/Target/PTX/CMakeLists.txt index 07b13ae53ca..d35d6d59a3a 100644 --- a/lib/Target/PTX/CMakeLists.txt +++ b/lib/Target/PTX/CMakeLists.txt @@ -10,6 +10,7 @@ tablegen(PTXGenRegisterNames.inc -gen-register-enums) tablegen(PTXGenSubtarget.inc -gen-subtarget) add_llvm_target(PTXCodeGen + PTXAsmPrinter.cpp PTXISelDAGToDAG.cpp PTXISelLowering.cpp PTXInstrInfo.cpp diff --git a/lib/Target/PTX/Makefile b/lib/Target/PTX/Makefile index cfb3b9c0f7f..2c40d699409 100644 --- a/lib/Target/PTX/Makefile +++ b/lib/Target/PTX/Makefile @@ -21,6 +21,6 @@ BUILT_SOURCES = PTXGenAsmWriter.inc \ PTXGenRegisterNames.inc \ PTXGenSubtarget.inc -DIRS = AsmPrinter TargetInfo +DIRS = TargetInfo include $(LEVEL)/Makefile.common diff --git a/lib/Target/PTX/AsmPrinter/PTXAsmPrinter.cpp b/lib/Target/PTX/PTXAsmPrinter.cpp similarity index 100% rename from lib/Target/PTX/AsmPrinter/PTXAsmPrinter.cpp rename to lib/Target/PTX/PTXAsmPrinter.cpp diff --git a/lib/Target/Sparc/AsmPrinter/CMakeLists.txt b/lib/Target/Sparc/AsmPrinter/CMakeLists.txt deleted file mode 100644 index da629f6e63f..00000000000 --- a/lib/Target/Sparc/AsmPrinter/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/.. ) - -add_llvm_library(LLVMSparcAsmPrinter - SparcAsmPrinter.cpp - ) -add_dependencies(LLVMSparcAsmPrinter SparcCodeGenTable_gen) diff --git a/lib/Target/Sparc/AsmPrinter/Makefile b/lib/Target/Sparc/AsmPrinter/Makefile deleted file mode 100644 index fe475389c68..00000000000 --- a/lib/Target/Sparc/AsmPrinter/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -##===- lib/Target/Sparc/AsmPrinter/Makefile ----------------*- Makefile -*-===## -# -# The LLVM Compiler Infrastructure -# -# This file is distributed under the University of Illinois Open Source -# License. See LICENSE.TXT for details. -# -##===----------------------------------------------------------------------===## -LEVEL = ../../../.. -LIBRARYNAME = LLVMSparcAsmPrinter - -# Hack: we need to include 'main' Sparc target directory to grab private headers -CPP.Flags += -I$(PROJ_OBJ_DIR)/.. -I$(PROJ_SRC_DIR)/.. - -include $(LEVEL)/Makefile.common diff --git a/lib/Target/Sparc/CMakeLists.txt b/lib/Target/Sparc/CMakeLists.txt index b789fa7ad5f..9ed85e03cfa 100644 --- a/lib/Target/Sparc/CMakeLists.txt +++ b/lib/Target/Sparc/CMakeLists.txt @@ -13,6 +13,7 @@ tablegen(SparcGenCallingConv.inc -gen-callingconv) add_llvm_target(SparcCodeGen DelaySlotFiller.cpp FPMover.cpp + SparcAsmPrinter.cpp SparcInstrInfo.cpp SparcISelDAGToDAG.cpp SparcISelLowering.cpp diff --git a/lib/Target/Sparc/Makefile b/lib/Target/Sparc/Makefile index e4078487e16..27942c56fb3 100644 --- a/lib/Target/Sparc/Makefile +++ b/lib/Target/Sparc/Makefile @@ -17,7 +17,7 @@ BUILT_SOURCES = SparcGenRegisterInfo.h.inc SparcGenRegisterNames.inc \ SparcGenInstrInfo.inc SparcGenAsmWriter.inc \ SparcGenDAGISel.inc SparcGenSubtarget.inc SparcGenCallingConv.inc -DIRS = AsmPrinter TargetInfo +DIRS = TargetInfo include $(LEVEL)/Makefile.common diff --git a/lib/Target/Sparc/AsmPrinter/SparcAsmPrinter.cpp b/lib/Target/Sparc/SparcAsmPrinter.cpp similarity index 100% rename from lib/Target/Sparc/AsmPrinter/SparcAsmPrinter.cpp rename to lib/Target/Sparc/SparcAsmPrinter.cpp diff --git a/lib/Target/SystemZ/AsmPrinter/CMakeLists.txt b/lib/Target/SystemZ/AsmPrinter/CMakeLists.txt deleted file mode 100644 index c6be83a6108..00000000000 --- a/lib/Target/SystemZ/AsmPrinter/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/.. ) - -add_llvm_library(LLVMSystemZAsmPrinter - SystemZAsmPrinter.cpp - ) -add_dependencies(LLVMSystemZAsmPrinter SystemZCodeGenTable_gen) diff --git a/lib/Target/SystemZ/AsmPrinter/Makefile b/lib/Target/SystemZ/AsmPrinter/Makefile deleted file mode 100644 index 0f90ed369f7..00000000000 --- a/lib/Target/SystemZ/AsmPrinter/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -##===- lib/Target/SystemZ/AsmPrinter/Makefile --------------*- Makefile -*-===## -# -# The LLVM Compiler Infrastructure -# -# This file is distributed under the University of Illinois Open Source -# License. See LICENSE.TXT for details. -# -##===----------------------------------------------------------------------===## -LEVEL = ../../../.. -LIBRARYNAME = LLVMSystemZAsmPrinter - -# Hack: we need to include 'main' SystemZ target directory to grab private headers -CPP.Flags += -I$(PROJ_OBJ_DIR)/.. -I$(PROJ_SRC_DIR)/.. - -include $(LEVEL)/Makefile.common diff --git a/lib/Target/SystemZ/CMakeLists.txt b/lib/Target/SystemZ/CMakeLists.txt index e780934d514..8bbdfbd8a48 100644 --- a/lib/Target/SystemZ/CMakeLists.txt +++ b/lib/Target/SystemZ/CMakeLists.txt @@ -11,6 +11,7 @@ tablegen(SystemZGenCallingConv.inc -gen-callingconv) tablegen(SystemZGenSubtarget.inc -gen-subtarget) add_llvm_target(SystemZCodeGen + SystemZAsmPrinter.cpp SystemZISelDAGToDAG.cpp SystemZISelLowering.cpp SystemZInstrInfo.cpp diff --git a/lib/Target/SystemZ/Makefile b/lib/Target/SystemZ/Makefile index 5b44090f3f1..6930e14c061 100644 --- a/lib/Target/SystemZ/Makefile +++ b/lib/Target/SystemZ/Makefile @@ -17,7 +17,7 @@ BUILT_SOURCES = SystemZGenRegisterInfo.h.inc SystemZGenRegisterNames.inc \ SystemZGenInstrInfo.inc SystemZGenAsmWriter.inc \ SystemZGenDAGISel.inc SystemZGenSubtarget.inc SystemZGenCallingConv.inc -DIRS = AsmPrinter TargetInfo +DIRS = TargetInfo include $(LEVEL)/Makefile.common diff --git a/lib/Target/SystemZ/AsmPrinter/SystemZAsmPrinter.cpp b/lib/Target/SystemZ/SystemZAsmPrinter.cpp similarity index 100% rename from lib/Target/SystemZ/AsmPrinter/SystemZAsmPrinter.cpp rename to lib/Target/SystemZ/SystemZAsmPrinter.cpp diff --git a/lib/Target/XCore/AsmPrinter/CMakeLists.txt b/lib/Target/XCore/AsmPrinter/CMakeLists.txt deleted file mode 100644 index 7c7c2f4ded0..00000000000 --- a/lib/Target/XCore/AsmPrinter/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/.. ) - -add_llvm_library(LLVMXCoreAsmPrinter - XCoreAsmPrinter.cpp - ) -add_dependencies(LLVMXCoreAsmPrinter XCoreCodeGenTable_gen) diff --git a/lib/Target/XCore/AsmPrinter/Makefile b/lib/Target/XCore/AsmPrinter/Makefile deleted file mode 100644 index 581f736b743..00000000000 --- a/lib/Target/XCore/AsmPrinter/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -##===- lib/Target/XCore/AsmPrinter/Makefile ----------------*- Makefile -*-===## -# -# The LLVM Compiler Infrastructure -# -# This file is distributed under the University of Illinois Open Source -# License. See LICENSE.TXT for details. -# -##===----------------------------------------------------------------------===## - -LEVEL = ../../../.. -LIBRARYNAME = LLVMXCoreAsmPrinter - -# Hack: we need to include 'main' XCore target directory to grab private headers -CPP.Flags += -I$(PROJ_OBJ_DIR)/.. -I$(PROJ_SRC_DIR)/.. - -include $(LEVEL)/Makefile.common diff --git a/lib/Target/XCore/CMakeLists.txt b/lib/Target/XCore/CMakeLists.txt index 38b35d7666c..d1c66a4d161 100644 --- a/lib/Target/XCore/CMakeLists.txt +++ b/lib/Target/XCore/CMakeLists.txt @@ -11,6 +11,7 @@ tablegen(XCoreGenCallingConv.inc -gen-callingconv) tablegen(XCoreGenSubtarget.inc -gen-subtarget) add_llvm_target(XCoreCodeGen + XCoreAsmPrinter.cpp XCoreFrameInfo.cpp XCoreInstrInfo.cpp XCoreISelDAGToDAG.cpp diff --git a/lib/Target/XCore/Makefile b/lib/Target/XCore/Makefile index 1b709745041..6c1ef886031 100644 --- a/lib/Target/XCore/Makefile +++ b/lib/Target/XCore/Makefile @@ -18,7 +18,7 @@ BUILT_SOURCES = XCoreGenRegisterInfo.h.inc XCoreGenRegisterNames.inc \ XCoreGenDAGISel.inc XCoreGenCallingConv.inc \ XCoreGenSubtarget.inc -DIRS = AsmPrinter TargetInfo +DIRS = TargetInfo include $(LEVEL)/Makefile.common diff --git a/lib/Target/XCore/AsmPrinter/XCoreAsmPrinter.cpp b/lib/Target/XCore/XCoreAsmPrinter.cpp similarity index 100% rename from lib/Target/XCore/AsmPrinter/XCoreAsmPrinter.cpp rename to lib/Target/XCore/XCoreAsmPrinter.cpp -- 2.34.1