Revert "CMake: Get rid of LLVMLibDeps.cmake and export the libraries normally."

This reverts commit r113632

Conflicts:

	cmake/modules/AddLLVM.cmake

llvm-svn: 113819

27 files changed, 14 insertions, 135 deletions

diff --git a/llvm/lib/Analysis/CMakeLists.txt b/llvm/lib/Analysis/CMakeLists.txt
index e221c6e25f4..6a2ab681d1a 100644
--- a/llvm/lib/Analysis/CMakeLists.txt
+++ b/llvm/lib/Analysis/CMakeLists.txt
@@ -50,4 +50,4 @@ add_llvm_library(LLVMAnalysis
   ValueTracking.cpp
   )
 
-target_link_libraries(LLVMAnalysis LLVMCore LLVMTarget)
+target_link_libraries (LLVMAnalysis LLVMSupport)
diff --git a/llvm/lib/Analysis/IPA/CMakeLists.txt b/llvm/lib/Analysis/IPA/CMakeLists.txt
index b63a8499c70..007ad228ae5 100644
--- a/llvm/lib/Analysis/IPA/CMakeLists.txt
+++ b/llvm/lib/Analysis/IPA/CMakeLists.txt
@@ -4,5 +4,3 @@ add_llvm_library(LLVMipa
   FindUsedTypes.cpp
   GlobalsModRef.cpp
   )
-
-target_link_libraries(LLVMipa LLVMAnalysis LLVMCore)
diff --git a/llvm/lib/Archive/CMakeLists.txt b/llvm/lib/Archive/CMakeLists.txt
index e5c5fbd4579..7ff478a41a5 100644
--- a/llvm/lib/Archive/CMakeLists.txt
+++ b/llvm/lib/Archive/CMakeLists.txt
@@ -3,5 +3,3 @@ add_llvm_library(LLVMArchive
   ArchiveReader.cpp
   ArchiveWriter.cpp
   )
-
-target_link_libraries(LLVMArchive LLVMBitReader LLVMCore)
diff --git a/llvm/lib/AsmParser/CMakeLists.txt b/llvm/lib/AsmParser/CMakeLists.txt
index 02ea240dde1..985ebe20098 100644
--- a/llvm/lib/AsmParser/CMakeLists.txt
+++ b/llvm/lib/AsmParser/CMakeLists.txt
@@ -4,5 +4,3 @@ add_llvm_library(LLVMAsmParser
   LLParser.cpp
   Parser.cpp
   )
-
-target_link_libraries(LLVMAsmParser LLVMCore)
diff --git a/llvm/lib/Bitcode/Reader/CMakeLists.txt b/llvm/lib/Bitcode/Reader/CMakeLists.txt
index 7601d83f0cc..693d4310b83 100644
--- a/llvm/lib/Bitcode/Reader/CMakeLists.txt
+++ b/llvm/lib/Bitcode/Reader/CMakeLists.txt
@@ -2,5 +2,3 @@ add_llvm_library(LLVMBitReader
   BitReader.cpp
   BitcodeReader.cpp
   )
-
-target_link_libraries(LLVMBitReader LLVMCore)
diff --git a/llvm/lib/CodeGen/AsmPrinter/CMakeLists.txt b/llvm/lib/CodeGen/AsmPrinter/CMakeLists.txt
index ef6e157e86d..ca8b8436c11 100644
--- a/llvm/lib/CodeGen/AsmPrinter/CMakeLists.txt
+++ b/llvm/lib/CodeGen/AsmPrinter/CMakeLists.txt
@@ -8,11 +8,4 @@ add_llvm_library(LLVMAsmPrinter
   OcamlGCPrinter.cpp
   )
 
-target_link_libraries (LLVMAsmPrinter
-  LLVMAnalysis
-  LLVMCodeGen
-  LLVMCore
-  LLVMMC
-  LLVMMCParser
-  LLVMTarget
-  )
+target_link_libraries (LLVMAsmPrinter LLVMMCParser)
diff --git a/llvm/lib/CodeGen/CMakeLists.txt b/llvm/lib/CodeGen/CMakeLists.txt
index 068ad2f1c6c..2ef115dbd20 100644
--- a/llvm/lib/CodeGen/CMakeLists.txt
+++ b/llvm/lib/CodeGen/CMakeLists.txt
@@ -83,11 +83,4 @@ add_llvm_library(LLVMCodeGen
   VirtRegRewriter.cpp
   )
 
-target_link_libraries (LLVMCodeGen
-  LLVMAnalysis
-  LLVMCore
-  LLVMMC
-  LLVMScalarOpts
-  LLVMTarget
-  LLVMTransformUtils
-  )
+target_link_libraries (LLVMCodeGen LLVMCore LLVMScalarOpts)
diff --git a/llvm/lib/CodeGen/SelectionDAG/CMakeLists.txt b/llvm/lib/CodeGen/SelectionDAG/CMakeLists.txt
index ce3259a7f3e..799988a4c86 100644
--- a/llvm/lib/CodeGen/SelectionDAG/CMakeLists.txt
+++ b/llvm/lib/CodeGen/SelectionDAG/CMakeLists.txt
@@ -22,10 +22,4 @@ add_llvm_library(LLVMSelectionDAG
   TargetSelectionDAGInfo.cpp
   )
 
-target_link_libraries(LLVMSelectionDAG
-  LLVMAnalysis
-  LLVMCodeGen
-  LLVMCore
-  LLVMMC
-  LLVMTarget
-  )
+target_link_libraries (LLVMSelectionDAG LLVMAnalysis LLVMAsmPrinter LLVMCodeGen)
diff --git a/llvm/lib/CompilerDriver/CMakeLists.txt b/llvm/lib/CompilerDriver/CMakeLists.txt
index afe6665ddf2..153dd443cbf 100644
--- a/llvm/lib/CompilerDriver/CMakeLists.txt
+++ b/llvm/lib/CompilerDriver/CMakeLists.txt
@@ -1,3 +1,4 @@
+set(LLVM_LINK_COMPONENTS support system)
 set(LLVM_REQUIRES_EH 1)
 
 add_llvm_tool(llvmc
diff --git a/llvm/lib/ExecutionEngine/CMakeLists.txt b/llvm/lib/ExecutionEngine/CMakeLists.txt
index efedd65e78b..0e118ccd904 100644
--- a/llvm/lib/ExecutionEngine/CMakeLists.txt
+++ b/llvm/lib/ExecutionEngine/CMakeLists.txt
@@ -2,5 +2,3 @@ add_llvm_library(LLVMExecutionEngine
   ExecutionEngine.cpp
   ExecutionEngineBindings.cpp
   )
-
-target_link_libraries(LLVMExecutionEngine LLVMCore LLVMTarget)
diff --git a/llvm/lib/ExecutionEngine/Interpreter/CMakeLists.txt b/llvm/lib/ExecutionEngine/Interpreter/CMakeLists.txt
index b517d99eb82..dff97fa26e8 100644
--- a/llvm/lib/ExecutionEngine/Interpreter/CMakeLists.txt
+++ b/llvm/lib/ExecutionEngine/Interpreter/CMakeLists.txt
@@ -3,10 +3,3 @@ add_llvm_library(LLVMInterpreter
   ExternalFunctions.cpp
   Interpreter.cpp
   )
-
-target_link_libraries(LLVMInterpreter
-  LLVMCodeGen
-  LLVMCore
-  LLVMExecutionEngine
-  LLVMTarget
-  )
diff --git a/llvm/lib/ExecutionEngine/JIT/CMakeLists.txt b/llvm/lib/ExecutionEngine/JIT/CMakeLists.txt
index d81b162a4a0..42020d69af0 100644
--- a/llvm/lib/ExecutionEngine/JIT/CMakeLists.txt
+++ b/llvm/lib/ExecutionEngine/JIT/CMakeLists.txt
@@ -11,11 +11,3 @@ add_llvm_library(LLVMJIT
   OProfileJITEventListener.cpp
   TargetSelect.cpp
   )
-
-target_link_libraries(LLVMJIT
-  LLVMCodeGen
-  LLVMCore
-  LLVMExecutionEngine
-  LLVMMC
-  LLVMTarget
-  )
diff --git a/llvm/lib/Linker/CMakeLists.txt b/llvm/lib/Linker/CMakeLists.txt
index 6a8b7676bd6..0b6d2f4218e 100644
--- a/llvm/lib/Linker/CMakeLists.txt
+++ b/llvm/lib/Linker/CMakeLists.txt
@@ -4,10 +4,3 @@ add_llvm_library(LLVMLinker
   LinkModules.cpp
   Linker.cpp
   )
-
-target_link_libraries(LLVMLinker
-  LLVMArchive
-  LLVMBitReader
-  LLVMCore
-  LLVMTransformUtils
-  )
diff --git a/llvm/lib/MC/MCDisassembler/CMakeLists.txt b/llvm/lib/MC/MCDisassembler/CMakeLists.txt
index a01b78e5ac3..5fa7b70194b 100644
--- a/llvm/lib/MC/MCDisassembler/CMakeLists.txt
+++ b/llvm/lib/MC/MCDisassembler/CMakeLists.txt
@@ -1,8 +1,7 @@
+
 add_llvm_library(LLVMMCDisassembler
   EDDisassembler.cpp
   EDOperand.cpp
   EDInst.cpp
   EDToken.cpp
   )
-
-add_llvm_link_components(LLVMMCDisassembler all)
diff --git a/llvm/lib/Target/ARM/AsmParser/CMakeLists.txt b/llvm/lib/Target/ARM/AsmParser/CMakeLists.txt
index 1fa6022a464..9ba7c0125d7 100644
--- a/llvm/lib/Target/ARM/AsmParser/CMakeLists.txt
+++ b/llvm/lib/Target/ARM/AsmParser/CMakeLists.txt
@@ -5,9 +5,3 @@ add_llvm_library(LLVMARMAsmParser
   ARMAsmParser.cpp
   )
 
-target_link_libraries(LLVMARMAsmParser
-  LLVMARMInfo
-  LLVMMC
-  LLVMMCParser
-  LLVMTarget
-  )
diff --git a/llvm/lib/Target/ARM/AsmPrinter/CMakeLists.txt b/llvm/lib/Target/ARM/AsmPrinter/CMakeLists.txt
index da4dd8e6067..18645c0864a 100644
--- a/llvm/lib/Target/ARM/AsmPrinter/CMakeLists.txt
+++ b/llvm/lib/Target/ARM/AsmPrinter/CMakeLists.txt
@@ -3,6 +3,4 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/
 add_llvm_library(LLVMARMAsmPrinter
   ARMInstPrinter.cpp
   )
-
 add_dependencies(LLVMARMAsmPrinter ARMCodeGenTable_gen)
-target_link_libraries(LLVMARMAsmPrinter LLVMMC)
diff --git a/llvm/lib/Target/ARM/CMakeLists.txt b/llvm/lib/Target/ARM/CMakeLists.txt
index 7b0ee2b7e20..c381067b863 100644
--- a/llvm/lib/Target/ARM/CMakeLists.txt
+++ b/llvm/lib/Target/ARM/CMakeLists.txt
@@ -46,13 +46,4 @@ add_llvm_target(ARMCodeGen
   Thumb2SizeReduction.cpp
   )
 
-target_link_libraries (LLVMARMCodeGen
-  LLVMARMInfo
-  LLVMAnalysis
-  LLVMAsmPrinter
-  LLVMCodeGen
-  LLVMCore
-  LLVMMC
-  LLVMSelectionDAG
-  LLVMTarget
-  )
+target_link_libraries (LLVMARMCodeGen LLVMARMAsmPrinter LLVMSelectionDAG)
diff --git a/llvm/lib/Target/CMakeLists.txt b/llvm/lib/Target/CMakeLists.txt
index 242b52f6399..43ebdac528c 100644
--- a/llvm/lib/Target/CMakeLists.txt
+++ b/llvm/lib/Target/CMakeLists.txt
@@ -13,5 +13,3 @@ add_llvm_library(LLVMTarget
   TargetRegisterInfo.cpp
   TargetSubtarget.cpp
   )
-
-target_link_libraries(LLVMTarget LLVMCore LLVMMC)
diff --git a/llvm/lib/Target/X86/AsmParser/CMakeLists.txt b/llvm/lib/Target/X86/AsmParser/CMakeLists.txt
index 897db3a957b..40dbdd72faa 100644
--- a/llvm/lib/Target/X86/AsmParser/CMakeLists.txt
+++ b/llvm/lib/Target/X86/AsmParser/CMakeLists.txt
@@ -4,11 +4,4 @@ add_llvm_library(LLVMX86AsmParser
   X86AsmLexer.cpp
   X86AsmParser.cpp
   )
-
 add_dependencies(LLVMX86AsmParser X86CodeGenTable_gen)
-target_link_libraries(LLVMX86AsmParser
-  LLVMMC
-  LLVMMCParser
-  LLVMTarget
-  LLVMX86Info
-  )
diff --git a/llvm/lib/Target/X86/AsmPrinter/CMakeLists.txt b/llvm/lib/Target/X86/AsmPrinter/CMakeLists.txt
index 71ee884cc36..033973eeeff 100644
--- a/llvm/lib/Target/X86/AsmPrinter/CMakeLists.txt
+++ b/llvm/lib/Target/X86/AsmPrinter/CMakeLists.txt
@@ -5,6 +5,4 @@ add_llvm_library(LLVMX86AsmPrinter
   X86IntelInstPrinter.cpp
   X86InstComments.cpp
   )
-
 add_dependencies(LLVMX86AsmPrinter X86CodeGenTable_gen)
-target_link_libraries(LLVMX86AsmPrinter LLVMMC)
diff --git a/llvm/lib/Target/X86/CMakeLists.txt b/llvm/lib/Target/X86/CMakeLists.txt
index f4e03316446..e9399f5c832 100644
--- a/llvm/lib/Target/X86/CMakeLists.txt
+++ b/llvm/lib/Target/X86/CMakeLists.txt
@@ -29,7 +29,7 @@ set(sources
   X86InstrInfo.cpp
   X86JITInfo.cpp
   X86MCAsmInfo.cpp
-  X86MCCodeEmitter.cpp
+  X86MCCodeEmitter.cpp 
   X86MCInstLower.cpp
   X86RegisterInfo.cpp
   X86SelectionDAGInfo.cpp
@@ -49,14 +49,4 @@ if( CMAKE_CL_64 )
 endif()
 
 add_llvm_target(X86CodeGen ${sources})
-target_link_libraries(LLVMX86CodeGen
-  LLVMAnalysis
-  LLVMAsmPrinter
-  LLVMCodeGen
-  LLVMCore
-  LLVMMC
-  LLVMSelectionDAG
-  LLVMTarget
-  LLVMX86AsmPrinter
-  LLVMX86Info
-  )
+
diff --git a/llvm/lib/Target/X86/Disassembler/CMakeLists.txt b/llvm/lib/Target/X86/Disassembler/CMakeLists.txt
index 91411f3e9fb..97589c00515 100644
--- a/llvm/lib/Target/X86/Disassembler/CMakeLists.txt
+++ b/llvm/lib/Target/X86/Disassembler/CMakeLists.txt
@@ -11,6 +11,4 @@ set_property(
   PROPERTY COMPILE_FLAGS "/Od"
   )
 endif()
-
 add_dependencies(LLVMX86Disassembler X86CodeGenTable_gen)
-target_link_libraries(LLVMX86Disassembler LLVMMC LLVMX86Info)
diff --git a/llvm/lib/Transforms/IPO/CMakeLists.txt b/llvm/lib/Transforms/IPO/CMakeLists.txt
index b07d0947eda..65483e8fed6 100644
--- a/llvm/lib/Transforms/IPO/CMakeLists.txt
+++ b/llvm/lib/Transforms/IPO/CMakeLists.txt
@@ -24,11 +24,4 @@ add_llvm_library(LLVMipo
   StructRetPromotion.cpp
   )
 
-target_link_libraries(LLVMipo
-  LLVMAnalysis
-  LLVMCore
-  LLVMScalarOpts
-  LLVMTarget
-  LLVMTransformUtils
-  LLVMipa
-  )
+target_link_libraries (LLVMipo LLVMScalarOpts LLVMInstCombine)
diff --git a/llvm/lib/Transforms/InstCombine/CMakeLists.txt b/llvm/lib/Transforms/InstCombine/CMakeLists.txt
index 4330377850a..5b1ff3e23bb 100644
--- a/llvm/lib/Transforms/InstCombine/CMakeLists.txt
+++ b/llvm/lib/Transforms/InstCombine/CMakeLists.txt
@@ -9,14 +9,9 @@ add_llvm_library(LLVMInstCombine
   InstCombineMulDivRem.cpp
   InstCombinePHI.cpp
   InstCombineSelect.cpp
-  InstCombineShifts.cpp
+  InstCombineShifts.cpp 
   InstCombineSimplifyDemanded.cpp
   InstCombineVectorOps.cpp
   )
 
-target_link_libraries(LLVMInstCombine
-  LLVMAnalysis
-  LLVMCore
-  LLVMTarget
-  LLVMTransformUtils
-  )
+target_link_libraries (LLVMInstCombine LLVMTransformUtils)
diff --git a/llvm/lib/Transforms/Instrumentation/CMakeLists.txt b/llvm/lib/Transforms/Instrumentation/CMakeLists.txt
index f5ad9c69611..128bf489787 100644
--- a/llvm/lib/Transforms/Instrumentation/CMakeLists.txt
+++ b/llvm/lib/Transforms/Instrumentation/CMakeLists.txt
@@ -3,9 +3,3 @@ add_llvm_library(LLVMInstrumentation
   OptimalEdgeProfiling.cpp
   ProfilingUtils.cpp
   )
-
-target_link_libraries(LLVMInstrumentation
-  LLVMAnalysis
-  LLVMCore
-  LLVMTransformUtils
-  )
diff --git a/llvm/lib/Transforms/Scalar/CMakeLists.txt b/llvm/lib/Transforms/Scalar/CMakeLists.txt
index 05825e79939..b7598eace53 100644
--- a/llvm/lib/Transforms/Scalar/CMakeLists.txt
+++ b/llvm/lib/Transforms/Scalar/CMakeLists.txt
@@ -32,10 +32,4 @@ add_llvm_library(LLVMScalarOpts
   TailRecursionElimination.cpp
   )
 
-target_link_libraries (LLVMScalarOpts
-  LLVMAnalysis
-  LLVMCore
-  LLVMInstCombine
-  LLVMTarget
-  LLVMTransformUtils
-  )
+target_link_libraries (LLVMScalarOpts LLVMTransformUtils)
diff --git a/llvm/lib/Transforms/Utils/CMakeLists.txt b/llvm/lib/Transforms/Utils/CMakeLists.txt
index f10a72710e1..61cbeb2bd35 100644
--- a/llvm/lib/Transforms/Utils/CMakeLists.txt
+++ b/llvm/lib/Transforms/Utils/CMakeLists.txt
@@ -25,9 +25,4 @@ add_llvm_library(LLVMTransformUtils
   ValueMapper.cpp
   )
 
-target_link_libraries(LLVMTransformUtils
-  LLVMAnalysis
-  LLVMCore
-  LLVMTarget
-  LLVMipa
-  )
+target_link_libraries (LLVMTransformUtils LLVMSupport)