From ef70d2a39399a33e4cb42f7bc98a2aa793dd7e65 Mon Sep 17 00:00:00 2001 From: NAKAMURA Takumi Date: Thu, 28 Nov 2013 17:04:31 +0000 Subject: [PATCH] [CMake] Let add_public_tablegen_target() provide intrinsics_gen, too. I think, in principle, intrinsics_gen may be added explicitly. That said, it can be added incidentally, since each target already has dependencies to llvm-tblgen. Almost all source files depend on both CommonTaleGen and intrinsics_gen. Explicit add_dependencies() have been pruned under lib/Target. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@195929 91177308-0d34-0410-b5e6-96231b3b80d8 --- cmake/modules/TableGen.cmake | 2 +- lib/Target/ARM/CMakeLists.txt | 2 -- lib/Target/Hexagon/CMakeLists.txt | 2 -- lib/Target/MSP430/CMakeLists.txt | 2 -- lib/Target/Mips/CMakeLists.txt | 2 -- lib/Target/NVPTX/CMakeLists.txt | 2 -- lib/Target/PowerPC/CMakeLists.txt | 2 -- lib/Target/R600/CMakeLists.txt | 2 -- lib/Target/R600/TargetInfo/CMakeLists.txt | 2 -- lib/Target/Sparc/CMakeLists.txt | 2 -- lib/Target/X86/CMakeLists.txt | 2 -- lib/Target/XCore/CMakeLists.txt | 2 -- 12 files changed, 1 insertion(+), 23 deletions(-) diff --git a/cmake/modules/TableGen.cmake b/cmake/modules/TableGen.cmake index 71c74fa9a78..7d8a9e567b1 100644 --- a/cmake/modules/TableGen.cmake +++ b/cmake/modules/TableGen.cmake @@ -54,7 +54,7 @@ macro(add_public_tablegen_target target) add_dependencies(${target} ${LLVM_COMMON_DEPENDS}) endif () set_target_properties(${target} PROPERTIES FOLDER "Tablegenning") - list(APPEND LLVM_COMMON_DEPENDS ${target}) + list(APPEND LLVM_COMMON_DEPENDS ${target} intrinsics_gen) endif( TABLEGEN_OUTPUT ) endmacro() diff --git a/lib/Target/ARM/CMakeLists.txt b/lib/Target/ARM/CMakeLists.txt index b832508a086..66d015e2b3c 100644 --- a/lib/Target/ARM/CMakeLists.txt +++ b/lib/Target/ARM/CMakeLists.txt @@ -49,8 +49,6 @@ add_llvm_target(ARMCodeGen Thumb2SizeReduction.cpp ) -add_dependencies(LLVMARMCodeGen intrinsics_gen) - # workaround for hanging compilation on MSVC9, 10 if( MSVC_VERSION EQUAL 1600 OR MSVC_VERSION EQUAL 1500 ) set_property( diff --git a/lib/Target/Hexagon/CMakeLists.txt b/lib/Target/Hexagon/CMakeLists.txt index 713979d1c97..81b0e568054 100644 --- a/lib/Target/Hexagon/CMakeLists.txt +++ b/lib/Target/Hexagon/CMakeLists.txt @@ -37,8 +37,6 @@ add_llvm_target(HexagonCodeGen HexagonCopyToCombine.cpp ) -add_dependencies(LLVMHexagonCodeGen intrinsics_gen) - add_subdirectory(TargetInfo) add_subdirectory(InstPrinter) add_subdirectory(MCTargetDesc) diff --git a/lib/Target/MSP430/CMakeLists.txt b/lib/Target/MSP430/CMakeLists.txt index f9ecaed83a6..a8f9b52746a 100644 --- a/lib/Target/MSP430/CMakeLists.txt +++ b/lib/Target/MSP430/CMakeLists.txt @@ -23,8 +23,6 @@ add_llvm_target(MSP430CodeGen MSP430MCInstLower.cpp ) -add_dependencies(LLVMMSP430CodeGen intrinsics_gen) - add_subdirectory(InstPrinter) add_subdirectory(TargetInfo) add_subdirectory(MCTargetDesc) diff --git a/lib/Target/Mips/CMakeLists.txt b/lib/Target/Mips/CMakeLists.txt index b38fc52f1a9..a225a00c023 100644 --- a/lib/Target/Mips/CMakeLists.txt +++ b/lib/Target/Mips/CMakeLists.txt @@ -48,8 +48,6 @@ add_llvm_target(MipsCodeGen MipsSelectionDAGInfo.cpp ) -add_dependencies(LLVMMipsCodeGen intrinsics_gen) - add_subdirectory(InstPrinter) add_subdirectory(Disassembler) add_subdirectory(TargetInfo) diff --git a/lib/Target/NVPTX/CMakeLists.txt b/lib/Target/NVPTX/CMakeLists.txt index fd3c99b545c..8d25077a87e 100644 --- a/lib/Target/NVPTX/CMakeLists.txt +++ b/lib/Target/NVPTX/CMakeLists.txt @@ -30,8 +30,6 @@ set(NVPTXCodeGen_sources add_llvm_target(NVPTXCodeGen ${NVPTXCodeGen_sources}) -add_dependencies(LLVMNVPTXCodeGen intrinsics_gen) - add_subdirectory(TargetInfo) add_subdirectory(InstPrinter) add_subdirectory(MCTargetDesc) diff --git a/lib/Target/PowerPC/CMakeLists.txt b/lib/Target/PowerPC/CMakeLists.txt index 737b52174e2..f2cb05a9d2c 100644 --- a/lib/Target/PowerPC/CMakeLists.txt +++ b/lib/Target/PowerPC/CMakeLists.txt @@ -34,8 +34,6 @@ add_llvm_target(PowerPCCodeGen PPCSelectionDAGInfo.cpp ) -add_dependencies(LLVMPowerPCCodeGen intrinsics_gen) - add_subdirectory(AsmParser) add_subdirectory(InstPrinter) add_subdirectory(TargetInfo) diff --git a/lib/Target/R600/CMakeLists.txt b/lib/Target/R600/CMakeLists.txt index a8ac2c2fdb8..93a51179754 100644 --- a/lib/Target/R600/CMakeLists.txt +++ b/lib/Target/R600/CMakeLists.txt @@ -50,8 +50,6 @@ add_llvm_target(R600CodeGen SITypeRewriter.cpp ) -add_dependencies(LLVMR600CodeGen intrinsics_gen) - add_subdirectory(InstPrinter) add_subdirectory(TargetInfo) add_subdirectory(MCTargetDesc) diff --git a/lib/Target/R600/TargetInfo/CMakeLists.txt b/lib/Target/R600/TargetInfo/CMakeLists.txt index 8b8e8d521e5..c3bd26c7a89 100644 --- a/lib/Target/R600/TargetInfo/CMakeLists.txt +++ b/lib/Target/R600/TargetInfo/CMakeLists.txt @@ -1,5 +1,3 @@ add_llvm_library(LLVMR600Info AMDGPUTargetInfo.cpp ) - -add_dependencies(LLVMR600Info intrinsics_gen) diff --git a/lib/Target/Sparc/CMakeLists.txt b/lib/Target/Sparc/CMakeLists.txt index b98e7137271..7c523a6e2ff 100644 --- a/lib/Target/Sparc/CMakeLists.txt +++ b/lib/Target/Sparc/CMakeLists.txt @@ -25,7 +25,5 @@ add_llvm_target(SparcCodeGen SparcCodeEmitter.cpp ) -add_dependencies(LLVMSparcCodeGen intrinsics_gen) - add_subdirectory(TargetInfo) add_subdirectory(MCTargetDesc) diff --git a/lib/Target/X86/CMakeLists.txt b/lib/Target/X86/CMakeLists.txt index 7cb71f066cc..77606ba36ee 100644 --- a/lib/Target/X86/CMakeLists.txt +++ b/lib/Target/X86/CMakeLists.txt @@ -53,8 +53,6 @@ endif() add_llvm_target(X86CodeGen ${sources}) -add_dependencies(LLVMX86CodeGen intrinsics_gen) - add_subdirectory(AsmParser) add_subdirectory(Disassembler) add_subdirectory(InstPrinter) diff --git a/lib/Target/XCore/CMakeLists.txt b/lib/Target/XCore/CMakeLists.txt index 4edbf9818f0..72d06ebaff5 100644 --- a/lib/Target/XCore/CMakeLists.txt +++ b/lib/Target/XCore/CMakeLists.txt @@ -26,8 +26,6 @@ add_llvm_target(XCoreCodeGen XCoreSelectionDAGInfo.cpp ) -add_dependencies(LLVMXCoreCodeGen intrinsics_gen) - add_subdirectory(Disassembler) add_subdirectory(InstPrinter) add_subdirectory(TargetInfo)