Index: llvm/trunk/cmake/modules/LLVM-Config.cmake
===================================================================
--- llvm/trunk/cmake/modules/LLVM-Config.cmake
+++ llvm/trunk/cmake/modules/LLVM-Config.cmake
@@ -209,6 +209,13 @@
       # already processed
     elseif( c STREQUAL "all" )
       list(APPEND expanded_components ${LLVM_AVAILABLE_LIBS})
+    elseif( c STREQUAL "AllTargetsCodeGens" )
+      # Link all the asm printers from all the targets
+      foreach(t ${LLVM_TARGETS_TO_BUILD})
+        if( TARGET LLVM${t}CodeGen)
+          list(APPEND expanded_components "LLVM${t}CodeGen")
+        endif()
+      endforeach(t)
     elseif( c STREQUAL "AllTargetsAsmPrinters" )
       # Link all the asm printers from all the targets
       foreach(t ${LLVM_TARGETS_TO_BUILD})
Index: llvm/trunk/tools/bugpoint/CMakeLists.txt
===================================================================
--- llvm/trunk/tools/bugpoint/CMakeLists.txt
+++ llvm/trunk/tools/bugpoint/CMakeLists.txt
@@ -1,5 +1,6 @@
 set(LLVM_LINK_COMPONENTS
-  ${LLVM_TARGETS_TO_BUILD}
+  AllTargetsAsmParsers
+  AllTargetsCodeGens
   Analysis
   BitWriter
   CodeGen
Index: llvm/trunk/tools/dsymutil/CMakeLists.txt
===================================================================
--- llvm/trunk/tools/dsymutil/CMakeLists.txt
+++ llvm/trunk/tools/dsymutil/CMakeLists.txt
@@ -1,5 +1,8 @@
 set(LLVM_LINK_COMPONENTS
-  ${LLVM_TARGETS_TO_BUILD}
+  AllTargetsAsmPrinters
+  AllTargetsCodeGens
+  AllTargetsDescs
+  AllTargetsInfos
   AsmPrinter
   DebugInfoDWARF
   MC
Index: llvm/trunk/tools/llc/CMakeLists.txt
===================================================================
--- llvm/trunk/tools/llc/CMakeLists.txt
+++ llvm/trunk/tools/llc/CMakeLists.txt
@@ -1,5 +1,6 @@
 set(LLVM_LINK_COMPONENTS
-  ${LLVM_TARGETS_TO_BUILD}
+  AllTargetsAsmParsers
+  AllTargetsCodeGens
   Analysis
   AsmPrinter
   CodeGen
Index: llvm/trunk/tools/llvm-ar/CMakeLists.txt
===================================================================
--- llvm/trunk/tools/llvm-ar/CMakeLists.txt
+++ llvm/trunk/tools/llvm-ar/CMakeLists.txt
@@ -1,5 +1,7 @@
 set(LLVM_LINK_COMPONENTS
-  ${LLVM_TARGETS_TO_BUILD}
+  AllTargetsAsmParsers
+  AllTargetsDescs
+  AllTargetsInfos
   BinaryFormat
   Core
   DlltoolDriver
Index: llvm/trunk/tools/llvm-c-test/CMakeLists.txt
===================================================================
--- llvm/trunk/tools/llvm-c-test/CMakeLists.txt
+++ llvm/trunk/tools/llvm-c-test/CMakeLists.txt
@@ -1,5 +1,7 @@
 set(LLVM_LINK_COMPONENTS
-  ${LLVM_TARGETS_TO_BUILD}
+  AllTargetsAsmParsers
+  AllTargetsCodeGens
+  AllTargetsDisassemblers
   BitReader
   Core
   MCDisassembler
Index: llvm/trunk/tools/llvm-cxxdump/CMakeLists.txt
===================================================================
--- llvm/trunk/tools/llvm-cxxdump/CMakeLists.txt
+++ llvm/trunk/tools/llvm-cxxdump/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(LLVM_LINK_COMPONENTS
-  ${LLVM_TARGETS_TO_BUILD}
+  AllTargetsInfos
   Object
   Support
   )
Index: llvm/trunk/tools/llvm-dwp/CMakeLists.txt
===================================================================
--- llvm/trunk/tools/llvm-dwp/CMakeLists.txt
+++ llvm/trunk/tools/llvm-dwp/CMakeLists.txt
@@ -1,5 +1,6 @@
 set(LLVM_LINK_COMPONENTS
-  ${LLVM_TARGETS_TO_BUILD}
+  AllTargetsAsmParsers
+  AllTargetsCodeGens
   AsmPrinter
   DebugInfoDWARF
   MC
Index: llvm/trunk/tools/llvm-lto/CMakeLists.txt
===================================================================
--- llvm/trunk/tools/llvm-lto/CMakeLists.txt
+++ llvm/trunk/tools/llvm-lto/CMakeLists.txt
@@ -1,5 +1,6 @@
 set(LLVM_LINK_COMPONENTS
-  ${LLVM_TARGETS_TO_BUILD}
+  AllTargetsAsmParsers
+  AllTargetsCodeGens
   BitReader
   BitWriter
   Core
Index: llvm/trunk/tools/llvm-lto2/CMakeLists.txt
===================================================================
--- llvm/trunk/tools/llvm-lto2/CMakeLists.txt
+++ llvm/trunk/tools/llvm-lto2/CMakeLists.txt
@@ -1,5 +1,7 @@
 set(LLVM_LINK_COMPONENTS
-  ${LLVM_TARGETS_TO_BUILD}
+  AllTargetsAsmParsers
+  AllTargetsCodeGens
+  AllTargetsDescs
   BitReader
   Core
   Linker
Index: llvm/trunk/tools/llvm-rtdyld/CMakeLists.txt
===================================================================
--- llvm/trunk/tools/llvm-rtdyld/CMakeLists.txt
+++ llvm/trunk/tools/llvm-rtdyld/CMakeLists.txt
@@ -1,5 +1,7 @@
 set(LLVM_LINK_COMPONENTS
-  ${LLVM_TARGETS_TO_BUILD}
+  AllTargetsDisassemblers
+  AllTargetsDescs
+  AllTargetsInfos
   DebugInfoDWARF
   ExecutionEngine
   MC
Index: llvm/trunk/tools/llvm-xray/CMakeLists.txt
===================================================================
--- llvm/trunk/tools/llvm-xray/CMakeLists.txt
+++ llvm/trunk/tools/llvm-xray/CMakeLists.txt
@@ -1,5 +1,4 @@
 set(LLVM_LINK_COMPONENTS
-  ${LLVM_TARGETS_TO_BUILD}
   DebugInfoDWARF
   Object
   Support
Index: llvm/trunk/tools/lto/CMakeLists.txt
===================================================================
--- llvm/trunk/tools/lto/CMakeLists.txt
+++ llvm/trunk/tools/lto/CMakeLists.txt
@@ -1,5 +1,9 @@
 set(LLVM_LINK_COMPONENTS
-  ${LLVM_TARGETS_TO_BUILD}
+  AllTargetsAsmParsers
+  AllTargetsCodeGens
+  AllTargetsDescs
+  AllTargetsDisassemblers
+  AllTargetsInfos
   BitReader
   Core
   LTO
Index: llvm/trunk/tools/opt/CMakeLists.txt
===================================================================
--- llvm/trunk/tools/opt/CMakeLists.txt
+++ llvm/trunk/tools/opt/CMakeLists.txt
@@ -1,5 +1,7 @@
 set(LLVM_LINK_COMPONENTS
-  ${LLVM_TARGETS_TO_BUILD}
+  AllTargetsAsmParsers
+  AllTargetsCodeGens
+  AllTargetsInfos
   AggressiveInstCombine
   Analysis
   BitWriter