diff --git a/llvm/lib/Target/AMDGPU/Utils/CMakeLists.txt b/llvm/lib/Target/AMDGPU/Utils/CMakeLists.txt
@@ -3,4 +3,13 @@ add_llvm_component_library(LLVMAMDGPUUtils
   AMDKernelCodeTUtils.cpp
   AMDGPUAsmUtils.cpp
   AMDGPUPALMetadata.cpp
+
+  LINK_COMPONENTS
+  Core
+  MC
+  BinaryFormat
+  Support
+
+  ADD_TO_COMPONENT
+  AMDGPU
   )
diff --git a/llvm/lib/Target/AMDGPU/Utils/LLVMBuild.txt b/llvm/lib/Target/AMDGPU/Utils/LLVMBuild.txt
diff --git a/llvm/lib/Target/ARC/CMakeLists.txt b/llvm/lib/Target/ARC/CMakeLists.txt
@@ -1,3 +1,5 @@
+add_llvm_component_group(ARC)
+
 set(LLVM_TARGET_DEFINITIONS ARC.td)
 
 tablegen(LLVM ARCGenAsmWriter.inc -gen-asm-writer)
@@ -24,7 +26,23 @@ add_llvm_target(ARCCodeGen
   ARCRegisterInfo.cpp
   ARCSubtarget.cpp
   ARCTargetMachine.cpp
-  )
+
+  LINK_COMPONENTS
+  Analysis
+  AsmPrinter
+  CodeGen
+  Core
+  MC
+  SelectionDAG
+  Support
+  Target
+  TransformUtils
+  ARCDesc
+  ARCInfo
+
+  ADD_TO_COMPONENT
+  ARC
+)
 
 add_subdirectory(Disassembler)
 add_subdirectory(MCTargetDesc)

diff --git a/llvm/lib/Target/ARC/Disassembler/CMakeLists.txt b/llvm/lib/Target/ARC/Disassembler/CMakeLists.txt
@@ -1,3 +1,11 @@
 add_llvm_component_library(LLVMARCDisassembler
   ARCDisassembler.cpp
+
+  LINK_COMPONENTS
+  MCDisassembler
+  Support
+  ARCInfo
+
+  ADD_TO_COMPONENT
+  ARC
   )
diff --git a/llvm/lib/Target/ARC/Disassembler/LLVMBuild.txt b/llvm/lib/Target/ARC/Disassembler/LLVMBuild.txt
diff --git a/llvm/lib/Target/ARC/LLVMBuild.txt b/llvm/lib/Target/ARC/LLVMBuild.txt
diff --git a/llvm/lib/Target/ARC/MCTargetDesc/CMakeLists.txt b/llvm/lib/Target/ARC/MCTargetDesc/CMakeLists.txt
@@ -2,4 +2,12 @@ add_llvm_component_library(LLVMARCDesc
   ARCInstPrinter.cpp
   ARCMCTargetDesc.cpp
   ARCMCAsmInfo.cpp
+
+  LINK_COMPONENTS
+  MC
+  Support
+  ARCInfo
+
+  ADD_TO_COMPONENT
+  ARC
   )
diff --git a/llvm/lib/Target/ARC/MCTargetDesc/LLVMBuild.txt b/llvm/lib/Target/ARC/MCTargetDesc/LLVMBuild.txt
diff --git a/llvm/lib/Target/ARC/TargetInfo/CMakeLists.txt b/llvm/lib/Target/ARC/TargetInfo/CMakeLists.txt
@@ -1,3 +1,9 @@
 add_llvm_component_library(LLVMARCInfo
   ARCTargetInfo.cpp
+
+  LINK_COMPONENTS
+  Support
+
+  ADD_TO_COMPONENT
+  ARC
   )
diff --git a/llvm/lib/Target/ARC/TargetInfo/LLVMBuild.txt b/llvm/lib/Target/ARC/TargetInfo/LLVMBuild.txt
diff --git a/llvm/lib/Target/ARM/AsmParser/CMakeLists.txt b/llvm/lib/Target/ARM/AsmParser/CMakeLists.txt
@@ -1,3 +1,14 @@
 add_llvm_component_library(LLVMARMAsmParser
   ARMAsmParser.cpp
+
+  LINK_COMPONENTS
+  ARMDesc
+  ARMInfo
+  MC
+  MCParser
+  Support
+  ARMUtils
+
+  ADD_TO_COMPONENT
+  ARM
   )
diff --git a/llvm/lib/Target/ARM/AsmParser/LLVMBuild.txt b/llvm/lib/Target/ARM/AsmParser/LLVMBuild.txt
diff --git a/llvm/lib/Target/ARM/CMakeLists.txt b/llvm/lib/Target/ARM/CMakeLists.txt
@@ -1,3 +1,5 @@
+add_llvm_component_group(ARM HAS_JIT)
+
 set(LLVM_TARGET_DEFINITIONS ARM.td)
 
 tablegen(LLVM ARMGenAsmMatcher.inc -gen-asm-matcher)
@@ -61,6 +63,26 @@ add_llvm_target(ARMCodeGen
   Thumb2ITBlockPass.cpp
   Thumb2InstrInfo.cpp
   Thumb2SizeReduction.cpp
+
+  LINK_COMPONENTS
+  ARMDesc
+  ARMInfo
+  Analysis
+  AsmPrinter
+  CodeGen
+  Core
+  MC
+  Scalar
+  SelectionDAG
+  Support
+  Target
+  GlobalISel
+  ARMUtils
+  TransformUtils
+  CFGuard
+
+  ADD_TO_COMPONENT
+  ARM
   )
 
 add_subdirectory(AsmParser)

diff --git a/llvm/lib/Target/ARM/Disassembler/CMakeLists.txt b/llvm/lib/Target/ARM/Disassembler/CMakeLists.txt
@@ -1,3 +1,13 @@
 add_llvm_component_library(LLVMARMDisassembler
   ARMDisassembler.cpp
+
+  LINK_COMPONENTS
+  ARMDesc
+  ARMInfo
+  MCDisassembler
+  Support
+  ARMUtils
+
+  ADD_TO_COMPONENT
+  ARM
   )
diff --git a/llvm/lib/Target/ARM/Disassembler/LLVMBuild.txt b/llvm/lib/Target/ARM/Disassembler/LLVMBuild.txt
diff --git a/llvm/lib/Target/ARM/LLVMBuild.txt b/llvm/lib/Target/ARM/LLVMBuild.txt
diff --git a/llvm/lib/Target/ARM/MCTargetDesc/CMakeLists.txt b/llvm/lib/Target/ARM/MCTargetDesc/CMakeLists.txt
@@ -13,4 +13,15 @@ add_llvm_component_library(LLVMARMDesc
   ARMUnwindOpAsm.cpp
   ARMWinCOFFObjectWriter.cpp
   ARMWinCOFFStreamer.cpp
+
+  LINK_COMPONENTS
+  ARMInfo
+  ARMUtils
+  MC
+  MCDisassembler
+  Support
+  BinaryFormat
+
+  ADD_TO_COMPONENT
+  ARM
   )
diff --git a/llvm/lib/Target/ARM/MCTargetDesc/LLVMBuild.txt b/llvm/lib/Target/ARM/MCTargetDesc/LLVMBuild.txt
diff --git a/llvm/lib/Target/ARM/TargetInfo/CMakeLists.txt b/llvm/lib/Target/ARM/TargetInfo/CMakeLists.txt
@@ -1,3 +1,9 @@
 add_llvm_component_library(LLVMARMInfo
   ARMTargetInfo.cpp
+
+  LINK_COMPONENTS
+  Support
+
+  ADD_TO_COMPONENT
+  ARM
   )
diff --git a/llvm/lib/Target/ARM/TargetInfo/LLVMBuild.txt b/llvm/lib/Target/ARM/TargetInfo/LLVMBuild.txt
diff --git a/llvm/lib/Target/ARM/Utils/CMakeLists.txt b/llvm/lib/Target/ARM/Utils/CMakeLists.txt
@@ -1,3 +1,9 @@
 add_llvm_component_library(LLVMARMUtils
   ARMBaseInfo.cpp
+
+  LINK_COMPONENTS
+  Support
+
+  ADD_TO_COMPONENT
+  ARM
   )
diff --git a/llvm/lib/Target/ARM/Utils/LLVMBuild.txt b/llvm/lib/Target/ARM/Utils/LLVMBuild.txt
diff --git a/llvm/lib/Target/AVR/AsmParser/CMakeLists.txt b/llvm/lib/Target/AVR/AsmParser/CMakeLists.txt
@@ -1,3 +1,13 @@
 add_llvm_component_library(LLVMAVRAsmParser
   AVRAsmParser.cpp
+
+  LINK_COMPONENTS
+  MC
+  MCParser
+  AVRDesc
+  AVRInfo
+  Support
+
+  ADD_TO_COMPONENT
+  AVR
 )
diff --git a/llvm/lib/Target/AVR/AsmParser/LLVMBuild.txt b/llvm/lib/Target/AVR/AsmParser/LLVMBuild.txt
diff --git a/llvm/lib/Target/AVR/CMakeLists.txt b/llvm/lib/Target/AVR/CMakeLists.txt
@@ -1,3 +1,5 @@
+add_llvm_component_group(AVR)
+
 set(LLVM_TARGET_DEFINITIONS AVR.td)
 
 tablegen(LLVM AVRGenAsmMatcher.inc -gen-asm-matcher)
@@ -28,6 +30,20 @@ add_llvm_target(AVRCodeGen
 
   DEPENDS
   intrinsics_gen
+
+  LINK_COMPONENTS
+  AsmPrinter
+  CodeGen
+  Core
+  MC
+  AVRDesc
+  AVRInfo
+  SelectionDAG
+  Support
+  Target
+
+  ADD_TO_COMPONENT
+  AVR
 )
 
 add_subdirectory(AsmParser)

diff --git a/llvm/lib/Target/AVR/Disassembler/CMakeLists.txt b/llvm/lib/Target/AVR/Disassembler/CMakeLists.txt
@@ -1,4 +1,12 @@
 add_llvm_component_library(LLVMAVRDisassembler
   AVRDisassembler.cpp
+
+  LINK_COMPONENTS
+  MCDisassembler
+  AVRInfo
+  Support
+
+  ADD_TO_COMPONENT
+  AVR
 )
 
diff --git a/llvm/lib/Target/AVR/Disassembler/LLVMBuild.txt b/llvm/lib/Target/AVR/Disassembler/LLVMBuild.txt
diff --git a/llvm/lib/Target/AVR/LLVMBuild.txt b/llvm/lib/Target/AVR/LLVMBuild.txt
diff --git a/llvm/lib/Target/AVR/MCTargetDesc/CMakeLists.txt b/llvm/lib/Target/AVR/MCTargetDesc/CMakeLists.txt
@@ -9,6 +9,14 @@ add_llvm_component_library(LLVMAVRDesc
   AVRMCExpr.cpp
   AVRMCTargetDesc.cpp
   AVRTargetStreamer.cpp
+
+  LINK_COMPONENTS
+  MC
+  AVRInfo
+  Support
+
+  ADD_TO_COMPONENT
+  AVR
 )
 
 add_dependencies(LLVMAVRDesc AVRCommonTableGen)

diff --git a/llvm/lib/Target/AVR/MCTargetDesc/LLVMBuild.txt b/llvm/lib/Target/AVR/MCTargetDesc/LLVMBuild.txt
diff --git a/llvm/lib/Target/AVR/TargetInfo/CMakeLists.txt b/llvm/lib/Target/AVR/TargetInfo/CMakeLists.txt
@@ -3,6 +3,12 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR}/..
 
 add_llvm_component_library(LLVMAVRInfo
   AVRTargetInfo.cpp
+
+  LINK_COMPONENTS
+  Support
+
+  ADD_TO_COMPONENT
+  AVR
 )
 
 add_dependencies(LLVMAVRInfo AVRCommonTableGen)

diff --git a/llvm/lib/Target/AVR/TargetInfo/LLVMBuild.txt b/llvm/lib/Target/AVR/TargetInfo/LLVMBuild.txt
diff --git a/llvm/lib/Target/BPF/AsmParser/CMakeLists.txt b/llvm/lib/Target/BPF/AsmParser/CMakeLists.txt
@@ -1,3 +1,13 @@
 add_llvm_component_library(LLVMBPFAsmParser
   BPFAsmParser.cpp
+
+  LINK_COMPONENTS
+  MC
+  MCParser
+  BPFDesc
+  BPFInfo
+  Support
+
+  ADD_TO_COMPONENT
+  BPF
   )
diff --git a/llvm/lib/Target/BPF/AsmParser/LLVMBuild.txt b/llvm/lib/Target/BPF/AsmParser/LLVMBuild.txt
diff --git a/llvm/lib/Target/BPF/CMakeLists.txt b/llvm/lib/Target/BPF/CMakeLists.txt
@@ -1,3 +1,5 @@
+add_llvm_component_group(BPF)
+
 set(LLVM_TARGET_DEFINITIONS BPF.td)
 
 tablegen(LLVM BPFGenAsmMatcher.inc -gen-asm-matcher)
@@ -31,6 +33,22 @@ add_llvm_target(BPFCodeGen
   BPFMIChecking.cpp
   BPFMISimplifyPatchable.cpp
   BTFDebug.cpp
+
+  LINK_COMPONENTS
+  AsmPrinter
+  CodeGen
+  Core
+  MC
+  BPFDesc
+  BPFInfo
+  IPO
+  Scalar
+  SelectionDAG
+  Support
+  Target
+
+  ADD_TO_COMPONENT
+  BPF
   )
 
 add_subdirectory(AsmParser)

diff --git a/llvm/lib/Target/BPF/Disassembler/CMakeLists.txt b/llvm/lib/Target/BPF/Disassembler/CMakeLists.txt
@@ -1,4 +1,12 @@
 add_llvm_component_library(LLVMBPFDisassembler
   BPFDisassembler.cpp
+
+  LINK_COMPONENTS
+  MCDisassembler
+  BPFInfo
+  Support
+
+  ADD_TO_COMPONENT
+  BPF
 )
 
diff --git a/llvm/lib/Target/BPF/Disassembler/LLVMBuild.txt b/llvm/lib/Target/BPF/Disassembler/LLVMBuild.txt
diff --git a/llvm/lib/Target/BPF/LLVMBuild.txt b/llvm/lib/Target/BPF/LLVMBuild.txt
diff --git a/llvm/lib/Target/BPF/MCTargetDesc/CMakeLists.txt b/llvm/lib/Target/BPF/MCTargetDesc/CMakeLists.txt
@@ -4,4 +4,12 @@ add_llvm_component_library(LLVMBPFDesc
   BPFInstPrinter.cpp
   BPFMCCodeEmitter.cpp
   BPFELFObjectWriter.cpp
+
+  LINK_COMPONENTS
+  MC
+  BPFInfo
+  Support
+
+  ADD_TO_COMPONENT
+  BPF
   )
diff --git a/llvm/lib/Target/BPF/MCTargetDesc/LLVMBuild.txt b/llvm/lib/Target/BPF/MCTargetDesc/LLVMBuild.txt
diff --git a/llvm/lib/Target/BPF/TargetInfo/CMakeLists.txt b/llvm/lib/Target/BPF/TargetInfo/CMakeLists.txt
@@ -1,3 +1,9 @@
 add_llvm_component_library(LLVMBPFInfo
   BPFTargetInfo.cpp
+
+  LINK_COMPONENTS
+  Support
+
+  ADD_TO_COMPONENT
+  BPF
   )
diff --git a/llvm/lib/Target/BPF/TargetInfo/LLVMBuild.txt b/llvm/lib/Target/BPF/TargetInfo/LLVMBuild.txt
diff --git a/llvm/lib/Target/CMakeLists.txt b/llvm/lib/Target/CMakeLists.txt
@@ -11,6 +11,12 @@ add_llvm_component_library(LLVMTarget
 
   ADDITIONAL_HEADER_DIRS
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/Target
+
+  LINK_COMPONENTS
+  Analysis
+  Core
+  MC
+  Support
   )
 
 # When building shared objects for each target there are some internal APIs

diff --git a/llvm/lib/Target/CSKY/CMakeLists.txt b/llvm/lib/Target/CSKY/CMakeLists.txt
@@ -1,5 +1,17 @@
+add_llvm_component_group(CSKY)
+
 add_llvm_target(CSKYCodeGen
   CSKYTargetMachine.cpp
+
+  LINK_COMPONENTS
+  Core
+  CodeGen
+  CSKYInfo
+  Support
+  Target
+
+  ADD_TO_COMPONENT
+  CSKY
   )
 
 add_subdirectory(TargetInfo)
diff --git a/llvm/lib/Target/CSKY/LLVMBuild.txt b/llvm/lib/Target/CSKY/LLVMBuild.txt
diff --git a/llvm/lib/Target/CSKY/TargetInfo/CMakeLists.txt b/llvm/lib/Target/CSKY/TargetInfo/CMakeLists.txt
@@ -1,3 +1,9 @@
-add_llvm_library(LLVMCSKYInfo
+add_llvm_component_library(LLVMCSKYInfo
   CSKYTargetInfo.cpp
-  )
+
+  LINK_COMPONENTS
+  Support
+
+  ADD_TO_COMPONENT
+  CSKY
+)
diff --git a/llvm/lib/Target/CSKY/TargetInfo/LLVMBuild.txt b/llvm/lib/Target/CSKY/TargetInfo/LLVMBuild.txt
diff --git a/llvm/lib/Target/Hexagon/AsmParser/CMakeLists.txt b/llvm/lib/Target/Hexagon/AsmParser/CMakeLists.txt
@@ -2,6 +2,16 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/
 
 add_llvm_component_library(LLVMHexagonAsmParser
   HexagonAsmParser.cpp
+
+  LINK_COMPONENTS
+  MC
+  MCParser
+  Support
+  HexagonDesc
+  HexagonInfo
+
+  ADD_TO_COMPONENT
+  Hexagon
   )
 
 add_dependencies( LLVMHexagonAsmParser HexagonCommonTableGen )
diff --git a/llvm/lib/Target/Hexagon/AsmParser/LLVMBuild.txt b/llvm/lib/Target/Hexagon/AsmParser/LLVMBuild.txt
diff --git a/llvm/lib/Target/Hexagon/CMakeLists.txt b/llvm/lib/Target/Hexagon/CMakeLists.txt
@@ -1,3 +1,5 @@
+add_llvm_component_group(Hexagon)
+
 set(LLVM_TARGET_DEFINITIONS Hexagon.td)
 
 tablegen(LLVM HexagonGenAsmMatcher.inc -gen-asm-matcher)
@@ -64,6 +66,25 @@ add_llvm_target(HexagonCodeGen
   HexagonVLIWPacketizer.cpp
   RDFCopy.cpp
   RDFDeadCode.cpp
+
+  LINK_COMPONENTS
+   Analysis
+  AsmPrinter
+  CodeGen
+  Core
+  HexagonAsmParser
+  HexagonDesc
+  HexagonInfo
+  IPO
+  MC
+  Scalar
+  SelectionDAG
+  Support
+  Target
+  TransformUtils
+
+  ADD_TO_COMPONENT
+  Hexagon
 )
 
 add_subdirectory(AsmParser)

diff --git a/llvm/lib/Target/Hexagon/Disassembler/CMakeLists.txt b/llvm/lib/Target/Hexagon/Disassembler/CMakeLists.txt
@@ -1,3 +1,13 @@
 add_llvm_component_library(LLVMHexagonDisassembler
   HexagonDisassembler.cpp
+
+  LINK_COMPONENTS
+  HexagonDesc
+  HexagonInfo
+  MC
+  MCDisassembler
+  Support
+
+  ADD_TO_COMPONENT
+  Hexagon
   )
diff --git a/llvm/lib/Target/Hexagon/Disassembler/LLVMBuild.txt b/llvm/lib/Target/Hexagon/Disassembler/LLVMBuild.txt
diff --git a/llvm/lib/Target/Hexagon/LLVMBuild.txt b/llvm/lib/Target/Hexagon/LLVMBuild.txt
diff --git a/llvm/lib/Target/Hexagon/MCTargetDesc/CMakeLists.txt b/llvm/lib/Target/Hexagon/MCTargetDesc/CMakeLists.txt
@@ -13,6 +13,14 @@ add_llvm_component_library(LLVMHexagonDesc
   HexagonMCShuffler.cpp
   HexagonMCTargetDesc.cpp
   HexagonShuffler.cpp
+
+  LINK_COMPONENTS
+  HexagonInfo
+  MC
+  Support
+
+  ADD_TO_COMPONENT
+  Hexagon
   )
 
 add_dependencies(LLVMHexagonDesc HexagonCommonTableGen)
diff --git a/llvm/lib/Target/Hexagon/MCTargetDesc/LLVMBuild.txt b/llvm/lib/Target/Hexagon/MCTargetDesc/LLVMBuild.txt
diff --git a/llvm/lib/Target/Hexagon/TargetInfo/CMakeLists.txt b/llvm/lib/Target/Hexagon/TargetInfo/CMakeLists.txt
@@ -1,3 +1,9 @@
 add_llvm_component_library(LLVMHexagonInfo
   HexagonTargetInfo.cpp
+
+  LINK_COMPONENTS
+  Support
+
+  ADD_TO_COMPONENT
+  Hexagon
   )
diff --git a/llvm/lib/Target/Hexagon/TargetInfo/LLVMBuild.txt b/llvm/lib/Target/Hexagon/TargetInfo/LLVMBuild.txt
diff --git a/llvm/lib/Target/LLVMBuild.txt b/llvm/lib/Target/LLVMBuild.txt
diff --git a/llvm/lib/Target/Lanai/AsmParser/CMakeLists.txt b/llvm/lib/Target/Lanai/AsmParser/CMakeLists.txt
@@ -2,6 +2,16 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/
 
 add_llvm_component_library(LLVMLanaiAsmParser
   LanaiAsmParser.cpp
+
+  LINK_COMPONENTS
+  MC
+  MCParser
+  Support
+  LanaiDesc
+  LanaiInfo
+
+  ADD_TO_COMPONENT
+  Lanai
   )
 
 add_dependencies( LLVMLanaiAsmParser LanaiCommonTableGen )
diff --git a/llvm/lib/Target/Lanai/AsmParser/LLVMBuild.txt b/llvm/lib/Target/Lanai/AsmParser/LLVMBuild.txt
diff --git a/llvm/lib/Target/Lanai/CMakeLists.txt b/llvm/lib/Target/Lanai/CMakeLists.txt
@@ -1,3 +1,5 @@
+add_llvm_component_group(Lanai)
+
 set(LLVM_TARGET_DEFINITIONS Lanai.td)
 
 tablegen(LLVM LanaiGenAsmMatcher.inc -gen-asm-matcher)
@@ -27,6 +29,23 @@ add_llvm_target(LanaiCodeGen
   LanaiSubtarget.cpp
   LanaiTargetMachine.cpp
   LanaiTargetObjectFile.cpp
+
+  LINK_COMPONENTS
+  Analysis
+  AsmPrinter
+  CodeGen
+  Core
+  LanaiAsmParser
+  LanaiDesc
+  LanaiInfo
+  MC
+  SelectionDAG
+  Support
+  Target
+  TransformUtils
+
+  ADD_TO_COMPONENT
+  Lanai
 )
 
 add_subdirectory(AsmParser)

diff --git a/llvm/lib/Target/Lanai/Disassembler/CMakeLists.txt b/llvm/lib/Target/Lanai/Disassembler/CMakeLists.txt
@@ -1,3 +1,13 @@
 add_llvm_component_library(LLVMLanaiDisassembler
   LanaiDisassembler.cpp
+
+  LINK_COMPONENTS
+  LanaiDesc
+  LanaiInfo
+  MC
+  MCDisassembler
+  Support
+
+  ADD_TO_COMPONENT
+  Lanai
   )
diff --git a/llvm/lib/Target/Lanai/Disassembler/LLVMBuild.txt b/llvm/lib/Target/Lanai/Disassembler/LLVMBuild.txt
diff --git a/llvm/lib/Target/Lanai/LLVMBuild.txt b/llvm/lib/Target/Lanai/LLVMBuild.txt
diff --git a/llvm/lib/Target/Lanai/MCTargetDesc/CMakeLists.txt b/llvm/lib/Target/Lanai/MCTargetDesc/CMakeLists.txt
@@ -6,4 +6,13 @@ add_llvm_component_library(LLVMLanaiDesc
   LanaiMCCodeEmitter.cpp
   LanaiMCExpr.cpp
   LanaiMCTargetDesc.cpp
+
+  LINK_COMPONENTS
+  LanaiInfo
+  MC
+  MCDisassembler
+  Support
+
+  ADD_TO_COMPONENT
+  Lanai
 )
diff --git a/llvm/lib/Target/Lanai/MCTargetDesc/LLVMBuild.txt b/llvm/lib/Target/Lanai/MCTargetDesc/LLVMBuild.txt
diff --git a/llvm/lib/Target/Lanai/TargetInfo/CMakeLists.txt b/llvm/lib/Target/Lanai/TargetInfo/CMakeLists.txt
@@ -1,3 +1,9 @@
 add_llvm_component_library(LLVMLanaiInfo
   LanaiTargetInfo.cpp
+
+  LINK_COMPONENTS
+  Support
+
+  ADD_TO_COMPONENT
+  Lanai
   )
diff --git a/llvm/lib/Target/Lanai/TargetInfo/LLVMBuild.txt b/llvm/lib/Target/Lanai/TargetInfo/LLVMBuild.txt
diff --git a/llvm/lib/Target/MSP430/AsmParser/CMakeLists.txt b/llvm/lib/Target/MSP430/AsmParser/CMakeLists.txt
@@ -1,3 +1,13 @@
 add_llvm_component_library(LLVMMSP430AsmParser
   MSP430AsmParser.cpp
+
+  LINK_COMPONENTS
+  MC
+  MCParser
+  MSP430Desc
+  MSP430Info
+  Support
+
+  ADD_TO_COMPONENT
+  MSP430
 )
diff --git a/llvm/lib/Target/MSP430/AsmParser/LLVMBuild.txt b/llvm/lib/Target/MSP430/AsmParser/LLVMBuild.txt
diff --git a/llvm/lib/Target/MSP430/CMakeLists.txt b/llvm/lib/Target/MSP430/CMakeLists.txt
@@ -1,3 +1,5 @@
+add_llvm_component_group(MSP430)
+
 set(LLVM_TARGET_DEFINITIONS MSP430.td)
 
 tablegen(LLVM MSP430GenAsmMatcher.inc -gen-asm-matcher)
@@ -24,6 +26,20 @@ add_llvm_target(MSP430CodeGen
   MSP430TargetMachine.cpp
   MSP430AsmPrinter.cpp
   MSP430MCInstLower.cpp
+
+  LINK_COMPONENTS
+  AsmPrinter
+  CodeGen
+  Core
+  MC
+  MSP430Desc
+  MSP430Info
+  SelectionDAG
+  Support
+  Target
+
+  ADD_TO_COMPONENT
+  MSP430
   )
 
 add_subdirectory(MCTargetDesc)

diff --git a/llvm/lib/Target/MSP430/Disassembler/CMakeLists.txt b/llvm/lib/Target/MSP430/Disassembler/CMakeLists.txt
@@ -1,3 +1,11 @@
 add_llvm_component_library(LLVMMSP430Disassembler
   MSP430Disassembler.cpp
+
+  LINK_COMPONENTS
+  MCDisassembler
+  MSP430Info
+  Support
+
+  ADD_TO_COMPONENT
+  MSP430
   )
diff --git a/llvm/lib/Target/MSP430/Disassembler/LLVMBuild.txt b/llvm/lib/Target/MSP430/Disassembler/LLVMBuild.txt
diff --git a/llvm/lib/Target/MSP430/LLVMBuild.txt b/llvm/lib/Target/MSP430/LLVMBuild.txt
diff --git a/llvm/lib/Target/MSP430/MCTargetDesc/CMakeLists.txt b/llvm/lib/Target/MSP430/MCTargetDesc/CMakeLists.txt
@@ -6,4 +6,12 @@ add_llvm_component_library(LLVMMSP430Desc
   MSP430MCAsmInfo.cpp
   MSP430MCCodeEmitter.cpp
   MSP430MCTargetDesc.cpp
+
+  LINK_COMPONENTS
+  MC
+  MSP430Info
+  Support
+
+  ADD_TO_COMPONENT
+  MSP430
   )
diff --git a/llvm/lib/Target/MSP430/MCTargetDesc/LLVMBuild.txt b/llvm/lib/Target/MSP430/MCTargetDesc/LLVMBuild.txt
diff --git a/llvm/lib/Target/MSP430/TargetInfo/CMakeLists.txt b/llvm/lib/Target/MSP430/TargetInfo/CMakeLists.txt
@@ -1,3 +1,9 @@
 add_llvm_component_library(LLVMMSP430Info
   MSP430TargetInfo.cpp
+
+  LINK_COMPONENTS
+  Support
+
+  ADD_TO_COMPONENT
+  MSP430
   )
diff --git a/llvm/lib/Target/MSP430/TargetInfo/LLVMBuild.txt b/llvm/lib/Target/MSP430/TargetInfo/LLVMBuild.txt
diff --git a/llvm/lib/Target/Mips/AsmParser/CMakeLists.txt b/llvm/lib/Target/Mips/AsmParser/CMakeLists.txt
@@ -1,3 +1,13 @@
 add_llvm_component_library(LLVMMipsAsmParser
   MipsAsmParser.cpp
+
+  LINK_COMPONENTS
+  MC
+  MCParser
+  MipsDesc
+  MipsInfo
+  Support
+
+  ADD_TO_COMPONENT
+  Mips
   )
diff --git a/llvm/lib/Target/Mips/AsmParser/LLVMBuild.txt b/llvm/lib/Target/Mips/AsmParser/LLVMBuild.txt
diff --git a/llvm/lib/Target/Mips/CMakeLists.txt b/llvm/lib/Target/Mips/CMakeLists.txt
@@ -1,3 +1,5 @@
+add_llvm_component_group(Mips HAS_JIT)
+
 set(LLVM_TARGET_DEFINITIONS Mips.td)
 
 tablegen(LLVM MipsGenAsmMatcher.inc -gen-asm-matcher)
@@ -57,6 +59,22 @@ add_llvm_target(MipsCodeGen
   MipsTargetMachine.cpp
   MipsTargetObjectFile.cpp
   MicroMipsSizeReduction.cpp
+
+  LINK_COMPONENTS
+  Analysis
+  AsmPrinter
+  CodeGen
+  Core
+  MC
+  MipsDesc
+  MipsInfo
+  SelectionDAG
+  Support
+  Target
+  GlobalISel
+
+  ADD_TO_COMPONENT
+  Mips
   )
 
 add_subdirectory(AsmParser)

diff --git a/llvm/lib/Target/Mips/Disassembler/CMakeLists.txt b/llvm/lib/Target/Mips/Disassembler/CMakeLists.txt
@@ -1,3 +1,11 @@
 add_llvm_component_library(LLVMMipsDisassembler
   MipsDisassembler.cpp
+
+  LINK_COMPONENTS
+  MCDisassembler
+  MipsInfo
+  Support
+
+  ADD_TO_COMPONENT
+  Mips
   )
diff --git a/llvm/lib/Target/Mips/Disassembler/LLVMBuild.txt b/llvm/lib/Target/Mips/Disassembler/LLVMBuild.txt
diff --git a/llvm/lib/Target/Mips/LLVMBuild.txt b/llvm/lib/Target/Mips/LLVMBuild.txt
diff --git a/llvm/lib/Target/Mips/MCTargetDesc/CMakeLists.txt b/llvm/lib/Target/Mips/MCTargetDesc/CMakeLists.txt
@@ -12,4 +12,12 @@ add_llvm_component_library(LLVMMipsDesc
   MipsNaClELFStreamer.cpp
   MipsOptionRecord.cpp
   MipsTargetStreamer.cpp
+
+  LINK_COMPONENTS
+  MC
+  MipsInfo
+  Support
+
+  ADD_TO_COMPONENT
+  Mips
   )
diff --git a/llvm/lib/Target/Mips/MCTargetDesc/LLVMBuild.txt b/llvm/lib/Target/Mips/MCTargetDesc/LLVMBuild.txt
diff --git a/llvm/lib/Target/Mips/TargetInfo/CMakeLists.txt b/llvm/lib/Target/Mips/TargetInfo/CMakeLists.txt
@@ -1,3 +1,9 @@
 add_llvm_component_library(LLVMMipsInfo
   MipsTargetInfo.cpp
+
+  LINK_COMPONENTS
+  Support
+
+  ADD_TO_COMPONENT
+  Mips
   )
diff --git a/llvm/lib/Target/Mips/TargetInfo/LLVMBuild.txt b/llvm/lib/Target/Mips/TargetInfo/LLVMBuild.txt
diff --git a/llvm/lib/Target/NVPTX/CMakeLists.txt b/llvm/lib/Target/NVPTX/CMakeLists.txt
@@ -1,3 +1,5 @@
+add_llvm_component_group(NVPTX)
+
 set(LLVM_TARGET_DEFINITIONS NVPTX.td)
 
 tablegen(LLVM NVPTXGenAsmWriter.inc -gen-asm-writer)
@@ -35,7 +37,28 @@ set(NVPTXCodeGen_sources
   NVPTXProxyRegErasure.cpp
   )
 
-add_llvm_target(NVPTXCodeGen ${NVPTXCodeGen_sources})
+add_llvm_target(NVPTXCodeGen
+  ${NVPTXCodeGen_sources}
+
+  LINK_COMPONENTS
+  Analysis
+  AsmPrinter
+  CodeGen
+  Core
+  IPO
+  MC
+  NVPTXDesc
+  NVPTXInfo
+  Scalar
+  SelectionDAG
+  Support
+  Target
+  TransformUtils
+  Vectorize
+
+  ADD_TO_COMPONENT
+  NVPTX
+)
 
 add_subdirectory(MCTargetDesc)
 add_subdirectory(TargetInfo)
diff --git a/llvm/lib/Target/NVPTX/LLVMBuild.txt b/llvm/lib/Target/NVPTX/LLVMBuild.txt
diff --git a/llvm/lib/Target/NVPTX/MCTargetDesc/CMakeLists.txt b/llvm/lib/Target/NVPTX/MCTargetDesc/CMakeLists.txt
@@ -3,4 +3,12 @@ add_llvm_component_library(LLVMNVPTXDesc
   NVPTXMCAsmInfo.cpp
   NVPTXMCTargetDesc.cpp
   NVPTXTargetStreamer.cpp
+
+  LINK_COMPONENTS
+  MC
+  NVPTXInfo
+  Support
+
+  ADD_TO_COMPONENT
+  NVPTX
   )
diff --git a/llvm/lib/Target/NVPTX/MCTargetDesc/LLVMBuild.txt b/llvm/lib/Target/NVPTX/MCTargetDesc/LLVMBuild.txt
diff --git a/llvm/lib/Target/NVPTX/TargetInfo/CMakeLists.txt b/llvm/lib/Target/NVPTX/TargetInfo/CMakeLists.txt
@@ -1,3 +1,9 @@
 add_llvm_component_library(LLVMNVPTXInfo
   NVPTXTargetInfo.cpp
+
+  LINK_COMPONENTS
+  Support
+
+  ADD_TO_COMPONENT
+  NVPTX
   )
diff --git a/llvm/lib/Target/NVPTX/TargetInfo/LLVMBuild.txt b/llvm/lib/Target/NVPTX/TargetInfo/LLVMBuild.txt
diff --git a/llvm/lib/Target/PowerPC/AsmParser/CMakeLists.txt b/llvm/lib/Target/PowerPC/AsmParser/CMakeLists.txt
@@ -1,3 +1,13 @@
 add_llvm_component_library(LLVMPowerPCAsmParser
   PPCAsmParser.cpp
+
+  LINK_COMPONENTS
+  MC
+  MCParser
+  PowerPCDesc
+  PowerPCInfo
+  Support
+
+  ADD_TO_COMPONENT
+  PowerPC
   )
diff --git a/llvm/lib/Target/PowerPC/AsmParser/LLVMBuild.txt b/llvm/lib/Target/PowerPC/AsmParser/LLVMBuild.txt
diff --git a/llvm/lib/Target/PowerPC/CMakeLists.txt b/llvm/lib/Target/PowerPC/CMakeLists.txt
@@ -1,3 +1,5 @@
+add_llvm_component_group(PowerPC HAS_JIT)
+
 set(LLVM_TARGET_DEFINITIONS PPC.td)
 
 tablegen(LLVM PPCGenAsmMatcher.inc -gen-asm-matcher)
@@ -55,6 +57,24 @@ add_llvm_target(PowerPCCodeGen
   GISel/PPCCallLowering.cpp
   GISel/PPCRegisterBankInfo.cpp
   GISel/PPCLegalizerInfo.cpp
+
+  LINK_COMPONENTS
+  Analysis
+  AsmPrinter
+  CodeGen
+  Core
+  MC
+  PowerPCDesc
+  PowerPCInfo
+  Scalar
+  SelectionDAG
+  Support
+  Target
+  TransformUtils
+  GlobalISel
+
+  ADD_TO_COMPONENT
+  PowerPC
   )
 
 add_subdirectory(AsmParser)

diff --git a/llvm/lib/Target/PowerPC/Disassembler/CMakeLists.txt b/llvm/lib/Target/PowerPC/Disassembler/CMakeLists.txt
@@ -1,3 +1,11 @@
 add_llvm_component_library(LLVMPowerPCDisassembler
   PPCDisassembler.cpp
+
+  LINK_COMPONENTS
+  MCDisassembler
+  PowerPCInfo
+  Support
+
+  ADD_TO_COMPONENT
+  PowerPC
   )
diff --git a/llvm/lib/Target/PowerPC/Disassembler/LLVMBuild.txt b/llvm/lib/Target/PowerPC/Disassembler/LLVMBuild.txt
diff --git a/llvm/lib/Target/PowerPC/LLVMBuild.txt b/llvm/lib/Target/PowerPC/LLVMBuild.txt
diff --git a/llvm/lib/Target/PowerPC/MCTargetDesc/CMakeLists.txt b/llvm/lib/Target/PowerPC/MCTargetDesc/CMakeLists.txt
@@ -9,4 +9,13 @@ add_llvm_component_library(LLVMPowerPCDesc
   PPCELFObjectWriter.cpp
   PPCXCOFFObjectWriter.cpp
   PPCELFStreamer.cpp
+
+  LINK_COMPONENTS
+  MC
+  PowerPCInfo
+  Support
+  BinaryFormat
+
+  ADD_TO_COMPONENT
+  PowerPC
   )
diff --git a/llvm/lib/Target/PowerPC/MCTargetDesc/LLVMBuild.txt b/llvm/lib/Target/PowerPC/MCTargetDesc/LLVMBuild.txt
diff --git a/llvm/lib/Target/PowerPC/TargetInfo/CMakeLists.txt b/llvm/lib/Target/PowerPC/TargetInfo/CMakeLists.txt
@@ -1,3 +1,9 @@
 add_llvm_component_library(LLVMPowerPCInfo
   PowerPCTargetInfo.cpp
+
+  LINK_COMPONENTS
+  Support
+
+  ADD_TO_COMPONENT
+  PowerPC
   )
diff --git a/llvm/lib/Target/PowerPC/TargetInfo/LLVMBuild.txt b/llvm/lib/Target/PowerPC/TargetInfo/LLVMBuild.txt
diff --git a/llvm/lib/Target/RISCV/AsmParser/CMakeLists.txt b/llvm/lib/Target/RISCV/AsmParser/CMakeLists.txt
@@ -1,3 +1,14 @@
 add_llvm_component_library(LLVMRISCVAsmParser
   RISCVAsmParser.cpp
+
+  LINK_COMPONENTS
+  MC
+  MCParser
+  RISCVDesc
+  RISCVInfo
+  RISCVUtils
+  Support
+
+  ADD_TO_COMPONENT
+  RISCV
   )
diff --git a/llvm/lib/Target/RISCV/AsmParser/LLVMBuild.txt b/llvm/lib/Target/RISCV/AsmParser/LLVMBuild.txt
diff --git a/llvm/lib/Target/RISCV/CMakeLists.txt b/llvm/lib/Target/RISCV/CMakeLists.txt
@@ -1,3 +1,5 @@
+add_llvm_component_group(RISCV)
+
 set(LLVM_TARGET_DEFINITIONS RISCV.td)
 
 tablegen(LLVM RISCVGenAsmMatcher.inc -gen-asm-matcher)
@@ -35,6 +37,23 @@ add_llvm_target(RISCVCodeGen
   RISCVTargetMachine.cpp
   RISCVTargetObjectFile.cpp
   RISCVTargetTransformInfo.cpp
+
+  LINK_COMPONENTS
+  Analysis
+  AsmPrinter
+  Core
+  CodeGen
+  MC
+  RISCVDesc
+  RISCVInfo
+  RISCVUtils
+  SelectionDAG
+  Support
+  Target
+  GlobalISel
+
+  ADD_TO_COMPONENT
+  RISCV
   )
 
 add_subdirectory(AsmParser)

diff --git a/llvm/lib/Target/RISCV/Disassembler/CMakeLists.txt b/llvm/lib/Target/RISCV/Disassembler/CMakeLists.txt
@@ -1,3 +1,11 @@
 add_llvm_component_library(LLVMRISCVDisassembler
   RISCVDisassembler.cpp
+
+  LINK_COMPONENTS
+  MCDisassembler
+  RISCVInfo
+  Support
+
+  ADD_TO_COMPONENT
+  RISCV
   )
diff --git a/llvm/lib/Target/RISCV/Disassembler/LLVMBuild.txt b/llvm/lib/Target/RISCV/Disassembler/LLVMBuild.txt
diff --git a/llvm/lib/Target/RISCV/LLVMBuild.txt b/llvm/lib/Target/RISCV/LLVMBuild.txt
diff --git a/llvm/lib/Target/RISCV/MCTargetDesc/CMakeLists.txt b/llvm/lib/Target/RISCV/MCTargetDesc/CMakeLists.txt
@@ -8,4 +8,13 @@ add_llvm_component_library(LLVMRISCVDesc
   RISCVMCTargetDesc.cpp
   RISCVTargetStreamer.cpp
   RISCVELFStreamer.cpp
+
+  LINK_COMPONENTS
+  MC
+  RISCVInfo
+  RISCVUtils
+  Support
+
+  ADD_TO_COMPONENT
+  RISCV
 )
diff --git a/llvm/lib/Target/RISCV/MCTargetDesc/LLVMBuild.txt b/llvm/lib/Target/RISCV/MCTargetDesc/LLVMBuild.txt
diff --git a/llvm/lib/Target/RISCV/TargetInfo/CMakeLists.txt b/llvm/lib/Target/RISCV/TargetInfo/CMakeLists.txt
@@ -1,3 +1,9 @@
 add_llvm_component_library(LLVMRISCVInfo
   RISCVTargetInfo.cpp
+
+  LINK_COMPONENTS
+  Support
+
+  ADD_TO_COMPONENT
+  RISCV
   )
diff --git a/llvm/lib/Target/RISCV/TargetInfo/LLVMBuild.txt b/llvm/lib/Target/RISCV/TargetInfo/LLVMBuild.txt
diff --git a/llvm/lib/Target/RISCV/Utils/CMakeLists.txt b/llvm/lib/Target/RISCV/Utils/CMakeLists.txt
@@ -1,4 +1,10 @@
 add_llvm_component_library(LLVMRISCVUtils
   RISCVBaseInfo.cpp
   RISCVMatInt.cpp
+
+  LINK_COMPONENTS
+  Support
+
+  ADD_TO_COMPONENT
+  RISCV
   )
diff --git a/llvm/lib/Target/RISCV/Utils/LLVMBuild.txt b/llvm/lib/Target/RISCV/Utils/LLVMBuild.txt
diff --git a/llvm/lib/Target/Sparc/AsmParser/CMakeLists.txt b/llvm/lib/Target/Sparc/AsmParser/CMakeLists.txt
@@ -1,3 +1,13 @@
 add_llvm_component_library(LLVMSparcAsmParser
   SparcAsmParser.cpp
+
+  LINK_COMPONENTS
+  MC
+  MCParser
+  SparcDesc
+  SparcInfo
+  Support
+
+  ADD_TO_COMPONENT
+  Sparc
   )
diff --git a/llvm/lib/Target/Sparc/AsmParser/LLVMBuild.txt b/llvm/lib/Target/Sparc/AsmParser/LLVMBuild.txt
diff --git a/llvm/lib/Target/Sparc/CMakeLists.txt b/llvm/lib/Target/Sparc/CMakeLists.txt
@@ -1,3 +1,5 @@
+add_llvm_component_group(Sparc HAS_JIT)
+
 set(LLVM_TARGET_DEFINITIONS Sparc.td)
 
 tablegen(LLVM SparcGenAsmMatcher.inc -gen-asm-matcher)
@@ -26,6 +28,20 @@ add_llvm_target(SparcCodeGen
   SparcTargetMachine.cpp
   SparcMCInstLower.cpp
   SparcTargetObjectFile.cpp
+
+  LINK_COMPONENTS
+  AsmPrinter
+  CodeGen
+  Core
+  MC
+  SelectionDAG
+  SparcDesc
+  SparcInfo
+  Support
+  Target
+
+  ADD_TO_COMPONENT
+  Sparc
   )
 
 add_subdirectory(AsmParser)

diff --git a/llvm/lib/Target/Sparc/Disassembler/CMakeLists.txt b/llvm/lib/Target/Sparc/Disassembler/CMakeLists.txt
@@ -1,3 +1,11 @@
 add_llvm_component_library(LLVMSparcDisassembler
   SparcDisassembler.cpp
+
+  LINK_COMPONENTS
+  MCDisassembler
+  SparcInfo
+  Support
+
+  ADD_TO_COMPONENT
+  Sparc
   )
diff --git a/llvm/lib/Target/Sparc/Disassembler/LLVMBuild.txt b/llvm/lib/Target/Sparc/Disassembler/LLVMBuild.txt
diff --git a/llvm/lib/Target/Sparc/LLVMBuild.txt b/llvm/lib/Target/Sparc/LLVMBuild.txt
diff --git a/llvm/lib/Target/Sparc/MCTargetDesc/CMakeLists.txt b/llvm/lib/Target/Sparc/MCTargetDesc/CMakeLists.txt
@@ -7,4 +7,12 @@ add_llvm_component_library(LLVMSparcDesc
   SparcMCTargetDesc.cpp
   SparcMCExpr.cpp
   SparcTargetStreamer.cpp
+
+  LINK_COMPONENTS
+  MC
+  SparcInfo
+  Support
+
+  ADD_TO_COMPONENT
+  Sparc
   )
diff --git a/llvm/lib/Target/Sparc/MCTargetDesc/LLVMBuild.txt b/llvm/lib/Target/Sparc/MCTargetDesc/LLVMBuild.txt
diff --git a/llvm/lib/Target/Sparc/TargetInfo/CMakeLists.txt b/llvm/lib/Target/Sparc/TargetInfo/CMakeLists.txt
@@ -1,3 +1,9 @@
 add_llvm_component_library(LLVMSparcInfo
   SparcTargetInfo.cpp
+
+  LINK_COMPONENTS
+  Support
+
+  ADD_TO_COMPONENT
+  Sparc
   )
diff --git a/llvm/lib/Target/Sparc/TargetInfo/LLVMBuild.txt b/llvm/lib/Target/Sparc/TargetInfo/LLVMBuild.txt
diff --git a/llvm/lib/Target/SystemZ/AsmParser/CMakeLists.txt b/llvm/lib/Target/SystemZ/AsmParser/CMakeLists.txt
@@ -1,3 +1,13 @@
 add_llvm_component_library(LLVMSystemZAsmParser
   SystemZAsmParser.cpp
+
+  LINK_COMPONENTS
+  MC
+  MCParser
+  Support
+  SystemZDesc
+  SystemZInfo
+
+  ADD_TO_COMPONENT
+  SystemZ
   )
diff --git a/llvm/lib/Target/SystemZ/AsmParser/LLVMBuild.txt b/llvm/lib/Target/SystemZ/AsmParser/LLVMBuild.txt
diff --git a/llvm/lib/Target/SystemZ/CMakeLists.txt b/llvm/lib/Target/SystemZ/CMakeLists.txt
@@ -1,3 +1,5 @@
+add_llvm_component_group(SystemZ HAS_JIT)
+
 set(LLVM_TARGET_DEFINITIONS SystemZ.td)
 
 tablegen(LLVM SystemZGenAsmMatcher.inc -gen-asm-matcher)
@@ -36,6 +38,22 @@ add_llvm_target(SystemZCodeGen
   SystemZTargetMachine.cpp
   SystemZTargetTransformInfo.cpp
   SystemZTDC.cpp
+
+  LINK_COMPONENTS
+  Analysis
+  AsmPrinter
+  CodeGen
+  Core
+  MC
+  Scalar
+  SelectionDAG
+  Support
+  SystemZDesc
+  SystemZInfo
+  Target
+
+  ADD_TO_COMPONENT
+  SystemZ
   )
 
 add_subdirectory(AsmParser)

diff --git a/llvm/lib/Target/SystemZ/Disassembler/CMakeLists.txt b/llvm/lib/Target/SystemZ/Disassembler/CMakeLists.txt
@@ -1,3 +1,13 @@
 add_llvm_component_library(LLVMSystemZDisassembler
   SystemZDisassembler.cpp
+
+  LINK_COMPONENTS
+  MC
+  MCDisassembler
+  Support
+  SystemZDesc
+  SystemZInfo
+
+  ADD_TO_COMPONENT
+  SystemZ
   )
diff --git a/llvm/lib/Target/SystemZ/Disassembler/LLVMBuild.txt b/llvm/lib/Target/SystemZ/Disassembler/LLVMBuild.txt
diff --git a/llvm/lib/Target/SystemZ/LLVMBuild.txt b/llvm/lib/Target/SystemZ/LLVMBuild.txt
diff --git a/llvm/lib/Target/SystemZ/MCTargetDesc/CMakeLists.txt b/llvm/lib/Target/SystemZ/MCTargetDesc/CMakeLists.txt
@@ -5,4 +5,12 @@ add_llvm_component_library(LLVMSystemZDesc
   SystemZMCCodeEmitter.cpp
   SystemZMCObjectWriter.cpp
   SystemZMCTargetDesc.cpp
+
+  LINK_COMPONENTS
+  MC
+  Support
+  SystemZInfo
+
+  ADD_TO_COMPONENT
+  SystemZ
   )
diff --git a/llvm/lib/Target/SystemZ/MCTargetDesc/LLVMBuild.txt b/llvm/lib/Target/SystemZ/MCTargetDesc/LLVMBuild.txt
diff --git a/llvm/lib/Target/SystemZ/TargetInfo/CMakeLists.txt b/llvm/lib/Target/SystemZ/TargetInfo/CMakeLists.txt
@@ -1,3 +1,9 @@
 add_llvm_component_library(LLVMSystemZInfo
   SystemZTargetInfo.cpp
+
+  LINK_COMPONENTS
+  Support
+
+  ADD_TO_COMPONENT
+  SystemZ
   )
diff --git a/llvm/lib/Target/SystemZ/TargetInfo/LLVMBuild.txt b/llvm/lib/Target/SystemZ/TargetInfo/LLVMBuild.txt
diff --git a/llvm/lib/Target/VE/AsmParser/CMakeLists.txt b/llvm/lib/Target/VE/AsmParser/CMakeLists.txt
@@ -1,3 +1,13 @@
 add_llvm_component_library(LLVMVEAsmParser
   VEAsmParser.cpp
+
+  LINK_COMPONENTS
+  MC
+  MCParser
+  VEDesc
+  VEInfo
+  Support
+
+  ADD_TO_COMPONENT
+  VE
   )
diff --git a/llvm/lib/Target/VE/AsmParser/LLVMBuild.txt b/llvm/lib/Target/VE/AsmParser/LLVMBuild.txt
diff --git a/llvm/lib/Target/VE/CMakeLists.txt b/llvm/lib/Target/VE/CMakeLists.txt
@@ -1,3 +1,5 @@
+add_llvm_component_group(VE)
+
 set(LLVM_TARGET_DEFINITIONS VE.td)
 
 tablegen(LLVM VEGenRegisterInfo.inc -gen-register-info)
@@ -22,6 +24,21 @@ add_llvm_target(VECodeGen
   VERegisterInfo.cpp
   VESubtarget.cpp
   VETargetMachine.cpp
+
+  LINK_COMPONENTS
+  Analysis
+  AsmPrinter
+  CodeGen
+  Core
+  MC
+  SelectionDAG
+  VEDesc
+  VEInfo
+  Support
+  Target
+
+  ADD_TO_COMPONENT
+  VE
   )
 
 add_subdirectory(AsmParser)