[CMake] Update LLVM_LINK_COMPONENTS for each CMakeLists.txt.

llvm-svn: 196908

26 files changed, 163 insertions, 27 deletions

diff --git a/llvm/tools/bugpoint/CMakeLists.txt b/llvm/tools/bugpoint/CMakeLists.txt
index 0000d977acf..7e7ad0e94cf 100644
--- a/llvm/tools/bugpoint/CMakeLists.txt
+++ b/llvm/tools/bugpoint/CMakeLists.txt
@@ -1,5 +1,20 @@
-set(LLVM_LINK_COMPONENTS asmparser instrumentation scalaropts ipo
-  linker bitreader bitwriter irreader vectorize objcarcopts)
+set(LLVM_LINK_COMPONENTS
+  Analysis
+  BitWriter
+  Core
+  IPA
+  IPO
+  IRReader
+  InstCombine
+  Instrumentation
+  Linker
+  ObjCARCOpts
+  ScalarOpts
+  Support
+  Target
+  TransformUtils
+  Vectorize
+  )
 
 add_llvm_tool(bugpoint
   BugDriver.cpp
diff --git a/llvm/tools/llc/CMakeLists.txt b/llvm/tools/llc/CMakeLists.txt
index 97c762b7f6f..9a3d411a283 100644
--- a/llvm/tools/llc/CMakeLists.txt
+++ b/llvm/tools/llc/CMakeLists.txt
@@ -1,4 +1,15 @@
-set(LLVM_LINK_COMPONENTS ${LLVM_TARGETS_TO_BUILD} bitreader asmparser irreader)
+set(LLVM_LINK_COMPONENTS
+  ${LLVM_TARGETS_TO_BUILD}
+  AsmPrinter
+  CodeGen
+  Core
+  IRReader
+  MC
+  ScalarOpts
+  SelectionDAG
+  Support
+  Target
+  )
 
 add_llvm_tool(llc
   llc.cpp
diff --git a/llvm/tools/lli/CMakeLists.txt b/llvm/tools/lli/CMakeLists.txt
index 841a0ce42f8..731b61a11b4 100644
--- a/llvm/tools/lli/CMakeLists.txt
+++ b/llvm/tools/lli/CMakeLists.txt
@@ -1,6 +1,18 @@
 add_subdirectory(ChildTarget)
 
-set(LLVM_LINK_COMPONENTS mcjit jit interpreter nativecodegen bitreader asmparser irreader selectiondag native instrumentation)
+set(LLVM_LINK_COMPONENTS
+  CodeGen
+  Core
+  ExecutionEngine
+  IRReader
+  Instrumentation
+  Interpreter
+  JIT
+  MCJIT
+  SelectionDAG
+  Support
+  native
+  )
 
 if( LLVM_USE_OPROFILE )
   set(LLVM_LINK_COMPONENTS
diff --git a/llvm/tools/llvm-ar/CMakeLists.txt b/llvm/tools/llvm-ar/CMakeLists.txt
index f15a1e2a869..857cf2d0713 100644
--- a/llvm/tools/llvm-ar/CMakeLists.txt
+++ b/llvm/tools/llvm-ar/CMakeLists.txt
@@ -1,4 +1,7 @@
-set(LLVM_LINK_COMPONENTS support object bitreader)
+set(LLVM_LINK_COMPONENTS
+  Object
+  Support
+  )
 
 add_llvm_tool(llvm-ar
   llvm-ar.cpp
diff --git a/llvm/tools/llvm-as/CMakeLists.txt b/llvm/tools/llvm-as/CMakeLists.txt
index d5620e72971..1b2789a4de4 100644
--- a/llvm/tools/llvm-as/CMakeLists.txt
+++ b/llvm/tools/llvm-as/CMakeLists.txt
@@ -1,4 +1,9 @@
-set(LLVM_LINK_COMPONENTS asmparser bitwriter)
+set(LLVM_LINK_COMPONENTS
+  AsmParser
+  BitWriter
+  Core
+  Support
+  )
 
 add_llvm_tool(llvm-as
   llvm-as.cpp
diff --git a/llvm/tools/llvm-bcanalyzer/CMakeLists.txt b/llvm/tools/llvm-bcanalyzer/CMakeLists.txt
index 0151ea9b4f6..369f469af85 100644
--- a/llvm/tools/llvm-bcanalyzer/CMakeLists.txt
+++ b/llvm/tools/llvm-bcanalyzer/CMakeLists.txt
@@ -1,4 +1,7 @@
-set(LLVM_LINK_COMPONENTS bitreader)
+set(LLVM_LINK_COMPONENTS
+  BitReader
+  Support
+  )
 
 add_llvm_tool(llvm-bcanalyzer
   llvm-bcanalyzer.cpp
diff --git a/llvm/tools/llvm-c-test/CMakeLists.txt b/llvm/tools/llvm-c-test/CMakeLists.txt
index 2926d9dd345..13a072ae331 100644
--- a/llvm/tools/llvm-c-test/CMakeLists.txt
+++ b/llvm/tools/llvm-c-test/CMakeLists.txt
@@ -1,4 +1,11 @@
-set(LLVM_LINK_COMPONENTS all)
+set(LLVM_LINK_COMPONENTS
+  ${LLVM_TARGETS_TO_BUILD}
+  BitReader
+  Core
+  MCDisassembler
+  Object
+  Target
+  )
 
 if (LLVM_COMPILER_IS_GCC_COMPATIBLE)
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wstrict-prototypes")
diff --git a/llvm/tools/llvm-diff/CMakeLists.txt b/llvm/tools/llvm-diff/CMakeLists.txt
index 0df8b9ed79e..4407a86c151 100644
--- a/llvm/tools/llvm-diff/CMakeLists.txt
+++ b/llvm/tools/llvm-diff/CMakeLists.txt
@@ -1,4 +1,8 @@
-set(LLVM_LINK_COMPONENTS support asmparser bitreader irreader)
+set(LLVM_LINK_COMPONENTS
+  Core
+  IRReader
+  Support
+  )
 
 add_llvm_tool(llvm-diff
   llvm-diff.cpp
diff --git a/llvm/tools/llvm-dis/CMakeLists.txt b/llvm/tools/llvm-dis/CMakeLists.txt
index 9f12ecb6664..06ac051602e 100644
--- a/llvm/tools/llvm-dis/CMakeLists.txt
+++ b/llvm/tools/llvm-dis/CMakeLists.txt
@@ -1,4 +1,8 @@
-set(LLVM_LINK_COMPONENTS bitreader analysis)
+set(LLVM_LINK_COMPONENTS
+  BitReader
+  Core
+  Support
+  )
 
 add_llvm_tool(llvm-dis
   llvm-dis.cpp
diff --git a/llvm/tools/llvm-dwarfdump/CMakeLists.txt b/llvm/tools/llvm-dwarfdump/CMakeLists.txt
index 05aad3f0b05..288b3237010 100644
--- a/llvm/tools/llvm-dwarfdump/CMakeLists.txt
+++ b/llvm/tools/llvm-dwarfdump/CMakeLists.txt
@@ -1,6 +1,7 @@
 set(LLVM_LINK_COMPONENTS
   DebugInfo
   Object
+  Support
   )
 
 add_llvm_tool(llvm-dwarfdump
diff --git a/llvm/tools/llvm-extract/CMakeLists.txt b/llvm/tools/llvm-extract/CMakeLists.txt
index 3163c4bbbdd..c984f01034f 100644
--- a/llvm/tools/llvm-extract/CMakeLists.txt
+++ b/llvm/tools/llvm-extract/CMakeLists.txt
@@ -1,4 +1,10 @@
-set(LLVM_LINK_COMPONENTS asmparser ipo bitreader bitwriter irreader)
+set(LLVM_LINK_COMPONENTS
+  BitWriter
+  Core
+  IPO
+  IRReader
+  Support
+  )
 
 add_llvm_tool(llvm-extract
   llvm-extract.cpp
diff --git a/llvm/tools/llvm-link/CMakeLists.txt b/llvm/tools/llvm-link/CMakeLists.txt
index 4df53564e18..d4f5be74904 100644
--- a/llvm/tools/llvm-link/CMakeLists.txt
+++ b/llvm/tools/llvm-link/CMakeLists.txt
@@ -1,4 +1,10 @@
-set(LLVM_LINK_COMPONENTS linker bitreader bitwriter asmparser irreader)
+set(LLVM_LINK_COMPONENTS
+  BitWriter
+  Core
+  IRReader
+  Linker
+  Support
+  )
 
 add_llvm_tool(llvm-link
   llvm-link.cpp
diff --git a/llvm/tools/llvm-lto/CMakeLists.txt b/llvm/tools/llvm-lto/CMakeLists.txt
index 348976cb811..485b03d26da 100644
--- a/llvm/tools/llvm-lto/CMakeLists.txt
+++ b/llvm/tools/llvm-lto/CMakeLists.txt
@@ -1,4 +1,10 @@
-set(LLVM_LINK_COMPONENTS ${LLVM_TARGETS_TO_BUILD} lto support)
+set(LLVM_LINK_COMPONENTS
+  ${LLVM_TARGETS_TO_BUILD}
+  Core
+  LTO
+  MC
+  Support
+  )
 
 add_llvm_tool(llvm-lto
   llvm-lto.cpp
diff --git a/llvm/tools/llvm-mc/CMakeLists.txt b/llvm/tools/llvm-mc/CMakeLists.txt
index 805caf403a1..6f8e9e5405f 100644
--- a/llvm/tools/llvm-mc/CMakeLists.txt
+++ b/llvm/tools/llvm-mc/CMakeLists.txt
@@ -1,4 +1,9 @@
-set(LLVM_LINK_COMPONENTS ${LLVM_TARGETS_TO_BUILD} support MC MCParser MCDisassembler)
+set(LLVM_LINK_COMPONENTS
+  ${LLVM_TARGETS_TO_BUILD}
+  MC
+  MCParser
+  Support
+  )
 
 add_llvm_tool(llvm-mc
   llvm-mc.cpp
diff --git a/llvm/tools/llvm-nm/CMakeLists.txt b/llvm/tools/llvm-nm/CMakeLists.txt
index b1672ffe0b5..ce758ced44e 100644
--- a/llvm/tools/llvm-nm/CMakeLists.txt
+++ b/llvm/tools/llvm-nm/CMakeLists.txt
@@ -1,4 +1,9 @@
-set(LLVM_LINK_COMPONENTS bitreader object)
+set(LLVM_LINK_COMPONENTS
+  BitReader
+  Core
+  Object
+  Support
+  )
 
 add_llvm_tool(llvm-nm
   llvm-nm.cpp
diff --git a/llvm/tools/llvm-objdump/CMakeLists.txt b/llvm/tools/llvm-objdump/CMakeLists.txt
index e983ec92fb8..413cb9bb1f0 100644
--- a/llvm/tools/llvm-objdump/CMakeLists.txt
+++ b/llvm/tools/llvm-objdump/CMakeLists.txt
@@ -2,9 +2,8 @@ set(LLVM_LINK_COMPONENTS
   ${LLVM_TARGETS_TO_BUILD}
   DebugInfo
   MC
-  MCParser
-  MCDisassembler
   Object
+  Support
   )
 
 add_llvm_tool(llvm-objdump
diff --git a/llvm/tools/llvm-readobj/CMakeLists.txt b/llvm/tools/llvm-readobj/CMakeLists.txt
index 90997a8ba9c..e67b970df66 100644
--- a/llvm/tools/llvm-readobj/CMakeLists.txt
+++ b/llvm/tools/llvm-readobj/CMakeLists.txt
@@ -1,7 +1,8 @@
 set(LLVM_LINK_COMPONENTS
   ${LLVM_TARGETS_TO_BUILD}
-  bitreader
-  object)
+  Object
+  Support
+  )
 
 add_llvm_tool(llvm-readobj
   llvm-readobj.cpp
diff --git a/llvm/tools/llvm-rtdyld/CMakeLists.txt b/llvm/tools/llvm-rtdyld/CMakeLists.txt
index 8d161d366da..3ad127fd73c 100644
--- a/llvm/tools/llvm-rtdyld/CMakeLists.txt
+++ b/llvm/tools/llvm-rtdyld/CMakeLists.txt
@@ -1,4 +1,9 @@
-set(LLVM_LINK_COMPONENTS ${LLVM_TARGETS_TO_BUILD} support MC object RuntimeDyld JIT debuginfo)
+set(LLVM_LINK_COMPONENTS
+  DebugInfo
+  ExecutionEngine
+  RuntimeDyld
+  Support
+  )
 
 add_llvm_tool(llvm-rtdyld
   llvm-rtdyld.cpp
diff --git a/llvm/tools/llvm-size/CMakeLists.txt b/llvm/tools/llvm-size/CMakeLists.txt
index 933cc75c3fe..60345739c35 100644
--- a/llvm/tools/llvm-size/CMakeLists.txt
+++ b/llvm/tools/llvm-size/CMakeLists.txt
@@ -1,4 +1,7 @@
-set(LLVM_LINK_COMPONENTS object)
+set(LLVM_LINK_COMPONENTS
+  Object
+  Support
+  )
 
 add_llvm_tool(llvm-size
   llvm-size.cpp
diff --git a/llvm/tools/llvm-stress/CMakeLists.txt b/llvm/tools/llvm-stress/CMakeLists.txt
index ff3a5c42a07..106ced14194 100644
--- a/llvm/tools/llvm-stress/CMakeLists.txt
+++ b/llvm/tools/llvm-stress/CMakeLists.txt
@@ -1,4 +1,8 @@
-set(LLVM_LINK_COMPONENTS bitreader asmparser bitwriter instrumentation scalaropts ipo)
+set(LLVM_LINK_COMPONENTS
+  Core
+  IPA
+  Support
+  )
 
 add_llvm_tool(llvm-stress
   llvm-stress.cpp
diff --git a/llvm/tools/llvm-symbolizer/CMakeLists.txt b/llvm/tools/llvm-symbolizer/CMakeLists.txt
index 5967b891f41..9e76248d83d 100644
--- a/llvm/tools/llvm-symbolizer/CMakeLists.txt
+++ b/llvm/tools/llvm-symbolizer/CMakeLists.txt
@@ -6,6 +6,7 @@
 set(LLVM_LINK_COMPONENTS
   DebugInfo
   Object
+  Support
   )
 
 add_llvm_tool(llvm-symbolizer
diff --git a/llvm/tools/lto/CMakeLists.txt b/llvm/tools/lto/CMakeLists.txt
index 957a9f0036c..da0f6bfc1d9 100644
--- a/llvm/tools/lto/CMakeLists.txt
+++ b/llvm/tools/lto/CMakeLists.txt
@@ -1,6 +1,10 @@
 set(LLVM_LINK_COMPONENTS
   ${LLVM_TARGETS_TO_BUILD}
-  ipo scalaropts linker bitreader bitwriter lto mcdisassembler vectorize)
+  Core
+  LTO
+  MC
+  Support
+  )
 
 add_definitions( -DLLVM_VERSION_INFO=\"${PACKAGE_VERSION}\" )
 
diff --git a/llvm/tools/macho-dump/CMakeLists.txt b/llvm/tools/macho-dump/CMakeLists.txt
index d55e1d5c413..bc2dfbf427c 100644
--- a/llvm/tools/macho-dump/CMakeLists.txt
+++ b/llvm/tools/macho-dump/CMakeLists.txt
@@ -1,4 +1,7 @@
-set(LLVM_LINK_COMPONENTS ${LLVM_TARGETS_TO_BUILD} support object)
+set(LLVM_LINK_COMPONENTS
+  Object
+  Support
+  )
 
 add_llvm_tool(macho-dump
   macho-dump.cpp
diff --git a/llvm/tools/obj2yaml/CMakeLists.txt b/llvm/tools/obj2yaml/CMakeLists.txt
index 6b39193e47d..536c413460f 100644
--- a/llvm/tools/obj2yaml/CMakeLists.txt
+++ b/llvm/tools/obj2yaml/CMakeLists.txt
@@ -1,4 +1,7 @@
-set(LLVM_LINK_COMPONENTS object)
+set(LLVM_LINK_COMPONENTS
+  Object
+  Support
+  )
 
 add_llvm_utility(obj2yaml
   obj2yaml.cpp coff2yaml.cpp
diff --git a/llvm/tools/opt/CMakeLists.txt b/llvm/tools/opt/CMakeLists.txt
index 91959119e49..816edeae2dc 100644
--- a/llvm/tools/opt/CMakeLists.txt
+++ b/llvm/tools/opt/CMakeLists.txt
@@ -1,4 +1,21 @@
-set(LLVM_LINK_COMPONENTS ${LLVM_TARGETS_TO_BUILD} bitreader asmparser bitwriter irreader instrumentation scalaropts objcarcopts ipo vectorize)
+set(LLVM_LINK_COMPONENTS
+  ${LLVM_TARGETS_TO_BUILD}
+  Analysis
+  BitWriter
+  Core
+  IPA
+  IPO
+  IRReader
+  InstCombine
+  Instrumentation
+  MC
+  ObjCARCOpts
+  ScalarOpts
+  Support
+  Target
+  TransformUtils
+  Vectorize
+  )
 
 add_llvm_tool(opt
   AnalysisWrappers.cpp
diff --git a/llvm/tools/yaml2obj/CMakeLists.txt b/llvm/tools/yaml2obj/CMakeLists.txt
index 8d9d6522469..3e2e4b1a250 100644
--- a/llvm/tools/yaml2obj/CMakeLists.txt
+++ b/llvm/tools/yaml2obj/CMakeLists.txt
@@ -1,4 +1,7 @@
-set(LLVM_LINK_COMPONENTS object)
+set(LLVM_LINK_COMPONENTS
+  Object
+  Support
+  )
 
 add_llvm_utility(yaml2obj
   yaml2obj.cpp