From 56477d169087f053115686a1e993975b4f612d58 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Sun, 14 Nov 2010 18:33:33 +0000 Subject: [PATCH] move PPCAsmPrinter into the main PPC library, like ARM and X86. llvm-svn: 119054 --- llvm/lib/Target/PowerPC/AsmPrinter/CMakeLists.txt | 6 ------ llvm/lib/Target/PowerPC/AsmPrinter/Makefile | 15 --------------- llvm/lib/Target/PowerPC/CMakeLists.txt | 1 + llvm/lib/Target/PowerPC/Makefile | 2 +- .../PowerPC/{AsmPrinter => }/PPCAsmPrinter.cpp | 0 5 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 llvm/lib/Target/PowerPC/AsmPrinter/CMakeLists.txt delete mode 100644 llvm/lib/Target/PowerPC/AsmPrinter/Makefile rename llvm/lib/Target/PowerPC/{AsmPrinter => }/PPCAsmPrinter.cpp (100%) diff --git a/llvm/lib/Target/PowerPC/AsmPrinter/CMakeLists.txt b/llvm/lib/Target/PowerPC/AsmPrinter/CMakeLists.txt deleted file mode 100644 index 42cd4862a98f..000000000000 --- a/llvm/lib/Target/PowerPC/AsmPrinter/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/.. ) - -add_llvm_library(LLVMPowerPCAsmPrinter - PPCAsmPrinter.cpp - ) -add_dependencies(LLVMPowerPCAsmPrinter PowerPCCodeGenTable_gen) diff --git a/llvm/lib/Target/PowerPC/AsmPrinter/Makefile b/llvm/lib/Target/PowerPC/AsmPrinter/Makefile deleted file mode 100644 index bd5dce12dc43..000000000000 --- a/llvm/lib/Target/PowerPC/AsmPrinter/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -##===- lib/Target/PowerPC/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 = LLVMPowerPCAsmPrinter - -# Hack: we need to include 'main' PowerPC target directory to grab private headers -CPP.Flags += -I$(PROJ_OBJ_DIR)/.. -I$(PROJ_SRC_DIR)/.. - -include $(LEVEL)/Makefile.common diff --git a/llvm/lib/Target/PowerPC/CMakeLists.txt b/llvm/lib/Target/PowerPC/CMakeLists.txt index 5f48bd00c63c..cfa33af4e36a 100644 --- a/llvm/lib/Target/PowerPC/CMakeLists.txt +++ b/llvm/lib/Target/PowerPC/CMakeLists.txt @@ -12,6 +12,7 @@ tablegen(PPCGenCallingConv.inc -gen-callingconv) tablegen(PPCGenSubtarget.inc -gen-subtarget) add_llvm_target(PowerPCCodeGen + PPCAsmPrinter.cpp PPCBranchSelector.cpp PPCCodeEmitter.cpp PPCHazardRecognizers.cpp diff --git a/llvm/lib/Target/PowerPC/Makefile b/llvm/lib/Target/PowerPC/Makefile index 1265f1d36910..addcf4983440 100644 --- a/llvm/lib/Target/PowerPC/Makefile +++ b/llvm/lib/Target/PowerPC/Makefile @@ -18,6 +18,6 @@ BUILT_SOURCES = PPCGenInstrNames.inc PPCGenRegisterNames.inc \ PPCGenInstrInfo.inc PPCGenDAGISel.inc \ PPCGenSubtarget.inc PPCGenCallingConv.inc -DIRS = AsmPrinter TargetInfo +DIRS = TargetInfo include $(LEVEL)/Makefile.common diff --git a/llvm/lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp b/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp similarity index 100% rename from llvm/lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp rename to llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp