diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2011-11-12 02:10:57 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2011-11-12 02:10:57 +0000 |
| commit | b8ebca83f4dff04ba21cc97673003f0bd35a2e49 (patch) | |
| tree | bbd5da231b9ff4baa53da5bc6f5e5ad15496378f /lib | |
| parent | 75f69e3a3dff78cb89ded1d6c96ccb65603a82d9 (diff) | |
| download | external_llvm-b8ebca83f4dff04ba21cc97673003f0bd35a2e49.zip external_llvm-b8ebca83f4dff04ba21cc97673003f0bd35a2e49.tar.gz external_llvm-b8ebca83f4dff04ba21cc97673003f0bd35a2e49.tar.bz2 | |
build: Attempt to rectify inconsistencies between CMake and LLVMBuild versions of explicit dependencies.
- The hope is that we have a tool/test to verify these are accurate (and tight) soon.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@144444 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
31 files changed, 31 insertions, 42 deletions
diff --git a/lib/ExecutionEngine/JIT/CMakeLists.txt b/lib/ExecutionEngine/JIT/CMakeLists.txt index 92aa76a..813ccce 100644 --- a/lib/ExecutionEngine/JIT/CMakeLists.txt +++ b/lib/ExecutionEngine/JIT/CMakeLists.txt @@ -12,10 +12,11 @@ add_llvm_library(LLVMJIT ) add_llvm_library_dependencies(LLVMJIT + LLVMCodeGen LLVMCore LLVMExecutionEngine + LLVMMC LLVMRuntimeDyld LLVMSupport LLVMTarget - LLVMCodeGen ) diff --git a/lib/ExecutionEngine/JIT/LLVMBuild.txt b/lib/ExecutionEngine/JIT/LLVMBuild.txt index b974713..21cb300 100644 --- a/lib/ExecutionEngine/JIT/LLVMBuild.txt +++ b/lib/ExecutionEngine/JIT/LLVMBuild.txt @@ -19,5 +19,5 @@ type = Library name = JIT parent = ExecutionEngine -required_libraries = CodeGen Core ExecutionEngine MC Support Target +required_libraries = CodeGen Core ExecutionEngine MC RuntimeDyld Support Target diff --git a/lib/MC/LLVMBuild.txt b/lib/MC/LLVMBuild.txt index acc8dff..8ad66b6 100644 --- a/lib/MC/LLVMBuild.txt +++ b/lib/MC/LLVMBuild.txt @@ -19,5 +19,5 @@ type = Library name = MC parent = Libraries -required_libraries = Support +required_libraries = Object Support diff --git a/lib/MC/MCDisassembler/CMakeLists.txt b/lib/MC/MCDisassembler/CMakeLists.txt index 4debb28..5cf5f1b 100644 --- a/lib/MC/MCDisassembler/CMakeLists.txt +++ b/lib/MC/MCDisassembler/CMakeLists.txt @@ -10,21 +10,4 @@ add_llvm_library_dependencies(LLVMMCDisassembler LLVMMC LLVMMCParser LLVMSupport - LLVMTarget ) - -foreach(t ${LLVM_TARGETS_TO_BUILD}) - set(td ${LLVM_MAIN_SRC_DIR}/lib/Target/${t}) - if(EXISTS ${td}/TargetInfo/CMakeLists.txt) - add_llvm_library_dependencies(LLVMMCDisassembler "LLVM${t}Info") - endif() - if(EXISTS ${td}/MCTargetDesc/CMakeLists.txt) - add_llvm_library_dependencies(LLVMMCDisassembler "LLVM${t}Desc") - endif() - if(EXISTS ${td}/AsmParser/CMakeLists.txt) - add_llvm_library_dependencies(LLVMMCDisassembler "LLVM${t}AsmParser") - endif() - if(EXISTS ${td}/Disassembler/CMakeLists.txt) - add_llvm_library_dependencies(LLVMMCDisassembler "LLVM${t}Disassembler") - endif() -endforeach(t) diff --git a/lib/Object/LLVMBuild.txt b/lib/Object/LLVMBuild.txt index 44c0083..20fbb85 100644 --- a/lib/Object/LLVMBuild.txt +++ b/lib/Object/LLVMBuild.txt @@ -19,5 +19,5 @@ type = Library name = Object parent = Libraries -required_libraries = Support +required_libraries = Core Support diff --git a/lib/Target/ARM/Disassembler/LLVMBuild.txt b/lib/Target/ARM/Disassembler/LLVMBuild.txt index dff57b4..baa9bc3 100644 --- a/lib/Target/ARM/Disassembler/LLVMBuild.txt +++ b/lib/Target/ARM/Disassembler/LLVMBuild.txt @@ -19,6 +19,6 @@ type = Library name = ARMDisassembler parent = ARM -required_libraries = ARMDesc ARMInfo MC Support +required_libraries = ARMCodeGen ARMDesc ARMInfo MC Support add_to_library_groups = ARM diff --git a/lib/Target/ARM/MCTargetDesc/CMakeLists.txt b/lib/Target/ARM/MCTargetDesc/CMakeLists.txt index adc37cb..f529314 100644 --- a/lib/Target/ARM/MCTargetDesc/CMakeLists.txt +++ b/lib/Target/ARM/MCTargetDesc/CMakeLists.txt @@ -12,8 +12,8 @@ add_dependencies(LLVMARMDesc ARMCommonTableGen) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_BINARY_DIR}/..) add_llvm_library_dependencies(LLVMARMDesc - LLVMARMInfo LLVMARMAsmPrinter + LLVMARMInfo LLVMMC LLVMSupport ) diff --git a/lib/Target/ARM/TargetInfo/LLVMBuild.txt b/lib/Target/ARM/TargetInfo/LLVMBuild.txt index 7d7504f..046c1fc 100644 --- a/lib/Target/ARM/TargetInfo/LLVMBuild.txt +++ b/lib/Target/ARM/TargetInfo/LLVMBuild.txt @@ -19,6 +19,6 @@ type = Library name = ARMInfo parent = ARM -required_libraries = MC Support +required_libraries = MC Support Target add_to_library_groups = ARM diff --git a/lib/Target/CBackend/TargetInfo/LLVMBuild.txt b/lib/Target/CBackend/TargetInfo/LLVMBuild.txt index 943fe2d..35752b7 100644 --- a/lib/Target/CBackend/TargetInfo/LLVMBuild.txt +++ b/lib/Target/CBackend/TargetInfo/LLVMBuild.txt @@ -19,6 +19,6 @@ type = Library name = CBackendInfo parent = CBackend -required_libraries = MC Support +required_libraries = MC Support Target add_to_library_groups = CBackend diff --git a/lib/Target/CellSPU/MCTargetDesc/LLVMBuild.txt b/lib/Target/CellSPU/MCTargetDesc/LLVMBuild.txt index b5147ae..abc44a2 100644 --- a/lib/Target/CellSPU/MCTargetDesc/LLVMBuild.txt +++ b/lib/Target/CellSPU/MCTargetDesc/LLVMBuild.txt @@ -19,6 +19,6 @@ type = Library name = CellSPUDesc parent = CellSPU -required_libraries = CellSPUInfo MC Support +required_libraries = CellSPUInfo MC add_to_library_groups = CellSPU diff --git a/lib/Target/CellSPU/TargetInfo/LLVMBuild.txt b/lib/Target/CellSPU/TargetInfo/LLVMBuild.txt index 7525359..0710cc3 100644 --- a/lib/Target/CellSPU/TargetInfo/LLVMBuild.txt +++ b/lib/Target/CellSPU/TargetInfo/LLVMBuild.txt @@ -19,6 +19,6 @@ type = Library name = CellSPUInfo parent = CellSPU -required_libraries = MC Support +required_libraries = MC Support Target add_to_library_groups = CellSPU diff --git a/lib/Target/CppBackend/TargetInfo/CMakeLists.txt b/lib/Target/CppBackend/TargetInfo/CMakeLists.txt index 7165d8f..738b215 100644 --- a/lib/Target/CppBackend/TargetInfo/CMakeLists.txt +++ b/lib/Target/CppBackend/TargetInfo/CMakeLists.txt @@ -6,5 +6,6 @@ add_llvm_library(LLVMCppBackendInfo add_llvm_library_dependencies(LLVMCppBackendInfo LLVMMC + LLVMSupport LLVMTarget ) diff --git a/lib/Target/CppBackend/TargetInfo/LLVMBuild.txt b/lib/Target/CppBackend/TargetInfo/LLVMBuild.txt index b130fee..67a23ba 100644 --- a/lib/Target/CppBackend/TargetInfo/LLVMBuild.txt +++ b/lib/Target/CppBackend/TargetInfo/LLVMBuild.txt @@ -19,6 +19,6 @@ type = Library name = CppBackendInfo parent = CppBackend -required_libraries = MC Support +required_libraries = MC Support Target add_to_library_groups = CppBackend diff --git a/lib/Target/MBlaze/Disassembler/CMakeLists.txt b/lib/Target/MBlaze/Disassembler/CMakeLists.txt index 112c64c..e0a53ee 100644 --- a/lib/Target/MBlaze/Disassembler/CMakeLists.txt +++ b/lib/Target/MBlaze/Disassembler/CMakeLists.txt @@ -14,7 +14,6 @@ set_property( endif() add_llvm_library_dependencies(LLVMMBlazeDisassembler - LLVMMBlazeCodeGen LLVMMBlazeDesc LLVMMBlazeInfo LLVMMC diff --git a/lib/Target/MBlaze/TargetInfo/LLVMBuild.txt b/lib/Target/MBlaze/TargetInfo/LLVMBuild.txt index 488c2c7..938a1d9 100644 --- a/lib/Target/MBlaze/TargetInfo/LLVMBuild.txt +++ b/lib/Target/MBlaze/TargetInfo/LLVMBuild.txt @@ -19,6 +19,6 @@ type = Library name = MBlazeInfo parent = MBlaze -required_libraries = MC Support +required_libraries = MC Support Target add_to_library_groups = MBlaze diff --git a/lib/Target/MSP430/MCTargetDesc/CMakeLists.txt b/lib/Target/MSP430/MCTargetDesc/CMakeLists.txt index 04bd03e..c2dd448 100644 --- a/lib/Target/MSP430/MCTargetDesc/CMakeLists.txt +++ b/lib/Target/MSP430/MCTargetDesc/CMakeLists.txt @@ -7,6 +7,8 @@ add_llvm_library_dependencies(LLVMMSP430Desc LLVMMC LLVMMSP430AsmPrinter LLVMMSP430Info + LLVMSupport + LLVMTarget ) add_dependencies(LLVMMSP430Desc MSP430CommonTableGen) diff --git a/lib/Target/MSP430/MCTargetDesc/LLVMBuild.txt b/lib/Target/MSP430/MCTargetDesc/LLVMBuild.txt index 5d41082..1890e9d 100644 --- a/lib/Target/MSP430/MCTargetDesc/LLVMBuild.txt +++ b/lib/Target/MSP430/MCTargetDesc/LLVMBuild.txt @@ -19,6 +19,6 @@ type = Library name = MSP430Desc parent = MSP430 -required_libraries = MC MSP430AsmPrinter MSP430Info Support +required_libraries = MC MSP430AsmPrinter MSP430Info Support Target add_to_library_groups = MSP430 diff --git a/lib/Target/MSP430/TargetInfo/LLVMBuild.txt b/lib/Target/MSP430/TargetInfo/LLVMBuild.txt index 3bcc826..a745ea8 100644 --- a/lib/Target/MSP430/TargetInfo/LLVMBuild.txt +++ b/lib/Target/MSP430/TargetInfo/LLVMBuild.txt @@ -19,6 +19,6 @@ type = Library name = MSP430Info parent = MSP430 -required_libraries = MC Support +required_libraries = MC Support Target add_to_library_groups = MSP430 diff --git a/lib/Target/Mips/TargetInfo/LLVMBuild.txt b/lib/Target/Mips/TargetInfo/LLVMBuild.txt index e8035af..90ae260 100644 --- a/lib/Target/Mips/TargetInfo/LLVMBuild.txt +++ b/lib/Target/Mips/TargetInfo/LLVMBuild.txt @@ -19,6 +19,6 @@ type = Library name = MipsInfo parent = Mips -required_libraries = MC Support +required_libraries = MC Support Target add_to_library_groups = Mips diff --git a/lib/Target/PTX/CMakeLists.txt b/lib/Target/PTX/CMakeLists.txt index 46a458c..6709c1b 100644 --- a/lib/Target/PTX/CMakeLists.txt +++ b/lib/Target/PTX/CMakeLists.txt @@ -36,6 +36,7 @@ add_llvm_library_dependencies(LLVMPTXCodeGen LLVMSelectionDAG LLVMSupport LLVMTarget + LLVMTransformUtils ) add_subdirectory(TargetInfo) diff --git a/lib/Target/PTX/LLVMBuild.txt b/lib/Target/PTX/LLVMBuild.txt index 27807e6..22c70de 100644 --- a/lib/Target/PTX/LLVMBuild.txt +++ b/lib/Target/PTX/LLVMBuild.txt @@ -25,6 +25,6 @@ has_asmprinter = 1 type = Library name = PTXCodeGen parent = PTX -required_libraries = Analysis AsmPrinter CodeGen Core MC PTXDesc PTXInfo Scalar SelectionDAG Support Target TransformUtils +required_libraries = Analysis AsmPrinter CodeGen Core MC PTXDesc PTXInfo SelectionDAG Support Target TransformUtils add_to_library_groups = PTX diff --git a/lib/Target/PTX/MCTargetDesc/CMakeLists.txt b/lib/Target/PTX/MCTargetDesc/CMakeLists.txt index 811ef4b..94dbcee 100644 --- a/lib/Target/PTX/MCTargetDesc/CMakeLists.txt +++ b/lib/Target/PTX/MCTargetDesc/CMakeLists.txt @@ -5,8 +5,8 @@ add_llvm_library(LLVMPTXDesc add_llvm_library_dependencies(LLVMPTXDesc LLVMMC - LLVMPTXInfo LLVMPTXAsmPrinter + LLVMPTXInfo LLVMSupport ) diff --git a/lib/Target/PTX/TargetInfo/LLVMBuild.txt b/lib/Target/PTX/TargetInfo/LLVMBuild.txt index f35c237..8e5285a 100644 --- a/lib/Target/PTX/TargetInfo/LLVMBuild.txt +++ b/lib/Target/PTX/TargetInfo/LLVMBuild.txt @@ -19,6 +19,6 @@ type = Library name = PTXInfo parent = PTX -required_libraries = MC Support +required_libraries = MC Support Target add_to_library_groups = PTX diff --git a/lib/Target/PowerPC/TargetInfo/LLVMBuild.txt b/lib/Target/PowerPC/TargetInfo/LLVMBuild.txt index 1f5d3e7..f51b417 100644 --- a/lib/Target/PowerPC/TargetInfo/LLVMBuild.txt +++ b/lib/Target/PowerPC/TargetInfo/LLVMBuild.txt @@ -19,6 +19,6 @@ type = Library name = PowerPCInfo parent = PowerPC -required_libraries = MC Support +required_libraries = MC Support Target add_to_library_groups = PowerPC diff --git a/lib/Target/Sparc/TargetInfo/LLVMBuild.txt b/lib/Target/Sparc/TargetInfo/LLVMBuild.txt index 22f4e1f..81c9032 100644 --- a/lib/Target/Sparc/TargetInfo/LLVMBuild.txt +++ b/lib/Target/Sparc/TargetInfo/LLVMBuild.txt @@ -19,6 +19,6 @@ type = Library name = SparcInfo parent = Sparc -required_libraries = MC Support +required_libraries = MC Support Target add_to_library_groups = Sparc diff --git a/lib/Target/X86/CMakeLists.txt b/lib/Target/X86/CMakeLists.txt index b590199..4542d4b 100644 --- a/lib/Target/X86/CMakeLists.txt +++ b/lib/Target/X86/CMakeLists.txt @@ -62,6 +62,8 @@ add_llvm_library_dependencies(LLVMX86CodeGen LLVMTarget LLVMX86AsmPrinter LLVMX86Desc + LLVMX86Info + LLVMX86Utils ) add_subdirectory(AsmParser) diff --git a/lib/Target/X86/MCTargetDesc/CMakeLists.txt b/lib/Target/X86/MCTargetDesc/CMakeLists.txt index 8721912..264e791 100644 --- a/lib/Target/X86/MCTargetDesc/CMakeLists.txt +++ b/lib/Target/X86/MCTargetDesc/CMakeLists.txt @@ -10,7 +10,6 @@ add_llvm_library_dependencies(LLVMX86Desc LLVMMC LLVMSupport LLVMX86AsmPrinter - LLVMX86AsmPrinter LLVMX86Info ) diff --git a/lib/Target/X86/TargetInfo/LLVMBuild.txt b/lib/Target/X86/TargetInfo/LLVMBuild.txt index 6b2635b..ee015bd 100644 --- a/lib/Target/X86/TargetInfo/LLVMBuild.txt +++ b/lib/Target/X86/TargetInfo/LLVMBuild.txt @@ -19,6 +19,6 @@ type = Library name = X86Info parent = X86 -required_libraries = MC Support +required_libraries = MC Support Target add_to_library_groups = X86 diff --git a/lib/Target/XCore/MCTargetDesc/LLVMBuild.txt b/lib/Target/XCore/MCTargetDesc/LLVMBuild.txt index 7f4a433..628afb5 100644 --- a/lib/Target/XCore/MCTargetDesc/LLVMBuild.txt +++ b/lib/Target/XCore/MCTargetDesc/LLVMBuild.txt @@ -19,6 +19,6 @@ type = Library name = XCoreDesc parent = XCore -required_libraries = MC Support XCoreInfo +required_libraries = MC XCoreInfo add_to_library_groups = XCore diff --git a/lib/Target/XCore/TargetInfo/LLVMBuild.txt b/lib/Target/XCore/TargetInfo/LLVMBuild.txt index 1d1b722..d0b8e54 100644 --- a/lib/Target/XCore/TargetInfo/LLVMBuild.txt +++ b/lib/Target/XCore/TargetInfo/LLVMBuild.txt @@ -19,6 +19,6 @@ type = Library name = XCoreInfo parent = XCore -required_libraries = MC Support +required_libraries = MC Support Target add_to_library_groups = XCore diff --git a/lib/Transforms/IPO/CMakeLists.txt b/lib/Transforms/IPO/CMakeLists.txt index 4d8dbc2..8fa66fc 100644 --- a/lib/Transforms/IPO/CMakeLists.txt +++ b/lib/Transforms/IPO/CMakeLists.txt @@ -24,6 +24,7 @@ add_llvm_library(LLVMipo add_llvm_library_dependencies(LLVMipo LLVMAnalysis LLVMCore + LLVMInstCombine LLVMScalarOpts LLVMSupport LLVMTarget |