build: Attempt to rectify inconsistencies between CMake and LLVMBuild versions of...

 - 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

diff --git a/lib/ExecutionEngine/JIT/CMakeLists.txt b/lib/ExecutionEngine/JIT/CMakeLists.txt
index 92aa76a5cf5e9975db091ef72c5d5fc8f4aad597..813ccced9a2c5fefd064f5f9f4ff7731023a7873 100644 (file)
--- 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 b97471340ab59ffae31b53a92a81e9c425b4eef7..21cb300f2fcbbcb9996f7586e9b6f30f9d9781a2 100644 (file)
--- 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 acc8dff6a6806c917d90dc25ad5876966fba043a..8ad66b61973aa331fa08cd3a9d77da8c3f1eb717 100644 (file)
--- 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 4debb288e5abf9ac1dec09b8079b4e104177d939..5cf5f1b3d56fa142e721db57c2a7ceac7fcb67a6 100644 (file)
--- 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 44c008318c3bee0d34d19918da4a7b8df749f9e7..20fbb85f20b249c2112c57f945d8f123c2ba5755 100644 (file)
--- 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 dff57b4d708141af8177b3eb317eeeb73904c17d..baa9bc3cab0070a26ecc08af5cb9a666166abf8d 100644 (file)
--- 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 adc37cbf582e5dd579ad5933cf8ed741ccb69383..f5293140e8665eae85aadddaf085a0ed414e69b7 100644 (file)
--- 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 7d7504f57cd286dee51de0913ca5f5be883b03ef..046c1fce328cc1e9be15e08e0ba2621642f951c2 100644 (file)
--- 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 943fe2d2a2796bdbea3e3c32a4ad2dfaf2c68a04..35752b77dc1caa04cad01a6a27d84609a5e36dc6 100644 (file)
--- 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 b5147aef98949e1df8949047177e3777182ca8f0..abc44a29d6dac1b22994ad552575c84e615bc776 100644 (file)
--- 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 7525359d32330850e5a68a76e13df7c91d1934e0..0710cc3ba7dc335de84dd2a8db2f15cf716efdf6 100644 (file)
--- 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 7165d8fdf2cd98c44474ed8b61838bb664a0f488..738b21559ee25eb28cc5999e2e01223df534f108 100644 (file)
--- 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 b130fee6347b8dad65352b44b01bde557201769e..67a23ba55f89e80ab2e5dbbdc5f218f99ad78729 100644 (file)
--- 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 112c64c026381eadac9a06643af62b6271730e5a..e0a53ee5174ece59272a9700edf95dd448516079 100644 (file)
--- 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 488c2c74ac5dd2b2b3482499b35796af63a162a8..938a1d90f9039638f105582f6f18dbd1328d17a0 100644 (file)
--- 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 04bd03e494604cf71c209e4b41f2f33fc440dd7f..c2dd448be944467621eaf1ee3a5476aa7554bfe2 100644 (file)
--- 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 5d410823870cb2d939dd05a12f57c5e336b13dc8..1890e9d5d2e4ea1bf3ba461943fa5d936ba61d02 100644 (file)
--- 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 3bcc826dda2b7903fb950b83c91abc58933f284c..a745ea8006148ad256db2bbecc05c1e13b13ba11 100644 (file)
--- 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 e8035af486c12388cffebc583472b2ea1d5a8480..90ae26014c509c923730c14df89f94b19f7b24a6 100644 (file)
--- 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 46a458ce23b01d78bac6d49e25d97c1f75c3c3ee..6709c1bd850f3825e535aecf98f655d1ce6601e0 100644 (file)
--- 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 27807e6930a18274d2cc87d9d8595a9db0ffcce6..22c70dec0e05434f98a7870e44989c0b88c4977f 100644 (file)
--- 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 811ef4bd1fcf7a50060d5a5ad26817389b5889ef..94dbcee0509ac40f9fdb2cd6ddf2876f250282e0 100644 (file)
--- 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 f35c237b12ac442b1516419c367465af678ac047..8e5285a6dc3aae1032a84194abb2863cd0dd94de 100644 (file)
--- 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 1f5d3e7083dacf2581f3629b9b71b53199b71a40..f51b417d523692beea87d1603e73ef5597e1b170 100644 (file)
--- 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 22f4e1f4f7601e1eab59dd420fcf9418e8ef9e33..81c9032fc9b14e8ccb1c4262c8de73f1a0a3bb86 100644 (file)
--- 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 b5901992f6308faabf9c8cddcfdd630abdc96ace..4542d4bfca689b670df2279bf38f35a32d325a7d 100644 (file)
--- 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 87219120e2a82b8d33fb1edbb81443cfa3ddb86c..264e7912f83f3bbcc5413eee34f95baa5f0755a2 100644 (file)
--- 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 6b2635b685357e1e886c17c7f9ff7d892d4a1999..ee015bd92d93055f8c23b925faa68389568fc197 100644 (file)
--- 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 7f4a433828534fdd82577a6ffa1960a08e7e3248..628afb50ed3426603f5f459ec70c1336a196917e 100644 (file)
--- 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 1d1b722cfa45dde8193c31d95f8ff3a1514f211c..d0b8e5446edc623d0c9a3ac07d8daded05ebc17a 100644 (file)
--- 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 4d8dbc2189a67e9c15ad1d037ecf5799fb6ac402..8fa66fc2ae9253660bc0906e49ef44f72df56d60 100644 (file)
--- 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