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. llvm-svn: 144444
2024-12-11 13:37:07 +00:00 · 2011-11-12 02:10:57 +00:00 · 2011-11-12 02:10:57 +00:00 · 73d41b0f03
commit 73d41b0f03
parent a83fbaff5f
31 changed files with 31 additions and 42 deletions
--- 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
  )
--- 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

--- 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

--- 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)
--- 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

--- 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

--- 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
  )
--- 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

--- 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

--- 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

--- 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

--- 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
  )
--- 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

--- 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
--- 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

--- 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)
--- 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

--- 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

--- 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

--- 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)
--- 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

--- 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
  )

--- 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

--- 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

--- 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

--- 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)
--- 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
  )

--- 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

--- 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

--- 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

--- 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