diff options
41 files changed, 43 insertions, 33 deletions
diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake index abc14d0d37..5e3a4c1c43 100755 --- a/cmake/modules/AddLLVM.cmake +++ b/cmake/modules/AddLLVM.cmake @@ -2,7 +2,6 @@ include(LLVMProcessSources) include(LLVM-Config) macro(add_llvm_library name) - create_tablegenning_custom_target( ${name} ) llvm_process_sources( ALL_FILES ${ARGN} ) add_library( ${name} ${ALL_FILES} ) set_property( GLOBAL APPEND PROPERTY LLVM_LIBS ${name} ) @@ -33,7 +32,6 @@ macro(add_llvm_library name) add_dependencies(${name} ${CURRENT_LLVM_TARGET}) endif() set_target_properties(${name} PROPERTIES FOLDER "Libraries") - add_tablegenning_dependency( ${name} ) endmacro(add_llvm_library name) @@ -77,7 +75,6 @@ endmacro(add_llvm_loadable_module name) macro(add_llvm_executable name) - create_tablegenning_custom_target( ${name} ) llvm_process_sources( ALL_FILES ${ARGN} ) if( EXCLUDE_FROM_ALL ) add_executable(${name} EXCLUDE_FROM_ALL ${ALL_FILES}) @@ -91,7 +88,6 @@ macro(add_llvm_executable name) add_dependencies( ${name} ${LLVM_COMMON_DEPENDS} ) endif( LLVM_COMMON_DEPENDS ) link_system_libs( ${name} ) - add_tablegenning_dependency( ${name} ) endmacro(add_llvm_executable name) diff --git a/cmake/modules/TableGen.cmake b/cmake/modules/TableGen.cmake index 6605b5b604..580b9a92ac 100644 --- a/cmake/modules/TableGen.cmake +++ b/cmake/modules/TableGen.cmake @@ -45,23 +45,11 @@ macro(tablegen ofn) PROPERTIES GENERATED 1) endmacro(tablegen) - -function(create_tablegenning_custom_target target) - # Creates the global target that runs the file-level dependencies - # for tablegenning. +function(add_public_tablegen_target target) + # Creates a target for publicly exporting tablegen dependencies. if( TABLEGEN_OUTPUT ) - add_custom_target(${target}Table_gen + add_custom_target(${target} DEPENDS ${TABLEGEN_OUTPUT}) - add_dependencies(${target}Table_gen ${LLVM_COMMON_DEPENDS}) + add_dependencies(${target} ${LLVM_COMMON_DEPENDS}) endif( TABLEGEN_OUTPUT ) endfunction() - -function(add_tablegenning_dependency target) - # Makes the tablegenning step created with - # create_tablegenning_custom_target dependent on `target'. - if ( TABLEGEN_OUTPUT ) - add_dependencies(${target} ${target}Table_gen) - set_target_properties(${target}Table_gen PROPERTIES FOLDER "Tablegenning") - endif (TABLEGEN_OUTPUT) -endfunction() - diff --git a/lib/Target/ARM/AsmParser/CMakeLists.txt b/lib/Target/ARM/AsmParser/CMakeLists.txt index 9ba7c0125d..88393e313a 100644 --- a/lib/Target/ARM/AsmParser/CMakeLists.txt +++ b/lib/Target/ARM/AsmParser/CMakeLists.txt @@ -4,4 +4,4 @@ add_llvm_library(LLVMARMAsmParser ARMAsmLexer.cpp ARMAsmParser.cpp ) - +add_dependencies(LLVMARMAsmParser ARMCommonTableGen) diff --git a/lib/Target/ARM/CMakeLists.txt b/lib/Target/ARM/CMakeLists.txt index c015c12690..8394be52cd 100644 --- a/lib/Target/ARM/CMakeLists.txt +++ b/lib/Target/ARM/CMakeLists.txt @@ -13,6 +13,7 @@ tablegen(ARMGenCallingConv.inc -gen-callingconv) tablegen(ARMGenSubtargetInfo.inc -gen-subtarget) tablegen(ARMGenEDInfo.inc -gen-enhanced-disassembly-info) tablegen(ARMGenDecoderTables.inc -gen-arm-decoder) +add_public_tablegen_target(ARMCommonTableGen) add_llvm_target(ARMCodeGen ARMAsmPrinter.cpp diff --git a/lib/Target/ARM/Disassembler/CMakeLists.txt b/lib/Target/ARM/Disassembler/CMakeLists.txt index b23dd6ba57..a4238aae54 100644 --- a/lib/Target/ARM/Disassembler/CMakeLists.txt +++ b/lib/Target/ARM/Disassembler/CMakeLists.txt @@ -11,4 +11,4 @@ set_property( PROPERTY COMPILE_FLAGS "/Od" ) endif() -add_dependencies(LLVMARMDisassembler ARMCodeGenTable_gen) +add_dependencies(LLVMARMDisassembler ARMCommonTableGen) diff --git a/lib/Target/ARM/InstPrinter/CMakeLists.txt b/lib/Target/ARM/InstPrinter/CMakeLists.txt index 18645c0864..7b6193aeef 100644 --- a/lib/Target/ARM/InstPrinter/CMakeLists.txt +++ b/lib/Target/ARM/InstPrinter/CMakeLists.txt @@ -3,4 +3,4 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/ add_llvm_library(LLVMARMAsmPrinter ARMInstPrinter.cpp ) -add_dependencies(LLVMARMAsmPrinter ARMCodeGenTable_gen) +add_dependencies(LLVMARMAsmPrinter ARMCommonTableGen) diff --git a/lib/Target/ARM/MCTargetDesc/CMakeLists.txt b/lib/Target/ARM/MCTargetDesc/CMakeLists.txt index 89208c0301..aca5671677 100644 --- a/lib/Target/ARM/MCTargetDesc/CMakeLists.txt +++ b/lib/Target/ARM/MCTargetDesc/CMakeLists.txt @@ -6,6 +6,7 @@ add_llvm_library(LLVMARMDesc ARMMCExpr.cpp ARMMachObjectWriter.cpp ) +add_dependencies(LLVMARMDesc ARMCommonTableGen) # Hack: we need to include 'main' target directory to grab private headers include_directories(${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_BINARY_DIR}/..) diff --git a/lib/Target/Alpha/CMakeLists.txt b/lib/Target/Alpha/CMakeLists.txt index a6027bbf0b..5444e1ab08 100644 --- a/lib/Target/Alpha/CMakeLists.txt +++ b/lib/Target/Alpha/CMakeLists.txt @@ -6,6 +6,7 @@ tablegen(AlphaGenAsmWriter.inc -gen-asm-writer) tablegen(AlphaGenDAGISel.inc -gen-dag-isel) tablegen(AlphaGenCallingConv.inc -gen-callingconv) tablegen(AlphaGenSubtargetInfo.inc -gen-subtarget) +add_public_tablegen_target(AlphaCommonTableGen) add_llvm_target(AlphaCodeGen AlphaAsmPrinter.cpp diff --git a/lib/Target/Alpha/MCTargetDesc/CMakeLists.txt b/lib/Target/Alpha/MCTargetDesc/CMakeLists.txt index ad0dd26aaf..733b1c01d4 100644 --- a/lib/Target/Alpha/MCTargetDesc/CMakeLists.txt +++ b/lib/Target/Alpha/MCTargetDesc/CMakeLists.txt @@ -2,3 +2,4 @@ add_llvm_library(LLVMAlphaDesc AlphaMCTargetDesc.cpp AlphaMCAsmInfo.cpp ) +add_dependencies(LLVMAlphaDesc AlphaCommonTableGen) diff --git a/lib/Target/Alpha/TargetInfo/CMakeLists.txt b/lib/Target/Alpha/TargetInfo/CMakeLists.txt index 2a7291b90a..a52457d633 100644 --- a/lib/Target/Alpha/TargetInfo/CMakeLists.txt +++ b/lib/Target/Alpha/TargetInfo/CMakeLists.txt @@ -3,5 +3,4 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/ add_llvm_library(LLVMAlphaInfo AlphaTargetInfo.cpp ) - -add_dependencies(LLVMAlphaInfo AlphaCodeGenTable_gen) +add_dependencies(LLVMAlphaInfo AlphaCommonTableGen) diff --git a/lib/Target/Blackfin/CMakeLists.txt b/lib/Target/Blackfin/CMakeLists.txt index d3f33a987e..e69ffa4a3a 100644 --- a/lib/Target/Blackfin/CMakeLists.txt +++ b/lib/Target/Blackfin/CMakeLists.txt @@ -7,6 +7,7 @@ tablegen(BlackfinGenDAGISel.inc -gen-dag-isel) tablegen(BlackfinGenSubtargetInfo.inc -gen-subtarget) tablegen(BlackfinGenCallingConv.inc -gen-callingconv) tablegen(BlackfinGenIntrinsics.inc -gen-tgt-intrinsic) +add_public_tablegen_target(BlackfinCommonTableGen) add_llvm_target(BlackfinCodeGen BlackfinAsmPrinter.cpp diff --git a/lib/Target/Blackfin/MCTargetDesc/CMakeLists.txt b/lib/Target/Blackfin/MCTargetDesc/CMakeLists.txt index 8cd924f923..7ea79b498e 100644 --- a/lib/Target/Blackfin/MCTargetDesc/CMakeLists.txt +++ b/lib/Target/Blackfin/MCTargetDesc/CMakeLists.txt @@ -2,3 +2,4 @@ add_llvm_library(LLVMBlackfinDesc BlackfinMCTargetDesc.cpp BlackfinMCAsmInfo.cpp ) +add_dependencies(LLVMBlackfinDesc BlackfinCommonTableGen) diff --git a/lib/Target/CellSPU/CMakeLists.txt b/lib/Target/CellSPU/CMakeLists.txt index 0b94e0cf11..20ecb9b60e 100644 --- a/lib/Target/CellSPU/CMakeLists.txt +++ b/lib/Target/CellSPU/CMakeLists.txt @@ -7,6 +7,7 @@ tablegen(SPUGenInstrInfo.inc -gen-instr-info) tablegen(SPUGenDAGISel.inc -gen-dag-isel) tablegen(SPUGenSubtargetInfo.inc -gen-subtarget) tablegen(SPUGenCallingConv.inc -gen-callingconv) +add_public_tablegen_target(CellSPUCommonTableGen) add_llvm_target(CellSPUCodeGen SPUAsmPrinter.cpp diff --git a/lib/Target/CellSPU/MCTargetDesc/CMakeLists.txt b/lib/Target/CellSPU/MCTargetDesc/CMakeLists.txt index 85fb258eac..7435e93fe0 100644 --- a/lib/Target/CellSPU/MCTargetDesc/CMakeLists.txt +++ b/lib/Target/CellSPU/MCTargetDesc/CMakeLists.txt @@ -2,3 +2,4 @@ add_llvm_library(LLVMCellSPUDesc SPUMCTargetDesc.cpp SPUMCAsmInfo.cpp ) +add_dependencies(LLVMCellSPUDesc CellSPUCommonTableGen) diff --git a/lib/Target/MBlaze/AsmParser/CMakeLists.txt b/lib/Target/MBlaze/AsmParser/CMakeLists.txt index 87e7cb5da5..18870cd1cf 100644 --- a/lib/Target/MBlaze/AsmParser/CMakeLists.txt +++ b/lib/Target/MBlaze/AsmParser/CMakeLists.txt @@ -5,4 +5,5 @@ add_llvm_library(LLVMMBlazeAsmParser MBlazeAsmLexer.cpp MBlazeAsmParser.cpp ) +add_dependencies(LLVMMBlazeAsmParser MBlazeCommonTableGen) diff --git a/lib/Target/MBlaze/CMakeLists.txt b/lib/Target/MBlaze/CMakeLists.txt index 224d3fbbee..ae0eca96a2 100644 --- a/lib/Target/MBlaze/CMakeLists.txt +++ b/lib/Target/MBlaze/CMakeLists.txt @@ -10,6 +10,7 @@ tablegen(MBlazeGenCallingConv.inc -gen-callingconv) tablegen(MBlazeGenSubtargetInfo.inc -gen-subtarget) tablegen(MBlazeGenIntrinsics.inc -gen-tgt-intrinsic) tablegen(MBlazeGenEDInfo.inc -gen-enhanced-disassembly-info) +add_public_tablegen_target(MBlazeCommonTableGen) add_llvm_target(MBlazeCodeGen MBlazeDelaySlotFiller.cpp diff --git a/lib/Target/MBlaze/Disassembler/CMakeLists.txt b/lib/Target/MBlaze/Disassembler/CMakeLists.txt index 9376e68a35..be2dce156d 100644 --- a/lib/Target/MBlaze/Disassembler/CMakeLists.txt +++ b/lib/Target/MBlaze/Disassembler/CMakeLists.txt @@ -13,4 +13,4 @@ set_property( ) endif() -add_dependencies(LLVMMBlazeDisassembler MBlazeCodeGenTable_gen) +add_dependencies(LLVMMBlazeDisassembler MBlazeCommonTableGen) diff --git a/lib/Target/MBlaze/InstPrinter/CMakeLists.txt b/lib/Target/MBlaze/InstPrinter/CMakeLists.txt index 242a573036..138a4e3634 100644 --- a/lib/Target/MBlaze/InstPrinter/CMakeLists.txt +++ b/lib/Target/MBlaze/InstPrinter/CMakeLists.txt @@ -5,4 +5,4 @@ add_llvm_library(LLVMMBlazeAsmPrinter MBlazeInstPrinter.cpp ) -add_dependencies(LLVMMBlazeAsmPrinter MBlazeCodeGenTable_gen) +add_dependencies(LLVMMBlazeAsmPrinter MBlazeCommonTableGen) diff --git a/lib/Target/MBlaze/MCTargetDesc/CMakeLists.txt b/lib/Target/MBlaze/MCTargetDesc/CMakeLists.txt index 22e840b372..ef8d679d74 100644 --- a/lib/Target/MBlaze/MCTargetDesc/CMakeLists.txt +++ b/lib/Target/MBlaze/MCTargetDesc/CMakeLists.txt @@ -4,3 +4,4 @@ add_llvm_library(LLVMMBlazeDesc MBlazeMCCodeEmitter.cpp MBlazeMCTargetDesc.cpp ) +add_dependencies(LLVMMBlazeDesc MBlazeCommonTableGen) diff --git a/lib/Target/MSP430/CMakeLists.txt b/lib/Target/MSP430/CMakeLists.txt index 33f3d449ed..3b6cf89d1f 100644 --- a/lib/Target/MSP430/CMakeLists.txt +++ b/lib/Target/MSP430/CMakeLists.txt @@ -6,6 +6,7 @@ tablegen(MSP430GenAsmWriter.inc -gen-asm-writer) tablegen(MSP430GenDAGISel.inc -gen-dag-isel) tablegen(MSP430GenCallingConv.inc -gen-callingconv) tablegen(MSP430GenSubtargetInfo.inc -gen-subtarget) +add_public_tablegen_target(MSP430CommonTableGen) add_llvm_target(MSP430CodeGen MSP430BranchSelector.cpp diff --git a/lib/Target/MSP430/InstPrinter/CMakeLists.txt b/lib/Target/MSP430/InstPrinter/CMakeLists.txt index f5458d59a8..5ad01456a4 100644 --- a/lib/Target/MSP430/InstPrinter/CMakeLists.txt +++ b/lib/Target/MSP430/InstPrinter/CMakeLists.txt @@ -3,4 +3,4 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/ add_llvm_library(LLVMMSP430AsmPrinter MSP430InstPrinter.cpp ) -add_dependencies(LLVMMSP430AsmPrinter MSP430CodeGenTable_gen) +add_dependencies(LLVMMSP430AsmPrinter MSP430CommonTableGen) diff --git a/lib/Target/MSP430/MCTargetDesc/CMakeLists.txt b/lib/Target/MSP430/MCTargetDesc/CMakeLists.txt index 0f3ebd3039..f30317b606 100644 --- a/lib/Target/MSP430/MCTargetDesc/CMakeLists.txt +++ b/lib/Target/MSP430/MCTargetDesc/CMakeLists.txt @@ -2,3 +2,4 @@ add_llvm_library(LLVMMSP430Desc MSP430MCTargetDesc.cpp MSP430MCAsmInfo.cpp ) +add_dependencies(LLVMMSP430Desc MSP430CommonTableGen) diff --git a/lib/Target/Mips/CMakeLists.txt b/lib/Target/Mips/CMakeLists.txt index b32c7d1d5d..192ff1c93f 100644 --- a/lib/Target/Mips/CMakeLists.txt +++ b/lib/Target/Mips/CMakeLists.txt @@ -6,6 +6,7 @@ tablegen(MipsGenAsmWriter.inc -gen-asm-writer) tablegen(MipsGenDAGISel.inc -gen-dag-isel) tablegen(MipsGenCallingConv.inc -gen-callingconv) tablegen(MipsGenSubtargetInfo.inc -gen-subtarget) +add_public_tablegen_target(MipsCommonTableGen) add_llvm_target(MipsCodeGen MipsAsmPrinter.cpp diff --git a/lib/Target/Mips/InstPrinter/CMakeLists.txt b/lib/Target/Mips/InstPrinter/CMakeLists.txt index 8852fd4126..e64d511f07 100644 --- a/lib/Target/Mips/InstPrinter/CMakeLists.txt +++ b/lib/Target/Mips/InstPrinter/CMakeLists.txt @@ -3,4 +3,4 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/ add_llvm_library(LLVMMipsAsmPrinter MipsInstPrinter.cpp ) -add_dependencies(LLVMMipsAsmPrinter MipsCodeGenTable_gen) +add_dependencies(LLVMMipsAsmPrinter MipsCommonTableGen) diff --git a/lib/Target/Mips/MCTargetDesc/CMakeLists.txt b/lib/Target/Mips/MCTargetDesc/CMakeLists.txt index 97de75db53..332c1a0a8b 100644 --- a/lib/Target/Mips/MCTargetDesc/CMakeLists.txt +++ b/lib/Target/Mips/MCTargetDesc/CMakeLists.txt @@ -2,3 +2,4 @@ add_llvm_library(LLVMMipsDesc MipsMCTargetDesc.cpp MipsMCAsmInfo.cpp ) +add_dependencies(LLVMMipsDesc MipsCommonTableGen) diff --git a/lib/Target/PTX/CMakeLists.txt b/lib/Target/PTX/CMakeLists.txt index ce08916aaa..1eafb66030 100644 --- a/lib/Target/PTX/CMakeLists.txt +++ b/lib/Target/PTX/CMakeLists.txt @@ -6,6 +6,7 @@ tablegen(PTXGenDAGISel.inc -gen-dag-isel) tablegen(PTXGenInstrInfo.inc -gen-instr-info) tablegen(PTXGenRegisterInfo.inc -gen-register-info) tablegen(PTXGenSubtargetInfo.inc -gen-subtarget) +add_public_tablegen_target(PTXCommonTableGen) add_llvm_target(PTXCodeGen PTXAsmPrinter.cpp diff --git a/lib/Target/PTX/MCTargetDesc/CMakeLists.txt b/lib/Target/PTX/MCTargetDesc/CMakeLists.txt index df0f63fdba..ad787321e4 100644 --- a/lib/Target/PTX/MCTargetDesc/CMakeLists.txt +++ b/lib/Target/PTX/MCTargetDesc/CMakeLists.txt @@ -2,3 +2,4 @@ add_llvm_library(LLVMPTXDesc PTXMCTargetDesc.cpp PTXMCAsmInfo.cpp ) +add_dependencies(LLVMPTXDesc PTXCommonTableGen) diff --git a/lib/Target/PowerPC/CMakeLists.txt b/lib/Target/PowerPC/CMakeLists.txt index 0c70e563bd..158f251beb 100644 --- a/lib/Target/PowerPC/CMakeLists.txt +++ b/lib/Target/PowerPC/CMakeLists.txt @@ -8,6 +8,7 @@ tablegen(PPCGenInstrInfo.inc -gen-instr-info) tablegen(PPCGenDAGISel.inc -gen-dag-isel) tablegen(PPCGenCallingConv.inc -gen-callingconv) tablegen(PPCGenSubtargetInfo.inc -gen-subtarget) +add_public_tablegen_target(PowerPCCommonTableGen) add_llvm_target(PowerPCCodeGen PPCAsmPrinter.cpp diff --git a/lib/Target/PowerPC/InstPrinter/CMakeLists.txt b/lib/Target/PowerPC/InstPrinter/CMakeLists.txt index 389ea7742b..dfdc277361 100644 --- a/lib/Target/PowerPC/InstPrinter/CMakeLists.txt +++ b/lib/Target/PowerPC/InstPrinter/CMakeLists.txt @@ -3,4 +3,4 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/ add_llvm_library(LLVMPowerPCAsmPrinter PPCInstPrinter.cpp ) -add_dependencies(LLVMPowerPCAsmPrinter PowerPCCodeGenTable_gen) +add_dependencies(LLVMPowerPCAsmPrinter PowerPCCommonTableGen) diff --git a/lib/Target/PowerPC/MCTargetDesc/CMakeLists.txt b/lib/Target/PowerPC/MCTargetDesc/CMakeLists.txt index 54d40c360d..1c13cdb05a 100644 --- a/lib/Target/PowerPC/MCTargetDesc/CMakeLists.txt +++ b/lib/Target/PowerPC/MCTargetDesc/CMakeLists.txt @@ -4,3 +4,4 @@ add_llvm_library(LLVMPowerPCDesc PPCMCAsmInfo.cpp PPCMCCodeEmitter.cpp ) +add_dependencies(LLVMPowerPCDesc PowerPCCommonTableGen) diff --git a/lib/Target/Sparc/CMakeLists.txt b/lib/Target/Sparc/CMakeLists.txt index c77ded4b43..32bc421f0b 100644 --- a/lib/Target/Sparc/CMakeLists.txt +++ b/lib/Target/Sparc/CMakeLists.txt @@ -6,6 +6,7 @@ tablegen(SparcGenAsmWriter.inc -gen-asm-writer) tablegen(SparcGenDAGISel.inc -gen-dag-isel) tablegen(SparcGenSubtargetInfo.inc -gen-subtarget) tablegen(SparcGenCallingConv.inc -gen-callingconv) +add_public_tablegen_target(SparcCommonTableGen) add_llvm_target(SparcCodeGen DelaySlotFiller.cpp diff --git a/lib/Target/Sparc/MCTargetDesc/CMakeLists.txt b/lib/Target/Sparc/MCTargetDesc/CMakeLists.txt index 1e8c029798..a0525b6723 100644 --- a/lib/Target/Sparc/MCTargetDesc/CMakeLists.txt +++ b/lib/Target/Sparc/MCTargetDesc/CMakeLists.txt @@ -2,3 +2,4 @@ add_llvm_library(LLVMSparcDesc SparcMCTargetDesc.cpp SparcMCAsmInfo.cpp ) +add_dependencies(LLVMSparcDesc SparcCommonTableGen) diff --git a/lib/Target/SystemZ/CMakeLists.txt b/lib/Target/SystemZ/CMakeLists.txt index f4bdbd8cd1..bd8238ecac 100644 --- a/lib/Target/SystemZ/CMakeLists.txt +++ b/lib/Target/SystemZ/CMakeLists.txt @@ -6,6 +6,7 @@ tablegen(SystemZGenAsmWriter.inc -gen-asm-writer) tablegen(SystemZGenDAGISel.inc -gen-dag-isel) tablegen(SystemZGenCallingConv.inc -gen-callingconv) tablegen(SystemZGenSubtargetInfo.inc -gen-subtarget) +add_public_tablegen_target(SystemZCommonTableGen) add_llvm_target(SystemZCodeGen SystemZAsmPrinter.cpp diff --git a/lib/Target/SystemZ/MCTargetDesc/CMakeLists.txt b/lib/Target/SystemZ/MCTargetDesc/CMakeLists.txt index 2ac9016472..612a94ec92 100644 --- a/lib/Target/SystemZ/MCTargetDesc/CMakeLists.txt +++ b/lib/Target/SystemZ/MCTargetDesc/CMakeLists.txt @@ -2,6 +2,7 @@ add_llvm_library(LLVMSystemZDesc SystemZMCTargetDesc.cpp SystemZMCAsmInfo.cpp ) +add_dependencies(LLVMSystemZDesc SystemZCommonTableGen) # Hack: we need to include 'main' target directory to grab private headers include_directories(${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_BINARY_DIR}/..) diff --git a/lib/Target/X86/AsmParser/CMakeLists.txt b/lib/Target/X86/AsmParser/CMakeLists.txt index 40dbdd72fa..78b16f7cd3 100644 --- a/lib/Target/X86/AsmParser/CMakeLists.txt +++ b/lib/Target/X86/AsmParser/CMakeLists.txt @@ -4,4 +4,4 @@ add_llvm_library(LLVMX86AsmParser X86AsmLexer.cpp X86AsmParser.cpp ) -add_dependencies(LLVMX86AsmParser X86CodeGenTable_gen) +add_dependencies(LLVMX86AsmParser X86CommonTableGen) diff --git a/lib/Target/X86/CMakeLists.txt b/lib/Target/X86/CMakeLists.txt index 480f0c4900..60d3e26ccf 100644 --- a/lib/Target/X86/CMakeLists.txt +++ b/lib/Target/X86/CMakeLists.txt @@ -11,6 +11,7 @@ tablegen(X86GenFastISel.inc -gen-fast-isel) tablegen(X86GenCallingConv.inc -gen-callingconv) tablegen(X86GenSubtargetInfo.inc -gen-subtarget) tablegen(X86GenEDInfo.inc -gen-enhanced-disassembly-info) +add_public_tablegen_target(X86CommonTableGen) set(sources SSEDomainFix.cpp diff --git a/lib/Target/X86/Disassembler/CMakeLists.txt b/lib/Target/X86/Disassembler/CMakeLists.txt index 972a0d9e7e..240f9b5748 100644 --- a/lib/Target/X86/Disassembler/CMakeLists.txt +++ b/lib/Target/X86/Disassembler/CMakeLists.txt @@ -11,4 +11,4 @@ set_property( PROPERTY COMPILE_FLAGS "/Od" ) endif() -add_dependencies(LLVMX86Disassembler X86CodeGenTable_gen) +add_dependencies(LLVMX86Disassembler X86CommonTableGen) diff --git a/lib/Target/X86/InstPrinter/CMakeLists.txt b/lib/Target/X86/InstPrinter/CMakeLists.txt index 033973eeef..3be627a1f0 100644 --- a/lib/Target/X86/InstPrinter/CMakeLists.txt +++ b/lib/Target/X86/InstPrinter/CMakeLists.txt @@ -5,4 +5,4 @@ add_llvm_library(LLVMX86AsmPrinter X86IntelInstPrinter.cpp X86InstComments.cpp ) -add_dependencies(LLVMX86AsmPrinter X86CodeGenTable_gen) +add_dependencies(LLVMX86AsmPrinter X86CommonTableGen) diff --git a/lib/Target/X86/MCTargetDesc/CMakeLists.txt b/lib/Target/X86/MCTargetDesc/CMakeLists.txt index d059aad136..be113711c0 100644 --- a/lib/Target/X86/MCTargetDesc/CMakeLists.txt +++ b/lib/Target/X86/MCTargetDesc/CMakeLists.txt @@ -5,6 +5,7 @@ add_llvm_library(LLVMX86Desc X86MCCodeEmitter.cpp X86MachObjectWriter.cpp ) +add_dependencies(LLVMX86Desc X86CommonTableGen) # Hack: we need to include 'main' target directory to grab private headers include_directories(${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_BINARY_DIR}/..) diff --git a/lib/Target/XCore/CMakeLists.txt b/lib/Target/XCore/CMakeLists.txt index a1d73c6b4f..aa4c45bdf1 100644 --- a/lib/Target/XCore/CMakeLists.txt +++ b/lib/Target/XCore/CMakeLists.txt @@ -6,6 +6,7 @@ tablegen(XCoreGenAsmWriter.inc -gen-asm-writer) tablegen(XCoreGenDAGISel.inc -gen-dag-isel) tablegen(XCoreGenCallingConv.inc -gen-callingconv) tablegen(XCoreGenSubtargetInfo.inc -gen-subtarget) +add_public_tablegen_target(XCoreCommonTableGen) add_llvm_target(XCoreCodeGen XCoreAsmPrinter.cpp diff --git a/lib/Target/XCore/MCTargetDesc/CMakeLists.txt b/lib/Target/XCore/MCTargetDesc/CMakeLists.txt index c3b3dc9e64..4a69922f62 100644 --- a/lib/Target/XCore/MCTargetDesc/CMakeLists.txt +++ b/ |