Index: llvm/CMakeLists.txt
===================================================================
--- llvm/CMakeLists.txt
+++ llvm/CMakeLists.txt
@@ -721,26 +721,8 @@
 #  - We generate the library table used by llvm-config.
 #
 
-set(LLVMCONFIGLIBRARYDEPENDENCIESINC
-  "${LLVM_BINARY_DIR}/tools/llvm-config/LibraryDependencies.inc")
-
-# Create the list of optional components that are enabled
-if (LLVM_USE_INTEL_JITEVENTS)
-  set(LLVMOPTIONALCOMPONENTS IntelJITEvents)
-endif (LLVM_USE_INTEL_JITEVENTS)
-if (LLVM_USE_OPROFILE)
-  set(LLVMOPTIONALCOMPONENTS ${LLVMOPTIONALCOMPONENTS} OProfileJIT)
-endif (LLVM_USE_OPROFILE)
-if (LLVM_USE_PERF)
-  set(LLVMOPTIONALCOMPONENTS ${LLVMOPTIONALCOMPONENTS} PerfJITEvents)
-endif (LLVM_USE_PERF)
-
-message(STATUS "Constructing LLVMBuild project information")
+set(LLVMCONFIGLIBRARYDEPENDENCIESINC "${LLVM_BINARY_DIR}/tools/llvm-config/LibraryDependencies.inc")
 include(LLVM-Build)
-LLVMBuildLoad()
-LLVMBuildGenerateCFragment(COMPONENTS ${LLVMBuildComponents} OUTPUT ${LLVMCONFIGLIBRARYDEPENDENCIESINC})
-LLVMBuildGenerateCMakeFragment(COMPONENTS ${LLVMBuildComponents})
-
 
 ######
 
Index: llvm/LLVMBuild.cmake
===================================================================
--- llvm/LLVMBuild.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-LLVMBuildCommon(
-	SUBDIRECTORIES bindings lib projects
-)
-LLVMBuildComponent(
-	TYPE Group
-	NAME Miscellaneous
-	PARENT $ROOT
-)
Index: llvm/bindings/LLVMBuild.cmake
===================================================================
--- llvm/bindings/LLVMBuild.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-LLVMBuildComponent(
-	TYPE Group
-	NAME Bindings
-	PARENT $ROOT
-)
Index: llvm/cmake/modules/AddLLVM.cmake
===================================================================
--- llvm/cmake/modules/AddLLVM.cmake
+++ llvm/cmake/modules/AddLLVM.cmake
@@ -614,6 +614,13 @@
     endif()
   endif()
 
+  if(ARG_STATIC)
+    set(libtype PUBLIC)
+  else()
+    # We can use PRIVATE since SO knows its dependent libs.
+    set(libtype PRIVATE)
+  endif()
+
   if(ARG_MODULE AND LLVM_EXPORT_SYMBOLS_FOR_PLUGINS AND ARG_PLUGIN_TOOL AND (WIN32 OR CYGWIN))
     # On DLL platforms symbols are imported from the tool by linking against it.
     set(llvm_libs ${ARG_PLUGIN_TOOL})
@@ -621,10 +628,10 @@
     if (LLVM_LINK_LLVM_DYLIB AND NOT ARG_DISABLE_LLVM_LINK_LLVM_DYLIB)
       set(llvm_libs LLVM)
     else()
-      llvm_map_components_to_libnames(llvm_libs
-       ${ARG_LINK_COMPONENTS}
-       ${LLVM_LINK_COMPONENTS}
-       )
+        llvm_map_components_to_libnames(llvm_libs
+            ${ARG_LINK_COMPONENTS}
+            ${LLVM_LINK_COMPONENTS}
+        )
     endif()
   else()
     # Components have not been defined explicitly in CMake, so add the
@@ -633,14 +640,9 @@
     # It would be nice to verify that we have the dependencies for this library
     # name, but using get_property(... SET) doesn't suffice to determine if a
     # property has been set to an empty value.
-    get_property(lib_deps GLOBAL PROPERTY LLVMBUILD_LIB_DEPS_${name})
-  endif()
-
-  if(ARG_STATIC)
-    set(libtype PUBLIC)
-  else()
-    # We can use PRIVATE since SO knows its dependent libs.
-    set(libtype PRIVATE)
+    set_property(TARGET ${name} PROPERTY LLVM_LINK_COMPONENTS ${ARG_LINK_COMPONENTS} ${LLVM_LINK_COMPONENTS})
+    set_property(TARGET ${name} PROPERTY LLVM_LINK_LIBS ${ARG_LINK_LIBS})
+    set_property(TARGET ${name} PROPERTY LLVM_LIBTYPE ${libtype})
   endif()
 
   target_link_libraries(${name} ${libtype}
@@ -722,7 +724,26 @@
 endfunction()
 
 function(add_llvm_component_library name)
-  add_llvm_library(${name} COMPONENT_LIB ${ARGN})
+  cmake_parse_arguments(ARG
+    "COMPONENT_HAS_JIT"
+    "COMPONENT_PARENT;COMPONENT_NAME;ADD_TO_COMPONENT"
+    ""
+    ${ARGN})
+  add_llvm_library(${name} COMPONENT_LIB ${ARG_UNPARSED_ARGUMENTS})
+  string(REGEX REPLACE "^LLVM" "" component_name ${name})
+  set_property(TARGET ${name} PROPERTY LLVM_COMPONENT_NAME ${component_name})
+  if(ARG_COMPONENT_NAME)
+      set_property(GLOBAL PROPERTY LLVM_COMPONENT_NAME_${ARG_COMPONENT_NAME} ${component_name})
+  endif()
+
+  if(ARG_COMPONENT_HAS_JIT)
+      set_property(TARGET ${name} PROPERTY LLVM_HAS_JIT TRUE)
+  endif()
+
+  if(ARG_ADD_TO_COMPONENT)
+      set_property(TARGET ${ARG_ADD_TO_COMPONENT} APPEND PROPERTY LLVM_LINK_COMPONENTS ${component_name})
+  endif()
+
 endfunction()
 
 macro(add_llvm_library name)
Index: llvm/cmake/modules/LLVM-Build.cmake
===================================================================
--- llvm/cmake/modules/LLVM-Build.cmake
+++ llvm/cmake/modules/LLVM-Build.cmake
@@ -1,190 +1,27 @@
-# Declare directory hierarchy for LLVMBuild.
-# Accepts a single multi-value-keyword SUBDIRECTORIES followed by any number
-# of subdirectories, relative to CMAKE_CURRENT_LIST_DIR
-function(LLVMBuildCommon)
-    cmake_parse_arguments(ARG "" "" "SUBDIRECTORIES" ${ARGN})
-    foreach(subdirectory ${ARG_SUBDIRECTORIES})
-        include(${CMAKE_CURRENT_LIST_DIR}/${subdirectory}/LLVMBuild.cmake)
-    endforeach()
-endfunction()
-
-# Build a single component. See llvm/docs/LLVMBuild.rst for the exact argument
-# description for each component type.
-#
-# This function is sensible to the LLVMOPTIONALCOMPONENTS, LLVM_NATIVE_ARCH and
-# LLVM_TARGETS_TO_BUILD variables.
-#
-function(LLVMBuildComponent)
-
-    cmake_parse_arguments(COMPONENT "" "TYPE;NAME;PARENT" "" ${ARGN})
-    set_property(GLOBAL PROPERTY LLVMBUILD_TYPE_${COMPONENT_NAME} ${COMPONENT_TYPE})
-
-    if(COMPONENT_TYPE STREQUAL "Group")
-        set_property(GLOBAL PROPERTY LLVMBUILD_PARENT_${COMPONENT_NAME} ${COMPONENT_PARENT})
-        cmake_parse_arguments(GRP "" "" "" ${COMPONENT_UNPARSED_ARGUMENTS})
-        if(GRP_UNPARSED_ARGUMENTS)
-            message(SEND_ERROR "Unsupported arguments for ${COMPONENT_NAME}: ${GRP_UNPARSED_ARGUMENTS}")
-        endif()
-
-    elseif(COMPONENT_TYPE STREQUAL "Library" OR COMPONENT_TYPE STREQUAL "OptionalLibrary")
-        # parse component specific arguments
-        cmake_parse_arguments(LIB
-            "" "LIBRARY_NAME;ADD_TO_LIBRARY_GROUPS;INSTALLED" "REQUIRED_LIBRARIES"
-            ${COMPONENT_UNPARSED_ARGUMENTS})
-        # minimal argument checking
-        if(LIB_UNPARSED_ARGUMENTS)
-            message(SEND_ERROR "Unsupported arguments for ${COMPONENT_NAME}: ${LIB_UNPARSED_ARGUMENTS}")
-        endif()
-        # skip non specified optional libraries
-        if(COMPONENT_TYPE STREQUAL "OptionalLibrary" AND NOT ${COMPONENT_NAME} IN_LIST LLVMOPTIONALCOMPONENTS)
-            return()
-        endif()
-        # only do that now to orphan non-selected optional libraries
-        set_property(GLOBAL PROPERTY LLVMBUILD_PARENT_${COMPONENT_NAME} ${COMPONENT_PARENT})
-        # sanitize arguments
-        if(NOT LIB_LIBRARY_NAME)
-            set(LIB_LIBRARY_NAME "${COMPONENT_NAME}")
-        endif()
-
-        if(NOT DEFINED ${LIB_INSTALLED} OR ${LIB_INSTALLED})
-            set(IsInstalled "true")
-        else()
-            set(IsInstalled "false")
-        endif()
-
-        set_property(GLOBAL APPEND PROPERTY LLVMBUILD_COMPONENTS ${COMPONENT_NAME})
-        set_property(GLOBAL PROPERTY LLVMBUILD_LIB_NAME_${COMPONENT_NAME} ${LIB_LIBRARY_NAME})
-        set_property(GLOBAL PROPERTY LLVMBUILD_INSTALLED_${COMPONENT_NAME} ${IsInstalled})
-        set_property(GLOBAL APPEND PROPERTY LLVMBUILD_LIB_DEPS_${COMPONENT_NAME} ${LIB_REQUIRED_LIBRARIES})
-        if(LIB_ADD_TO_LIBRARY_GROUPS)
-            set_property(GLOBAL APPEND PROPERTY LLVMBUILD_LIB_DEPS_${LIB_ADD_TO_LIBRARY_GROUPS} ${COMPONENT_NAME})
-        endif()
-
-    elseif(COMPONENT_TYPE STREQUAL "LibraryGroup")
-        cmake_parse_arguments(LIBGROUP
-            "" "" "REQUIRED_LIBRARIES;ADD_TO_LIBRARY_GROUPS"
-            ${COMPONENT_UNPARSED_ARGUMENTS})
-        if(LIBGROUP_UNPARSED_ARGUMENTS)
-            message(SEND_ERROR "Unsupported arguments for ${COMPONENT_NAME}: ${LIBGROUP_UNPARSED_ARGUMENTS}")
-        endif()
-        set_property(GLOBAL PROPERTY LLVMBUILD_PARENT_${COMPONENT_NAME} ${COMPONENT_PARENT})
-        # special group handling
-        if(COMPONENT_NAME STREQUAL "all-targets")
-            if(LIBGROUP_REQUIRED_LIBRARIES OR LIBGROUP_ADD_TO_LIBRARY_GROUPS)
-                message(SEND_ERROR "Special component ${COMPONENT_NAME} must have empty properties")
-            endif()
-            list(APPEND LIBGROUP_REQUIRED_LIBRARIES ${LLVM_TARGETS_TO_BUILD})
-        elseif(COMPONENT_NAME STREQUAL "Native")
-            if(LIBGROUP_REQUIRED_LIBRARIES OR LIBGROUP_ADD_TO_LIBRARY_GROUPS)
-                message(SEND_ERROR "Special component ${COMPONENT_NAME} must have empty properties")
-            endif()
-            list(APPEND LIBGROUP_REQUIRED_LIBRARIES ${LLVM_NATIVE_ARCH})
-        elseif(COMPONENT_NAME STREQUAL "NativeCodeGen")
-            if(LIBGROUP_REQUIRED_LIBRARIES OR LIBGROUP_ADD_TO_LIBRARY_GROUPS)
-                message(SEND_ERROR "Special component ${COMPONENT_NAME} must have empty properties")
-            endif()
-            list(APPEND LIBGROUP_REQUIRED_LIBRARIES ${LLVM_NATIVE_ARCH}CodeGen)
-        elseif(COMPONENT_NAME STREQUAL "Engine")
-            if(LIBGROUP_REQUIRED_LIBRARIES OR LIBGROUP_ADD_TO_LIBRARY_GROUPS)
-                message(SEND_ERROR "Special component ${COMPONENT_NAME} must have empty properties")
-            endif()
-            # defered to second phase, when all components are known
-        endif()
-
-        set_property(GLOBAL APPEND PROPERTY LLVMBUILD_COMPONENTS ${COMPONENT_NAME})
-        set_property(GLOBAL PROPERTY LLVMBUILD_INSTALLED_${COMPONENT_NAME} true)
-        set_property(GLOBAL APPEND PROPERTY LLVMBUILD_LIB_DEPS_${COMPONENT_NAME} ${LIBGROUP_REQUIRED_LIBRARIES})
-        if(LIBGROUP_ADD_TO_LIBRARY_GROUPS)
-            set_property(GLOBAL APPEND PROPERTY LLVMBUILD_LIB_DEPS_${LIBGROUP_ADD_TO_LIBRARY_GROUPS} ${COMPONENT_NAME})
-        endif()
-
-    elseif(COMPONENT_TYPE STREQUAL "TargetGroup")
-        cmake_parse_arguments(TGTGROUP
-            "" "HAS_JIT" "REQUIRED_LIBRARIES;ADD_TO_LIBRARY_GROUPS"
-            ${COMPONENT_UNPARSED_ARGUMENTS})
-        if(NOT ${COMPONENT_NAME} IN_LIST LLVM_TARGETS_TO_BUILD)
-            return()
-        endif()
-        # only do that now to orphan non-selected architectures
-        set_property(GLOBAL PROPERTY LLVMBUILD_PARENT_${COMPONENT_NAME} ${COMPONENT_PARENT})
-        if(NOT DEFINED TGTGROUP_HAS_JIT)
-            set(TGTGROUP_HAS_JIT "false")
-        endif()
-        set_property(GLOBAL APPEND PROPERTY LLVMBUILD_COMPONENTS ${COMPONENT_NAME})
-        set_property(GLOBAL PROPERTY LLVMBUILD_HAS_JIT_${COMPONENT_NAME} ${TGTGROUP_HAS_JIT})
-        set_property(GLOBAL PROPERTY LLVMBUILD_INSTALLED_${COMPONENT_NAME} true)
-        set_property(GLOBAL APPEND PROPERTY LLVMBUILD_LIB_DEPS_${COMPONENT_NAME} ${TGTGROUP_REQUIRED_LIBRARIES})
-        if(TGTGROUP_ADD_TO_LIBRARY_GROUPS)
-            set_property(GLOBAL APPEND PROPERTY LLVMBUILD_LIB_DEPS_${TGTGROUP_ADD_TO_LIBRARY_GROUPS} ${COMPONENT_NAME})
-        endif()
-    else()
-        message(SEND_ERROR "Unsupported component type ${COMPONENT_TYPE}")
-    endif()
-endfunction()
-
-# Process the LLVMBuild.cmake hierachy, starting from `${LLVM_MAIN_SRC_DIR}/LLVMBuild.cmake`
-#
-# Sets LLVMBuildComponents to the list of live components of the component hierarchy (a component is live if it has $Root as ancestor).
-#
-# For each component named `component_name` in this list, and each of the component property named `property_name`,
-# sets a global property named LLVMBUILD_LIB_${property_name}_${component_name} to the value of that property.
-#
-function(LLVMBuildLoad)
-    # Read the component info.
-    include(${LLVM_MAIN_SRC_DIR}/LLVMBuild.cmake)
-
-    # Special handling for has_jit property.
-    get_property(llvmbuild_has_jit_native GLOBAL PROPERTY LLVMBUILD_HAS_JIT_${LLVM_NATIVE_ARCH})
-    if(llvmbuild_has_jit_native)
-        set_property(GLOBAL APPEND PROPERTY LLVMBUILD_LIB_DEPS_Engine "MCJIT" "Native")
-    else()
-        set_property(GLOBAL APPEND PROPERTY LLVMBUILD_LIB_DEPS_Engine "Interpreter")
-    endif()
-
-    # Compute live components a component is alive if its parent is alive. $ROOT is always alive.
-    get_property(llvmbuild_components GLOBAL PROPERTY LLVMBUILD_COMPONENTS)
-    foreach(llvmbuild_component ${llvmbuild_components})
-        get_property(llvmbuild_parent GLOBAL PROPERTY LLVMBUILD_LIB_NAME_${llvmbuild_component})
-        if(llvmbuild_componentname STREQUAL "all")
-            message(SEND_ERROR "Reserved component name ${llvmbuild_componentname}")
-        endif()
-
-        set(llvmbuild_child ${llvmbuild_component})
-        while(llvmbuild_child)
-            get_property(llvmbuild_parent GLOBAL PROPERTY LLVMBUILD_PARENT_${llvmbuild_child})
-            if(llvmbuild_parent STREQUAL "$ROOT")
-                get_property(llvmbuild_type GLOBAL PROPERTY LLVMBUILD_TYPE_${llvmbuild_component})
-                # Group components are no longer useful past this point
-                if(llvmbuild_type STREQUAL "Group")
-                    break()
-                else()
-                    list(APPEND llvmbuild_final_components ${llvmbuild_component})
-                    break()
-                endif()
-            else()
-                set(llvmbuild_child ${llvmbuild_parent})
-            endif()
-        endwhile()
-    endforeach()
-
-    # Add the special `all` component
-    set_property(GLOBAL APPEND PROPERTY LLVMBUILD_LIB_DEPS_all ${llvmbuild_final_components})
-    set_property(GLOBAL APPEND PROPERTY LLVMBUILD_INSTALLED_all true)
-    list(APPEND llvmbuild_final_components "all")
-
-    set(LLVMBuildComponents ${llvmbuild_final_components} PARENT_SCOPE)
-
-
-endfunction()
+add_custom_target(all-targets)
+add_custom_target(Engine)
+set_property(TARGET all-targets PROPERTY LLVM_LINK_COMPONENTS ${LLVM_TARGETS_TO_BUILD})
+add_custom_target(Native)
+set_property(TARGET Native PROPERTY LLVM_LINK_COMPONENTS ${LLVM_NATIVE_ARCH})
+add_custom_target(NativeCodeGen)
+set_property(TARGET NativeCodeGen PROPERTY LLVM_LINK_COMPONENTS ${LLVM_NATIVE_ARCH}CodeGen)
 
 # Generate C code in the file provided as OUTPUT that describes the properties
-# of all components listed in COMPONENTS. This C code is suitable for inclusion
-# in `llvm-config`
+# of all components. This C code is suitable for inclusion in `llvm-config`
 function(LLVMBuildGenerateCFragment)
-    cmake_parse_arguments(ARG "" "OUTPUT" "COMPONENTS" ${ARGN})
+    cmake_parse_arguments(ARG "" "OUTPUT" "" ${ARGN})
     # Write C header
     #################
-    list(LENGTH ARG_COMPONENTS llvmbuild_components_size)
+    get_property(llvmbuild_components GLOBAL PROPERTY LLVM_COMPONENT_LIBS)
+    list(APPEND llvmbuild_components all-targets)
+    list(APPEND llvmbuild_components Engine)
+    list(APPEND llvmbuild_components Native)
+    list(APPEND llvmbuild_components NativeCodeGen)
+    foreach(llvm_target_to_build ${LLVM_TARGETS_TO_BUILD})
+        list(APPEND llvmbuild_components ${llvm_target_to_build})
+    endforeach()
+
+    list(LENGTH llvmbuild_components llvmbuild_components_size)
     file(WRITE ${ARG_OUTPUT}
         "
     struct AvailableComponent {
@@ -202,10 +39,9 @@
     } AvailableComponents[${llvmbuild_components_size}] = {
     ")
 
-    foreach(llvmbuild_component ${ARG_COMPONENTS})
-        get_property(llvmbuild_libname GLOBAL PROPERTY LLVMBUILD_LIB_NAME_${llvmbuild_component})
-        get_property(llvmbuild_installed GLOBAL PROPERTY LLVMBUILD_INSTALLED_${llvmbuild_component})
-        get_property(llvmbuild_libdeps GLOBAL PROPERTY LLVMBUILD_LIB_DEPS_${llvmbuild_component})
+    foreach(llvmbuild_component ${llvmbuild_components})
+        get_property(llvmbuild_libname TARGET ${llvmbuild_component} PROPERTY LLVM_COMPONENT_NAME)
+        get_property(llvmbuild_libdeps TARGET ${llvmbuild_component} PROPERTY LLVM_LINK_COMPONENTS)
         string(TOLOWER ${llvmbuild_component} llvmbuild_componentname)
 
         if(NOT llvmbuild_libname)
@@ -217,7 +53,7 @@
         endif()
         set(llvmbuild_clibdeps "")
         foreach(llvmbuild_libdep ${llvmbuild_libdeps})
-            get_property(llvmbuild_libdepname GLOBAL PROPERTY LLVMBUILD_LIB_NAME_${llvmbuild_libdep})
+            get_property(llvmbuild_libdepname GLOBAL PROPERTY LLVM_COMPONENT_NAME_${llvmbuild_libdep})
             if(NOT llvmbuild_libdepname)
                 string(TOLOWER ${llvmbuild_libdep} llvmbuild_clibdep)
             else()
@@ -228,7 +64,7 @@
         list(TRANSFORM llvmbuild_clibdeps PREPEND "\"")
         list(TRANSFORM llvmbuild_clibdeps APPEND "\"")
         list(JOIN llvmbuild_clibdeps ", " llvmbuild_clibdeps_joint)
-        list(APPEND llvmbuild_centries "{ \"${llvmbuild_libname}\", ${llvmbuild_llvmlibname}, ${llvmbuild_installed}, {${llvmbuild_clibdeps_joint}} },\n")
+        list(APPEND llvmbuild_centries "{ \"${llvmbuild_libname}\", ${llvmbuild_llvmlibname}, true, {${llvmbuild_clibdeps_joint}} },\n")
     endforeach()
     list(SORT llvmbuild_centries)
     foreach(llvmbuild_centry ${llvmbuild_centries})
@@ -237,22 +73,21 @@
     file(APPEND ${ARG_OUTPUT} "};")
 endfunction()
 
-# Set global property LLVMBUILD_LIB_DEPS_LLVM${component_libname} to the list
-# of libraries component_libname` depends on, for each component listed in
-# COMPONENTS.
-
-function(LLVMBuildGenerateCMakeFragment)
-    cmake_parse_arguments(ARG "" "" "COMPONENTS" ${ARGN})
-
-    foreach(llvmbuild_component ${ARG_COMPONENTS})
-        get_property(llvmbuild_libname GLOBAL PROPERTY LLVMBUILD_LIB_NAME_${llvmbuild_component})
-        if(llvmbuild_libname)
-            get_property(llvmbuild_libdeps GLOBAL PROPERTY LLVMBUILD_LIB_DEPS_${llvmbuild_component})
-            foreach(llvmbuild_dep ${llvmbuild_libdeps})
-                get_property(llvmbuild_depname GLOBAL PROPERTY LLVMBUILD_LIB_NAME_${llvmbuild_dep})
-                set_property(GLOBAL APPEND PROPERTY LLVMBUILD_LIB_DEPS_LLVM${llvmbuild_libname} LLVM${llvmbuild_depname})
-            endforeach()
-        endif()
-    endforeach()
-
+# Resolve cross-componenet dependencies, for each available component.
+function(LLVMBuildResolveComponentsLink)
+  get_property(llvm_components GLOBAL PROPERTY LLVM_COMPONENT_LIBS)
+  get_property(llvm_has_jit_native TARGET ${LLVM_NATIVE_ARCH} PROPERTY LLVM_HAS_JIT)
+  if(llvm_has_jit_native)
+    set_property(TARGET Engine APPEND PROPERTY LLVM_LINK_COMPONENTS "MCJIT" "Native")
+  else()
+    set_property(TARGET Engine APPEND PROPERTY LLVM_LINK_COMPONENTS "Interpreter")
+  endif()
+  foreach(llvm_component ${llvm_components})
+    get_property(link_components TARGET ${llvm_component} PROPERTY LLVM_LINK_COMPONENTS)
+    llvm_map_components_to_libnames(llvm_libs ${link_components})
+    if(llvm_libs)
+      get_property(libtype TARGET ${llvm_component} PROPERTY LLVM_LIBTYPE)
+      target_link_libraries(${llvm_component} ${libtype} ${llvm_libs})
+    endif()
+  endforeach()
 endfunction()
Index: llvm/cmake/modules/LLVM-Config.cmake
===================================================================
--- llvm/cmake/modules/LLVM-Config.cmake
+++ llvm/cmake/modules/LLVM-Config.cmake
@@ -253,6 +253,10 @@
   # Translate symbolic component names to real libraries:
   llvm_expand_pseudo_components(link_components ${link_components})
   foreach(c ${link_components})
+    get_property(c_rename GLOBAL PROPERTY LLVM_COMPONENT_NAME_${c})
+    if(c_rename)
+        set(c ${c_rename})
+    endif()
     if( c STREQUAL "native" )
       # already processed
     elseif( c STREQUAL "backend" )
Index: llvm/lib/Analysis/CMakeLists.txt
===================================================================
--- llvm/lib/Analysis/CMakeLists.txt
+++ llvm/lib/Analysis/CMakeLists.txt
@@ -135,4 +135,7 @@
 
   LINK_LIBS
   ${MLLinkDeps}
+
+  COMPONENT_PARENT Libraries
+  LINK_COMPONENTS BinaryFormat Core Object ProfileData Support
   )
Index: llvm/lib/Analysis/LLVMBuild.cmake
===================================================================
--- llvm/lib/Analysis/LLVMBuild.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME Analysis
-	PARENT Libraries
-	REQUIRED_LIBRARIES BinaryFormat Core Object ProfileData Support
-)
Index: llvm/lib/AsmParser/CMakeLists.txt
===================================================================
--- llvm/lib/AsmParser/CMakeLists.txt
+++ llvm/lib/AsmParser/CMakeLists.txt
@@ -9,4 +9,6 @@
 
   DEPENDS
   intrinsics_gen
+  COMPONENT_PARENT Libraries
+  LINK_COMPONENTS BinaryFormat Core Support
   )
Index: llvm/lib/AsmParser/LLVMBuild.cmake
===================================================================
--- llvm/lib/AsmParser/LLVMBuild.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME AsmParser
-	PARENT Libraries
-	REQUIRED_LIBRARIES BinaryFormat Core Support
-)
Index: llvm/lib/BinaryFormat/CMakeLists.txt
===================================================================
--- llvm/lib/BinaryFormat/CMakeLists.txt
+++ llvm/lib/BinaryFormat/CMakeLists.txt
@@ -13,5 +13,8 @@
 
   ADDITIONAL_HEADER_DIRS
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/BinaryFormat
+
+  COMPONENT_PARENT Libraries
+  LINK_COMPONENTS Support
   )
   
Index: llvm/lib/BinaryFormat/LLVMBuild.cmake
===================================================================
--- llvm/lib/BinaryFormat/LLVMBuild.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME BinaryFormat
-	PARENT Libraries
-	REQUIRED_LIBRARIES Support
-)
Index: llvm/lib/Bitcode/LLVMBuild.cmake
===================================================================
--- llvm/lib/Bitcode/LLVMBuild.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-LLVMBuildCommon(
-	SUBDIRECTORIES Reader Writer
-)
-LLVMBuildComponent(
-	TYPE Group
-	NAME Bitcode
-	PARENT Libraries
-)
Index: llvm/lib/Bitcode/Reader/CMakeLists.txt
===================================================================
--- llvm/lib/Bitcode/Reader/CMakeLists.txt
+++ llvm/lib/Bitcode/Reader/CMakeLists.txt
@@ -10,4 +10,7 @@
 
   DEPENDS
   intrinsics_gen
+
+  COMPONENT_PARENT Bitcode
+  LINK_COMPONENTS BitstreamReader Core Support
   )
Index: llvm/lib/Bitcode/Reader/LLVMBuild.cmake
===================================================================
--- llvm/lib/Bitcode/Reader/LLVMBuild.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME BitReader
-	PARENT Bitcode
-	REQUIRED_LIBRARIES BitstreamReader Core Support
-)
Index: llvm/lib/Bitcode/Writer/CMakeLists.txt
===================================================================
--- llvm/lib/Bitcode/Writer/CMakeLists.txt
+++ llvm/lib/Bitcode/Writer/CMakeLists.txt
@@ -6,4 +6,7 @@
 
   DEPENDS
   intrinsics_gen
+
+  COMPONENT_PARENT Bitcode
+  LINK_COMPONENTS Analysis Core MC Object Support
   )
Index: llvm/lib/Bitcode/Writer/LLVMBuild.cmake
===================================================================
--- llvm/lib/Bitcode/Writer/LLVMBuild.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME BitWriter
-	PARENT Bitcode
-	REQUIRED_LIBRARIES Analysis Core MC Object Support
-)
Index: llvm/lib/Bitstream/LLVMBuild.cmake
===================================================================
--- llvm/lib/Bitstream/LLVMBuild.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-LLVMBuildCommon(
-	SUBDIRECTORIES Reader
-)
-LLVMBuildComponent(
-	TYPE Group
-	NAME Bitstream
-	PARENT Libraries
-)
Index: llvm/lib/Bitstream/Reader/CMakeLists.txt
===================================================================
--- llvm/lib/Bitstream/Reader/CMakeLists.txt
+++ llvm/lib/Bitstream/Reader/CMakeLists.txt
@@ -4,4 +4,6 @@
   ADDITIONAL_HEADER_DIRS
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/Bitcode
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/Bitstream
+  COMPONENT_PARENTBitstream
+  LINK_COMPONENTS Support
   )
Index: llvm/lib/Bitstream/Reader/LLVMBuild.cmake
===================================================================
--- llvm/lib/Bitstream/Reader/LLVMBuild.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME BitstreamReader
-	PARENT Bitstream
-	REQUIRED_LIBRARIES Support
-)
Index: llvm/lib/CMakeLists.txt
===================================================================
--- llvm/lib/CMakeLists.txt
+++ llvm/lib/CMakeLists.txt
@@ -37,3 +37,6 @@
   add_subdirectory(Testing)
 endif()
 add_subdirectory(WindowsManifest)
+
+LLVMBuildResolveComponentsLink()
+LLVMBuildGenerateCFragment(OUTPUT ${LLVMCONFIGLIBRARYDEPENDENCIESINC})
Index: llvm/lib/CodeGen/AsmPrinter/CMakeLists.txt
===================================================================
--- llvm/lib/CodeGen/AsmPrinter/CMakeLists.txt
+++ llvm/lib/CodeGen/AsmPrinter/CMakeLists.txt
@@ -27,4 +27,7 @@
 
   DEPENDS
   intrinsics_gen
+
+  COMPONENT_PARENT Libraries
+  LINK_COMPONENTS Analysis BinaryFormat CodeGen Core DebugInfoCodeView DebugInfoDWARF DebugInfoMSF MC MCParser Remarks Support Target
   )
Index: llvm/lib/CodeGen/AsmPrinter/LLVMBuild.cmake
===================================================================
--- llvm/lib/CodeGen/AsmPrinter/LLVMBuild.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME AsmPrinter
-	PARENT Libraries
-	REQUIRED_LIBRARIES Analysis BinaryFormat CodeGen Core DebugInfoCodeView DebugInfoDWARF DebugInfoMSF MC MCParser Remarks Support Target
-)
Index: llvm/lib/CodeGen/CMakeLists.txt
===================================================================
--- llvm/lib/CodeGen/CMakeLists.txt
+++ llvm/lib/CodeGen/CMakeLists.txt
@@ -196,6 +196,11 @@
 
   DEPENDS
   intrinsics_gen
+
+  COMPONENT_PARENT Libraries
+
+  LINK_COMPONENTS Analysis BitReader BitWriter Core MC ProfileData Scalar Support Target TransformUtils
+
   )
 
 add_subdirectory(SelectionDAG)
Index: llvm/lib/CodeGen/GlobalISel/CMakeLists.txt
===================================================================
--- llvm/lib/CodeGen/GlobalISel/CMakeLists.txt
+++ llvm/lib/CodeGen/GlobalISel/CMakeLists.txt
@@ -29,4 +29,7 @@
 
         DEPENDS
         intrinsics_gen
+
+        COMPONENT_PARENT CodeGen
+        LINK_COMPONENTS Analysis CodeGen Core MC SelectionDAG Support Target TransformUtils
   )
Index: llvm/lib/CodeGen/GlobalISel/LLVMBuild.cmake
===================================================================
--- llvm/lib/CodeGen/GlobalISel/LLVMBuild.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME GlobalISel
-	PARENT CodeGen
-	REQUIRED_LIBRARIES Analysis CodeGen Core MC SelectionDAG Support Target TransformUtils
-)
Index: llvm/lib/CodeGen/LLVMBuild.cmake
===================================================================
--- llvm/lib/CodeGen/LLVMBuild.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-LLVMBuildCommon(
-	SUBDIRECTORIES AsmPrinter SelectionDAG MIRParser GlobalISel
-)
-LLVMBuildComponent(
-	TYPE Library
-	NAME CodeGen
-	PARENT Libraries
-	REQUIRED_LIBRARIES Analysis BitReader BitWriter Core MC ProfileData Scalar Support Target TransformUtils
-)
Index: llvm/lib/CodeGen/MIRParser/CMakeLists.txt
===================================================================
--- llvm/lib/CodeGen/MIRParser/CMakeLists.txt
+++ llvm/lib/CodeGen/MIRParser/CMakeLists.txt
@@ -8,4 +8,7 @@
 
   DEPENDS
   intrinsics_gen
+
+  COMPONENT_PARENT CodeGen
+  LINK_COMPONENTS AsmParser BinaryFormat CodeGen Core MC Support Target
   )
Index: llvm/lib/CodeGen/MIRParser/LLVMBuild.cmake
===================================================================
--- llvm/lib/CodeGen/MIRParser/LLVMBuild.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME MIRParser
-	PARENT CodeGen
-	REQUIRED_LIBRARIES AsmParser BinaryFormat CodeGen Core MC Support Target
-)
Index: llvm/lib/CodeGen/SelectionDAG/CMakeLists.txt
===================================================================
--- llvm/lib/CodeGen/SelectionDAG/CMakeLists.txt
+++ llvm/lib/CodeGen/SelectionDAG/CMakeLists.txt
@@ -27,4 +27,7 @@
 
   DEPENDS
   intrinsics_gen
+
+  COMPONENT_PARENT CodeGen
+  LINK_COMPONENTS Analysis CodeGen Core MC Support Target TransformUtils
   )
Index: llvm/lib/CodeGen/SelectionDAG/LLVMBuild.cmake
===================================================================
--- llvm/lib/CodeGen/SelectionDAG/LLVMBuild.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME SelectionDAG
-	PARENT CodeGen
-	REQUIRED_LIBRARIES Analysis CodeGen Core MC Support Target TransformUtils
-)
Index: llvm/lib/DWARFLinker/CMakeLists.txt
===================================================================
--- llvm/lib/DWARFLinker/CMakeLists.txt
+++ llvm/lib/DWARFLinker/CMakeLists.txt
@@ -9,4 +9,6 @@
 
   DEPENDS
   intrinsics_gen
+  COMPONENT_PARENT Libraries
+  LINK_COMPONENTS DebugInfoDWARF AsmPrinter CodeGen MC Object Support
   )
Index: llvm/lib/DWARFLinker/LLVMBuild.cmake
===================================================================
--- llvm/lib/DWARFLinker/LLVMBuild.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME DWARFLinker
-	PARENT Libraries
-	REQUIRED_LIBRARIES DebugInfoDWARF AsmPrinter CodeGen MC Object Support
-)
Index: llvm/lib/DebugInfo/CodeView/CMakeLists.txt
===================================================================
--- llvm/lib/DebugInfo/CodeView/CMakeLists.txt
+++ llvm/lib/DebugInfo/CodeView/CMakeLists.txt
@@ -42,4 +42,6 @@
 
   ADDITIONAL_HEADER_DIRS
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/DebugInfo/CodeView
+  COMPONENT_PARENT DebugInfo
+  LINK_COMPONENTS Support DebugInfoMSF
   )
Index: llvm/lib/DebugInfo/CodeView/LLVMBuild.cmake
===================================================================
--- llvm/lib/DebugInfo/CodeView/LLVMBuild.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME DebugInfoCodeView
-	PARENT DebugInfo
-	REQUIRED_LIBRARIES Support DebugInfoMSF
-)
Index: llvm/lib/DebugInfo/DWARF/CMakeLists.txt
===================================================================
--- llvm/lib/DebugInfo/DWARF/CMakeLists.txt
+++ llvm/lib/DebugInfo/DWARF/CMakeLists.txt
@@ -31,4 +31,6 @@
   ADDITIONAL_HEADER_DIRS
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/DebugInfo/DWARF
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/DebugInfo
+  COMPONENT_PARENT DebugInfo
+ LINK_COMPONENTS BinaryFormat Object MC Support
   )
Index: llvm/lib/DebugInfo/DWARF/LLVMBuild.cmake
===================================================================
--- llvm/lib/DebugInfo/DWARF/LLVMBuild.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME DebugInfoDWARF
-	PARENT DebugInfo
-	REQUIRED_LIBRARIES BinaryFormat Object MC Support
-)
Index: llvm/lib/DebugInfo/GSYM/CMakeLists.txt
===================================================================
--- llvm/lib/DebugInfo/GSYM/CMakeLists.txt
+++ llvm/lib/DebugInfo/GSYM/CMakeLists.txt
@@ -1,7 +1,3 @@
-set(LLVM_LINK_COMPONENTS
-  DebugInfoDWARF
-  )
-
 add_llvm_component_library(LLVMDebugInfoGSYM
   DwarfTransformer.cpp
   Header.cpp
@@ -21,4 +17,6 @@
 
   DEPENDS
   LLVMMC
+  COMPONENT_PARENT DebugInfo
+  LINK_COMPONENTS MC Object Support DebugInfoDWARF
   )
Index: llvm/lib/DebugInfo/GSYM/LLVMBuild.cmake
===================================================================
--- llvm/lib/DebugInfo/GSYM/LLVMBuild.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME DebugInfoGSYM
-	PARENT DebugInfo
-	REQUIRED_LIBRARIES MC Object Support DebugInfoDWARF
-)
Index: llvm/lib/DebugInfo/LLVMBuild.cmake
===================================================================
--- llvm/lib/DebugInfo/LLVMBuild.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-LLVMBuildCommon(
-	SUBDIRECTORIES DWARF GSYM MSF CodeView PDB Symbolize
-)
-LLVMBuildComponent(
-	TYPE Group
-	NAME DebugInfo
-	PARENT $ROOT
-)
Index: llvm/lib/DebugInfo/MSF/CMakeLists.txt
===================================================================
--- llvm/lib/DebugInfo/MSF/CMakeLists.txt
+++ llvm/lib/DebugInfo/MSF/CMakeLists.txt
@@ -5,4 +5,6 @@
   MSFError.cpp
   ADDITIONAL_HEADER_DIRS
   "${LLVM_MAIN_INCLUDE_DIR}/llvm/DebugInfo/MSF"
+  COMPONENT_PARENT DebugInfo
+  LINK_COMPONENTS Support
   )
Index: llvm/lib/DebugInfo/MSF/LLVMBuild.cmake
===================================================================
--- llvm/lib/DebugInfo/MSF/LLVMBuild.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME DebugInfoMSF
-	PARENT DebugInfo
-	REQUIRED_LIBRARIES Support
-)
Index: llvm/lib/DebugInfo/PDB/CMakeLists.txt
===================================================================
--- llvm/lib/DebugInfo/PDB/CMakeLists.txt
+++ llvm/lib/DebugInfo/PDB/CMakeLists.txt
@@ -134,6 +134,8 @@
 
   ADDITIONAL_HEADER_DIRS
   ${LIBPDB_ADDITIONAL_HEADER_DIRS}
+  COMPONENT_PARENT DebugInfo
+  LINK_COMPONENTS BinaryFormat Object Support DebugInfoCodeView DebugInfoMSF
   )
 
 target_link_libraries(LLVMDebugInfoPDB INTERFACE "${LIBPDB_ADDITIONAL_LIBRARIES}")
Index: llvm/lib/DebugInfo/PDB/LLVMBuild.cmake
===================================================================
--- llvm/lib/DebugInfo/PDB/LLVMBuild.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME DebugInfoPDB
-	PARENT DebugInfo
-	REQUIRED_LIBRARIES BinaryFormat Object Support DebugInfoCodeView DebugInfoMSF
-)
Index: llvm/lib/DebugInfo/Symbolize/CMakeLists.txt
===================================================================
--- llvm/lib/DebugInfo/Symbolize/CMakeLists.txt
+++ llvm/lib/DebugInfo/Symbolize/CMakeLists.txt
@@ -5,4 +5,6 @@
 
   ADDITIONAL_HEADER_DIRS
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/DebugInfo/Symbolize
+  COMPONENT_PARENT DebugInfo
+  LINK_COMPONENTS DebugInfoDWARF DebugInfoPDB Object Support Demangle
   )
Index: llvm/lib/DebugInfo/Symbolize/LLVMBuild.cmake
===================================================================
--- llvm/lib/DebugInfo/Symbolize/LLVMBuild.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME Symbolize
-	PARENT DebugInfo
-	REQUIRED_LIBRARIES DebugInfoDWARF DebugInfoPDB Object Support Demangle
-)
Index: llvm/lib/Demangle/CMakeLists.txt
===================================================================
--- llvm/lib/Demangle/CMakeLists.txt
+++ llvm/lib/Demangle/CMakeLists.txt
@@ -6,4 +6,6 @@
 
   ADDITIONAL_HEADER_DIRS
   "${LLVM_MAIN_INCLUDE_DIR}/llvm/Demangle"
+
+  COMPONENT_PARENT Libraries
 )
Index: llvm/lib/Demangle/LLVMBuild.cmake
===================================================================
--- llvm/lib/Demangle/LLVMBuild.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME Demangle
-	PARENT Libraries
-)
Index: llvm/lib/ExecutionEngine/CMakeLists.txt
===================================================================
--- llvm/lib/ExecutionEngine/CMakeLists.txt
+++ llvm/lib/ExecutionEngine/CMakeLists.txt
@@ -12,6 +12,9 @@
 
   DEPENDS
   intrinsics_gen
+
+  COMPONENT_PARENT Libraries
+  LINK_COMPONENTS Core MC Object RuntimeDyld Support Target
   )
 
 if(BUILD_SHARED_LIBS)
Index: llvm/lib/ExecutionEngine/IntelJITEvents/CMakeLists.txt
===================================================================
--- llvm/lib/ExecutionEngine/IntelJITEvents/CMakeLists.txt
+++ llvm/lib/ExecutionEngine/IntelJITEvents/CMakeLists.txt
@@ -12,6 +12,9 @@
   jitprofiling.c
 
   LINK_LIBS ${LLVM_INTEL_JIT_LIBS}
+
+  COMPONENT_PARENT ExecutionEngine
+  LINK_COMPONENTS CodeGen Core DebugInfoDWARF Support Object ExecutionEngine
 )
 
 add_dependencies(LLVMIntelJITEvents LLVMCodeGen)
Index: llvm/lib/ExecutionEngine/IntelJITEvents/LLVMBuild.cmake
===================================================================
--- llvm/lib/ExecutionEngine/IntelJITEvents/LLVMBuild.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-LLVMBuildCommon(
-)
-LLVMBuildComponent(
-	TYPE OptionalLibrary
-	NAME IntelJITEvents
-	PARENT ExecutionEngine
-	REQUIRED_LIBRARIES CodeGen Core DebugInfoDWARF Support Object ExecutionEngine
-)
Index: llvm/lib/ExecutionEngine/Interpreter/CMakeLists.txt
===================================================================
--- llvm/lib/ExecutionEngine/Interpreter/CMakeLists.txt
+++ llvm/lib/ExecutionEngine/Interpreter/CMakeLists.txt
@@ -13,6 +13,9 @@
 
   DEPENDS
   intrinsics_gen
+
+  COMPONENT_PARENT ExecutionEngine
+  LINK_COMPONENTS CodeGen Core ExecutionEngine Support
   )
 
 if( LLVM_ENABLE_FFI )
Index: llvm/lib/ExecutionEngine/Interpreter/LLVMBuild.cmake
===================================================================
--- llvm/lib/ExecutionEngine/Interpreter/LLVMBuild.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME Interpreter
-	PARENT ExecutionEngine
-	REQUIRED_LIBRARIES CodeGen Core ExecutionEngine Support
-)
Index: llvm/lib/ExecutionEngine/JITLink/CMakeLists.txt
===================================================================
--- llvm/lib/ExecutionEngine/JITLink/CMakeLists.txt
+++ llvm/lib/ExecutionEngine/JITLink/CMakeLists.txt
@@ -17,6 +17,8 @@
 
   DEPENDS
   intrinsics_gen
+  COMPONENT_PARENT ExecutionEngine
+  LINK_COMPONENTS BinaryFormat Object Support
   )
  
 target_link_libraries(LLVMJITLink
Index: llvm/lib/ExecutionEngine/JITLink/LLVMBuild.cmake
===================================================================
--- llvm/lib/ExecutionEngine/JITLink/LLVMBuild.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME JITLink
-	PARENT ExecutionEngine
-	REQUIRED_LIBRARIES BinaryFormat Object Support
-)
Index: llvm/lib/ExecutionEngine/LLVMBuild.cmake
===================================================================
--- llvm/lib/ExecutionEngine/LLVMBuild.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-LLVMBuildCommon(
-	SUBDIRECTORIES Interpreter MCJIT JITLink RuntimeDyld IntelJITEvents OProfileJIT Orc OrcError PerfJITEvents
-)
-LLVMBuildComponent(
-	TYPE Library
-	NAME ExecutionEngine
-	PARENT Libraries
-	REQUIRED_LIBRARIES Core MC Object RuntimeDyld Support Target
-)
Index: llvm/lib/ExecutionEngine/MCJIT/CMakeLists.txt
===================================================================
--- llvm/lib/ExecutionEngine/MCJIT/CMakeLists.txt
+++ llvm/lib/ExecutionEngine/MCJIT/CMakeLists.txt
@@ -3,4 +3,7 @@
 
   DEPENDS
   intrinsics_gen
+
+  COMPONENT_PARENT ExecutionEngine
+  LINK_COMPONENTS Core ExecutionEngine Object RuntimeDyld Support Target
   )
Index: llvm/lib/ExecutionEngine/MCJIT/LLVMBuild.cmake
===================================================================
--- llvm/lib/ExecutionEngine/MCJIT/LLVMBuild.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME MCJIT
-	PARENT ExecutionEngine
-	REQUIRED_LIBRARIES Core ExecutionEngine Object RuntimeDyld Support Target
-)
Index: llvm/lib/ExecutionEngine/OProfileJIT/CMakeLists.txt
===================================================================
--- llvm/lib/ExecutionEngine/OProfileJIT/CMakeLists.txt
+++ llvm/lib/ExecutionEngine/OProfileJIT/CMakeLists.txt
@@ -4,4 +4,6 @@
 add_llvm_component_library(LLVMOProfileJIT
   OProfileJITEventListener.cpp
   OProfileWrapper.cpp
+  COMPONENT_PARENT ExecutionEngine
+  LINK_COMPONENTS DebugInfoDWARF Support Object ExecutionEngine
   )
Index: llvm/lib/ExecutionEngine/OProfileJIT/LLVMBuild.cmake
===================================================================
--- llvm/lib/ExecutionEngine/OProfileJIT/LLVMBuild.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-LLVMBuildCommon(
-)
-LLVMBuildComponent(
-	TYPE OptionalLibrary
-	NAME OProfileJIT
-	PARENT ExecutionEngine
-	REQUIRED_LIBRARIES DebugInfoDWARF Support Object ExecutionEngine
-)
Index: llvm/lib/ExecutionEngine/Orc/CMakeLists.txt
===================================================================
--- llvm/lib/ExecutionEngine/Orc/CMakeLists.txt
+++ llvm/lib/ExecutionEngine/Orc/CMakeLists.txt
@@ -29,6 +29,11 @@
 
   DEPENDS
   intrinsics_gen
+
+  COMPONENT_PARENT ExecutionEngine
+  LINK_COMPONENTS Core ExecutionEngine JITLink Object OrcError MC Passes RuntimeDyld Support Target TransformUtils
+
+
   )
 
 target_link_libraries(LLVMOrcJIT
Index: llvm/lib/ExecutionEngine/Orc/LLVMBuild.cmake
===================================================================
--- llvm/lib/ExecutionEngine/Orc/LLVMBuild.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME OrcJIT
-	PARENT ExecutionEngine
-	REQUIRED_LIBRARIES Core ExecutionEngine JITLink Object OrcError MC Passes RuntimeDyld Support Target TransformUtils
-)
Index: llvm/lib/ExecutionEngine/OrcError/CMakeLists.txt
===================================================================
--- llvm/lib/ExecutionEngine/OrcError/CMakeLists.txt
+++ llvm/lib/ExecutionEngine/OrcError/CMakeLists.txt
@@ -3,4 +3,6 @@
   RPCError.cpp
   ADDITIONAL_HEADER_DIRS
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/ExecutionEngine/Orc
+  COMPONENT_PARENT ExecutionEngine
+  LINK_COMPONENTS Support
   )
Index: llvm/lib/ExecutionEngine/OrcError/LLVMBuild.cmake
===================================================================
--- llvm/lib/ExecutionEngine/OrcError/LLVMBuild.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME OrcError
-	PARENT ExecutionEngine
-	REQUIRED_LIBRARIES Support
-)
Index: llvm/lib/ExecutionEngine/PerfJITEvents/CMakeLists.txt
===================================================================
--- llvm/lib/ExecutionEngine/PerfJITEvents/CMakeLists.txt
+++ llvm/lib/ExecutionEngine/PerfJITEvents/CMakeLists.txt
@@ -1,5 +1,7 @@
 add_llvm_component_library(LLVMPerfJITEvents
   PerfJITEventListener.cpp
+  COMPONENT_PARENT ExecutionEngine
+  LINK_COMPONENTS CodeGen Core DebugInfoDWARF ExecutionEngine Object Support
   )
 
 add_dependencies(LLVMPerfJITEvents LLVMCodeGen)
Index: llvm/lib/ExecutionEngine/PerfJITEvents/LLVMBuild.cmake
===================================================================
--- llvm/lib/ExecutionEngine/PerfJITEvents/LLVMBuild.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-LLVMBuildComponent(
-	TYPE OptionalLibrary
-	NAME PerfJITEvents
-	PARENT ExecutionEngine
-	REQUIRED_LIBRARIES CodeGen Core DebugInfoDWARF ExecutionEngine Object Support
-)
Index: llvm/lib/ExecutionEngine/RuntimeDyld/CMakeLists.txt
===================================================================
--- llvm/lib/ExecutionEngine/RuntimeDyld/CMakeLists.txt
+++ llvm/lib/ExecutionEngine/RuntimeDyld/CMakeLists.txt
@@ -10,4 +10,8 @@
 
   DEPENDS
   intrinsics_gen
+
+  COMPONENT_PARENT ExecutionEngine
+
+  LINK_COMPONENTS Core MC Object Support
   )
Index: llvm/lib/ExecutionEngine/RuntimeDyld/LLVMBuild.cmake
===================================================================
--- llvm/lib/ExecutionEngine/RuntimeDyld/LLVMBuild.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME RuntimeDyld
-	PARENT ExecutionEngine
-	REQUIRED_LIBRARIES Core MC Object Support
-)
Index: llvm/lib/Extensions/CMakeLists.txt
===================================================================
--- llvm/lib/Extensions/CMakeLists.txt
+++ llvm/lib/Extensions/CMakeLists.txt
@@ -1,3 +1,5 @@
 add_llvm_component_library(LLVMExtensions
     Extensions.cpp
+    COMPONENT_PARENT Libraries
+    LINK_COMPONENTS Support
 )
Index: llvm/lib/Extensions/LLVMBuild.cmake
===================================================================
--- llvm/lib/Extensions/LLVMBuild.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME Extensions
-	PARENT Libraries
-	REQUIRED_LIBRARIES Support
-)
Index: llvm/lib/Frontend/LLVMBuild.cmake
===================================================================
--- llvm/lib/Frontend/LLVMBuild.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-LLVMBuildCommon(
-	SUBDIRECTORIES OpenMP
-)
-LLVMBuildComponent(
-	TYPE Group
-	NAME Frontend
-	PARENT Libraries
-)
Index: llvm/lib/Frontend/OpenMP/CMakeLists.txt
===================================================================
--- llvm/lib/Frontend/OpenMP/CMakeLists.txt
+++ llvm/lib/Frontend/OpenMP/CMakeLists.txt
@@ -15,4 +15,6 @@
   intrinsics_gen
   omp_gen
   omp_cpp
+  COMPONENT_PARENT Frontend
+  LINK_COMPONENTS Core Support TransformUtils
   )
Index: llvm/lib/Frontend/OpenMP/LLVMBuild.cmake
===================================================================
--- llvm/lib/Frontend/OpenMP/LLVMBuild.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME FrontendOpenMP
-	PARENT Frontend
-	REQUIRED_LIBRARIES Core Support TransformUtils
-)
Index: llvm/lib/FuzzMutate/CMakeLists.txt
===================================================================
--- llvm/lib/FuzzMutate/CMakeLists.txt
+++ llvm/lib/FuzzMutate/CMakeLists.txt
@@ -10,4 +10,7 @@
 
   DEPENDS
   intrinsics_gen
+
+  COMPONENT_PARENT Libraries
+  LINK_COMPONENTS Analysis BitReader BitWriter Core Scalar Support Target
   )
Index: llvm/lib/FuzzMutate/LLVMBuild.cmake
===================================================================
--- llvm/lib/FuzzMutate/LLVMBuild.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME FuzzMutate
-	PARENT Libraries
-	REQUIRED_LIBRARIES Analysis BitReader BitWriter Core Scalar Support Target
-)
Index: llvm/lib/IR/CMakeLists.txt
===================================================================
--- llvm/lib/IR/CMakeLists.txt
+++ llvm/lib/IR/CMakeLists.txt
@@ -63,4 +63,7 @@
 
   DEPENDS
   intrinsics_gen
+
+  COMPONENT_PARENT Libraries
+  LINK_COMPONENTS BinaryFormat Remarks Support
   )
Index: llvm/lib/IR/LLVMBuild.cmake
===================================================================
--- llvm/lib/IR/LLVMBuild.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME Core
-	PARENT Libraries
-	REQUIRED_LIBRARIES BinaryFormat Remarks Support
-)
Index: llvm/lib/IRReader/CMakeLists.txt
===================================================================
--- llvm/lib/IRReader/CMakeLists.txt
+++ llvm/lib/IRReader/CMakeLists.txt
@@ -6,4 +6,6 @@
 
   DEPENDS
   intrinsics_gen
+  COMPONENT_PARENT Libraries
+  LINK_COMPONENTS AsmParser BitReader Core Support
   )
Index: llvm/lib/IRReader/LLVMBuild.cmake
===================================================================
--- llvm/lib/IRReader/LLVMBuild.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME IRReader
-	PARENT Libraries
-	REQUIRED_LIBRARIES AsmParser BitReader Core Support
-)
Index: llvm/lib/InterfaceStub/CMakeLists.txt
===================================================================
--- llvm/lib/InterfaceStub/CMakeLists.txt
+++ llvm/lib/InterfaceStub/CMakeLists.txt
@@ -2,4 +2,6 @@
   ELFObjHandler.cpp
   ELFStub.cpp
   TBEHandler.cpp
+  COMPONENT_PARENT Libraries
+  LINK_COMPONENTS Object Support
 )
Index: llvm/lib/InterfaceStub/LLVMBuild.cmake
===================================================================
--- llvm/lib/InterfaceStub/LLVMBuild.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME InterfaceStub
-	PARENT Libraries
-	REQUIRED_LIBRARIES Object Support
-)
Index: llvm/lib/LLVMBuild.cmake
===================================================================
--- llvm/lib/LLVMBuild.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-LLVMBuildCommon(
-	SUBDIRECTORIES  Analysis AsmParser Bitcode Bitstream CodeGen DebugInfo Demangle DWARFLinker ExecutionEngine Extensions Frontend FuzzMutate LineEditor Linker InterfaceStub IR IRReader LTO MC MCA Object BinaryFormat ObjectYAML Option Remarks Passes ProfileData Support TableGen TextAPI Target Testing ToolDrivers Transforms WindowsManifest XRay
-)
-LLVMBuildComponent(
-	TYPE Group
-	NAME Libraries
-	PARENT $ROOT
-)
Index: llvm/lib/LTO/CMakeLists.txt
===================================================================
--- llvm/lib/LTO/CMakeLists.txt
+++ llvm/lib/LTO/CMakeLists.txt
@@ -13,4 +13,8 @@
   DEPENDS
   intrinsics_gen
   llvm_vcsrevision_h
+
+  COMPONENT_PARENT Libraries
+
+  LINK_COMPONENTS AggressiveInstCombine Analysis BinaryFormat BitReader BitWriter CodeGen Core Extensions IPO InstCombine Linker MC ObjCARC Object Passes Remarks Scalar Support Target TransformUtils
 )
Index: llvm/lib/LTO/LLVMBuild.cmake
===================================================================
--- llvm/lib/LTO/LLVMBuild.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME LTO
-	PARENT Libraries
-	REQUIRED_LIBRARIES  AggressiveInstCombine Analysis BinaryFormat BitReader BitWriter CodeGen Core Extensions IPO InstCombine Linker MC ObjCARC Object Passes Remarks Scalar Support Target TransformUtils
-)
Index: llvm/lib/LineEditor/CMakeLists.txt
===================================================================
--- llvm/lib/LineEditor/CMakeLists.txt
+++ llvm/lib/LineEditor/CMakeLists.txt
@@ -10,4 +10,7 @@
 
   LINK_LIBS
   ${link_libs}
+
+  COMPONENT_PARENT Libraries
+  LINK_COMPONENTS Support
   )
Index: llvm/lib/LineEditor/LLVMBuild.cmake
===================================================================
--- llvm/lib/LineEditor/LLVMBuild.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME LineEditor
-	PARENT Libraries
-	REQUIRED_LIBRARIES Support
-)
Index: llvm/lib/Linker/CMakeLists.txt
===================================================================
--- llvm/lib/Linker/CMakeLists.txt
+++ llvm/lib/Linker/CMakeLists.txt
@@ -7,4 +7,7 @@
 
   DEPENDS
   intrinsics_gen
+
+  COMPONENT_PARENT Libraries
+  LINK_COMPONENTS  Core Support TransformUtils
   )
Index: llvm/lib/Linker/LLVMBuild.cmake
===================================================================
--- llvm/lib/Linker/LLVMBuild.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME Linker
-	PARENT Libraries
-	REQUIRED_LIBRARIES Core Support TransformUtils
-)
Index: llvm/lib/MC/CMakeLists.txt
===================================================================
--- llvm/lib/MC/CMakeLists.txt
+++ llvm/lib/MC/CMakeLists.txt
@@ -64,6 +64,9 @@
 
   ADDITIONAL_HEADER_DIRS
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/MC
+
+  COMPONENT_PARENT Libraries
+  LINK_COMPONENTS Support BinaryFormat DebugInfoCodeView
   )
 
 add_subdirectory(MCParser)
Index: llvm/lib/MC/LLVMBuild.cmake
===================================================================
--- llvm/lib/MC/LLVMBuild.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-LLVMBuildCommon(
-	SUBDIRECTORIES MCDisassembler MCParser
-)
-LLVMBuildComponent(
-	TYPE Library
-	NAME MC
-	PARENT Libraries
-	REQUIRED_LIBRARIES Support BinaryFormat DebugInfoCodeView
-)
Index: llvm/lib/MC/MCDisassembler/CMakeLists.txt
===================================================================
--- llvm/lib/MC/MCDisassembler/CMakeLists.txt
+++ llvm/lib/MC/MCDisassembler/CMakeLists.txt
@@ -4,4 +4,7 @@
   MCExternalSymbolizer.cpp
   MCRelocationInfo.cpp
   MCSymbolizer.cpp
+
+  COMPONENT_PARENT MC
+  LINK_COMPONENTS MC Support
   )
Index: llvm/lib/MC/MCDisassembler/LLVMBuild.cmake
===================================================================
--- llvm/lib/MC/MCDisassembler/LLVMBuild.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME MCDisassembler
-	PARENT MC
-	REQUIRED_LIBRARIES MC Support
-)
Index: llvm/lib/MC/MCParser/CMakeLists.txt
===================================================================
--- llvm/lib/MC/MCParser/CMakeLists.txt
+++ llvm/lib/MC/MCParser/CMakeLists.txt
@@ -14,4 +14,7 @@
 
   ADDITIONAL_HEADER_DIRS
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/MC/MCParser
+
+  COMPONENT_PARENT MC
+  LINK_COMPONENTS MC Support
   )
Index: llvm/lib/MC/MCParser/LLVMBuild.cmake
===================================================================
--- llvm/lib/MC/MCParser/LLVMBuild.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME MCParser
-	PARENT MC
-	REQUIRED_LIBRARIES MC Support
-)
Index: llvm/lib/MCA/CMakeLists.txt
===================================================================
--- llvm/lib/MCA/CMakeLists.txt
+++ llvm/lib/MCA/CMakeLists.txt
@@ -22,4 +22,6 @@
 
   ADDITIONAL_HEADER_DIRS
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/MCA
+  COMPONENT_PARENT Libraries
+  LINK_COMPONENTS MC Support
   )
Index: llvm/lib/MCA/LLVMBuild.cmake
===================================================================
--- llvm/lib/MCA/LLVMBuild.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME MCA
-	PARENT Libraries
-	REQUIRED_LIBRARIES MC Support
-)
Index: llvm/lib/Object/CMakeLists.txt
===================================================================
--- llvm/lib/Object/CMakeLists.txt
+++ llvm/lib/Object/CMakeLists.txt
@@ -35,4 +35,7 @@
   DEPENDS
   intrinsics_gen
   llvm_vcsrevision_h
+
+  COMPONENT_PARENT Libraries
+  LINK_COMPONENTS BitReader Core MC BinaryFormat MCParser Support TextAPI
   )
Index: llvm/lib/Object/LLVMBuild.cmake
===================================================================
--- llvm/lib/Object/LLVMBuild.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME Object
-	PARENT Libraries
-	REQUIRED_LIBRARIES BitReader Core MC BinaryFormat MCParser Support TextAPI
-)
Index: llvm/lib/ObjectYAML/CMakeLists.txt
===================================================================
--- llvm/lib/ObjectYAML/CMakeLists.txt
+++ llvm/lib/ObjectYAML/CMakeLists.txt
@@ -22,4 +22,6 @@
 
   ADDITIONAL_HEADER_DIRS
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/ObjectYAML
+  COMPONENT_PARENT Libraries
+  LINK_COMPONENTS BinaryFormat Object Support DebugInfoCodeView MC
   )
Index: llvm/lib/ObjectYAML/LLVMBuild.cmake
===================================================================
--- llvm/lib/ObjectYAML/LLVMBuild.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME ObjectYAML
-	PARENT Libraries
-	REQUIRED_LIBRARIES BinaryFormat Object Support DebugInfoCodeView MC
-)
Index: llvm/lib/Option/CMakeLists.txt
===================================================================
--- llvm/lib/Option/CMakeLists.txt
+++ llvm/lib/Option/CMakeLists.txt
@@ -6,4 +6,6 @@
 
   ADDITIONAL_HEADER_DIRS
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/Option
+  COMPONENT_PARENT Libraries
+  LINK_COMPONENTS Support
   )
Index: llvm/lib/Option/LLVMBuild.cmake
===================================================================
--- llvm/lib/Option/LLVMBuild.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME Option
-	PARENT Libraries
-	REQUIRED_LIBRARIES Support
-)
Index: llvm/lib/Passes/CMakeLists.txt
===================================================================
--- llvm/lib/Passes/CMakeLists.txt
+++ llvm/lib/Passes/CMakeLists.txt
@@ -9,4 +9,8 @@
 
   DEPENDS
   intrinsics_gen
+
+  COMPONENT_PARENT Libraries
+  LINK_COMPONENTS AggressiveInstCombine Analysis Core Coroutines HelloNew IPO InstCombine ObjCARC Scalar Support Target TransformUtils Vectorize Instrumentation
+
   )
Index: llvm/lib/Passes/LLVMBuild.cmake
===================================================================
--- llvm/lib/Passes/LLVMBuild.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME Passes
-	PARENT Libraries
-	REQUIRED_LIBRARIES AggressiveInstCombine Analysis Core Coroutines HelloNew IPO InstCombine ObjCARC Scalar Support Target TransformUtils Vectorize Instrumentation
-)
Index: llvm/lib/ProfileData/CMakeLists.txt
===================================================================
--- llvm/lib/ProfileData/CMakeLists.txt
+++ llvm/lib/ProfileData/CMakeLists.txt
@@ -13,6 +13,9 @@
 
   DEPENDS
   intrinsics_gen
+
+  COMPONENT_PARENT Libraries
+  LINK_COMPONENTS Core Support Demangle
   )
 
 add_subdirectory(Coverage)
Index: llvm/lib/ProfileData/Coverage/CMakeLists.txt
===================================================================
--- llvm/lib/ProfileData/Coverage/CMakeLists.txt
+++ llvm/lib/ProfileData/Coverage/CMakeLists.txt
@@ -8,4 +8,6 @@
 
   DEPENDS
   intrinsics_gen
+  COMPONENT_PARENT ProfileData
+  LINK_COMPONENTS Core Object ProfileData Support
   )
Index: llvm/lib/ProfileData/Coverage/LLVMBuild.cmake
===================================================================
--- llvm/lib/ProfileData/Coverage/LLVMBuild.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME Coverage
-	PARENT ProfileData
-	REQUIRED_LIBRARIES Core Object ProfileData Support
-)
Index: llvm/lib/ProfileData/LLVMBuild.cmake
===================================================================
--- llvm/lib/ProfileData/LLVMBuild.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-LLVMBuildCommon(
-	SUBDIRECTORIES Coverage
-)
-LLVMBuildComponent(
-	TYPE Library
-	NAME ProfileData
-	PARENT Libraries
-	REQUIRED_LIBRARIES Core Support Demangle
-)
Index: llvm/lib/Remarks/CMakeLists.txt
===================================================================
--- llvm/lib/Remarks/CMakeLists.txt
+++ llvm/lib/Remarks/CMakeLists.txt
@@ -13,4 +13,6 @@
 
   ADDITIONAL_HEADER_DIRS
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/Remarks
+  COMPONENT_PARENT Libraries
+  LINK_COMPONENTS BitstreamReader Support
 )
Index: llvm/lib/Remarks/LLVMBuild.cmake
===================================================================
--- llvm/lib/Remarks/LLVMBuild.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME Remarks
-	PARENT Libraries
-	REQUIRED_LIBRARIES BitstreamReader Support
-)
Index: llvm/lib/Support/CMakeLists.txt
===================================================================
--- llvm/lib/Support/CMakeLists.txt
+++ llvm/lib/Support/CMakeLists.txt
@@ -223,6 +223,9 @@
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/Support
   ${Backtrace_INCLUDE_DIRS}
   LINK_LIBS ${system_libs} ${imported_libs} ${delayload_flags}
+
+  COMPONENT_PARENT Libraries
+  LINK_COMPONENTS Demangle
   )
 
 set(llvm_system_libs ${system_libs})
Index: llvm/lib/Support/LLVMBuild.cmake
===================================================================
--- llvm/lib/Support/LLVMBuild.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME Support
-	PARENT Libraries
-	REQUIRED_LIBRARIES Demangle
-)
Index: llvm/lib/TableGen/CMakeLists.txt
===================================================================
--- llvm/lib/TableGen/CMakeLists.txt
+++ llvm/lib/TableGen/CMakeLists.txt
@@ -13,4 +13,6 @@
 
   ADDITIONAL_HEADER_DIRS
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/TableGen
+  COMPONENT_PARENT Libraries
+  LINK_COMPONENTS Support
   )
Index: llvm/lib/TableGen/LLVMBuild.cmake
===================================================================
--- llvm/lib/TableGen/LLVMBuild.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME TableGen
-	PARENT Libraries
-	REQUIRED_LIBRARIES Support
-)
Index: llvm/lib/Target/AArch64/AsmParser/CMakeLists.txt
===================================================================
--- llvm/lib/Target/AArch64/AsmParser/CMakeLists.txt
+++ llvm/lib/Target/AArch64/AsmParser/CMakeLists.txt
@@ -2,5 +2,7 @@
 
 add_llvm_component_library(LLVMAArch64AsmParser
   AArch64AsmParser.cpp
+  LINK_COMPONENTS AArch64Desc AArch64Info AArch64Utils MC MCParser Support
+  ADD_TO_COMPONENT AArch64
   )
 
Index: llvm/lib/Target/AArch64/AsmParser/LLVMBuild.cmake
===================================================================
--- llvm/lib/Target/AArch64/AsmParser/LLVMBuild.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME AArch64AsmParser
-	PARENT AArch64
-	REQUIRED_LIBRARIES AArch64Desc AArch64Info AArch64Utils MC MCParser Support
-	ADD_TO_LIBRARY_GROUPS AArch64
-)
Index: llvm/lib/Target/AArch64/CMakeLists.txt
===================================================================
--- llvm/lib/Target/AArch64/CMakeLists.txt
+++ llvm/lib/Target/AArch64/CMakeLists.txt
@@ -1,3 +1,6 @@
+add_custom_target(AArch64)
+set_property(TARGET AArch64 PROPERTY COMPONENT_HAS_JIT ON)
+
 set(LLVM_TARGET_DEFINITIONS AArch64.td)
 
 tablegen(LLVM AArch64GenAsmMatcher.inc -gen-asm-matcher)
@@ -74,6 +77,9 @@
 
   DEPENDS
   intrinsics_gen
+
+  LINK_COMPONENTS AArch64Desc AArch64Info AArch64Utils Analysis AsmPrinter CodeGen Core MC Scalar SelectionDAG Support Target TransformUtils GlobalISel CFGuard
+  ADD_TO_COMPONENT AArch64
 )
 
 add_subdirectory(AsmParser)
Index: llvm/lib/Target/AArch64/Disassembler/CMakeLists.txt
===================================================================
--- llvm/lib/Target/AArch64/Disassembler/CMakeLists.txt
+++ llvm/lib/Target/AArch64/Disassembler/CMakeLists.txt
@@ -3,6 +3,8 @@
 add_llvm_component_library(LLVMAArch64Disassembler
   AArch64Disassembler.cpp
   AArch64ExternalSymbolizer.cpp
+  LINK_COMPONENTS AArch64Desc AArch64Info AArch64Utils MC MCDisassembler Support
+  ADD_TO_COMPONENT AArch64
   )
 
 add_dependencies(LLVMAArch64Disassembler AArch64CommonTableGen)
Index: llvm/lib/Target/AArch64/Disassembler/LLVMBuild.cmake
===================================================================
--- llvm/lib/Target/AArch64/Disassembler/LLVMBuild.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME AArch64Disassembler
-	PARENT AArch64
-	REQUIRED_LIBRARIES AArch64Desc AArch64Info AArch64Utils MC MCDisassembler Support
-	ADD_TO_LIBRARY_GROUPS AArch64
-)
Index: llvm/lib/Target/AArch64/LLVMBuild.cmake
===================================================================
--- llvm/lib/Target/AArch64/LLVMBuild.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-LLVMBuildCommon(
-	SUBDIRECTORIES AsmParser Disassembler MCTargetDesc TargetInfo Utils
-)
-LLVMBuildComponent(
-	TYPE TargetGroup
-	NAME AArch64
-	PARENT Target
-	HAS_JIT 1
-)
-LLVMBuildComponent(
-	TYPE Library
-	NAME AArch64CodeGen
-	PARENT AArch64
-	REQUIRED_LIBRARIES AArch64Desc AArch64Info AArch64Utils Analysis AsmPrinter CodeGen Core MC Scalar SelectionDAG Support Target TransformUtils GlobalISel CFGuard
-	ADD_TO_LIBRARY_GROUPS AArch64
-)
Index: llvm/lib/Target/AArch64/MCTargetDesc/CMakeLists.txt
===================================================================
--- llvm/lib/Target/AArch64/MCTargetDesc/CMakeLists.txt
+++ llvm/lib/Target/AArch64/MCTargetDesc/CMakeLists.txt
@@ -11,6 +11,8 @@
   AArch64TargetStreamer.cpp
   AArch64WinCOFFObjectWriter.cpp
   AArch64WinCOFFStreamer.cpp
+  LINK_COMPONENTS AArch64Info AArch64Utils MC BinaryFormat Support
+  ADD_TO_COMPONENT AArch64
 )
 add_dependencies(LLVMAArch64Desc AArch64CommonTableGen)
 
Index: llvm/lib/Target/AArch64/MCTargetDesc/LLVMBuild.cmake
===================================================================
--- llvm/lib/Target/AArch64/MCTargetDesc/LLVMBuild.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME AArch64Desc
-	PARENT AArch64
-	REQUIRED_LIBRARIES AArch64Info AArch64Utils MC BinaryFormat Support
-	ADD_TO_LIBRARY_GROUPS AArch64
-)
Index: llvm/lib/Target/AArch64/TargetInfo/CMakeLists.txt
===================================================================
--- llvm/lib/Target/AArch64/TargetInfo/CMakeLists.txt
+++ llvm/lib/Target/AArch64/TargetInfo/CMakeLists.txt
@@ -2,6 +2,8 @@
 
 add_llvm_component_library(LLVMAArch64Info
   AArch64TargetInfo.cpp
+  LINK_COMPONENTS Support
+  ADD_TO_COMPONENT AArch64
   )
 
 add_dependencies(LLVMAArch64Info AArch64CommonTableGen)
Index: llvm/lib/Target/AArch64/TargetInfo/LLVMBuild.cmake
===================================================================
--- llvm/lib/Target/AArch64/TargetInfo/LLVMBuild.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME AArch64Info
-	PARENT AArch64
-	REQUIRED_LIBRARIES Support
-	ADD_TO_LIBRARY_GROUPS AArch64
-)
Index: llvm/lib/Target/AArch64/Utils/CMakeLists.txt
===================================================================
--- llvm/lib/Target/AArch64/Utils/CMakeLists.txt
+++ llvm/lib/Target/AArch64/Utils/CMakeLists.txt
@@ -1,3 +1,5 @@
 add_llvm_component_library(LLVMAArch64Utils
   AArch64BaseInfo.cpp
+  LINK_COMPONENTS Support
+  ADD_TO_COMPONENT AArch64
   )
Index: llvm/lib/Target/AArch64/Utils/LLVMBuild.cmake
===================================================================
--- llvm/lib/Target/AArch64/Utils/LLVMBuild.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME AArch64Utils
-	PARENT AArch64
-	REQUIRED_LIBRARIES Support
-	ADD_TO_LIBRARY_GROUPS AArch64
-)
Index: llvm/lib/Target/CMakeLists.txt
===================================================================
--- llvm/lib/Target/CMakeLists.txt
+++ llvm/lib/Target/CMakeLists.txt
@@ -11,6 +11,9 @@
 
   ADDITIONAL_HEADER_DIRS
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/Target
+
+  COMPONENT_PARENT Libraries
+  LINK_COMPONENTS Analysis Core MC Support
   )
 
 # When building shared objects for each target there are some internal APIs
Index: llvm/lib/Target/LLVMBuild.cmake
===================================================================
--- llvm/lib/Target/LLVMBuild.cmake
+++ /dev/null
@@ -1,52 +0,0 @@
-# Please keep these as one per line so that out-of-tree merges
-# will typically require only insertion of a line.
-
-LLVMBuildCommon(
-	SUBDIRECTORIES
-    AArch64
-    AMDGPU
-    ARC
-    ARM
-    AVR
-    BPF
-    CSKY
-    Hexagon
-    Lanai
-    MSP430
-    Mips
-    NVPTX
-    PowerPC
-    RISCV
-    Sparc
-    SystemZ
-    VE
-    WebAssembly
-    X86
-    XCore
-)
-LLVMBuildComponent(
-	TYPE LibraryGroup
-	NAME Engine
-	PARENT Libraries
-)
-LLVMBuildComponent(
-	TYPE LibraryGroup
-	NAME Native
-	PARENT Libraries
-)
-LLVMBuildComponent(
-	TYPE LibraryGroup
-	NAME NativeCodeGen
-	PARENT Libraries
-)
-LLVMBuildComponent(
-	TYPE Library
-	NAME Target
-	PARENT Libraries
-	REQUIRED_LIBRARIES Analysis Core MC Support
-)
-LLVMBuildComponent(
-	TYPE LibraryGroup
-	NAME all-targets
-	PARENT Libraries
-)
Index: llvm/lib/Target/X86/AsmParser/CMakeLists.txt
===================================================================
--- llvm/lib/Target/X86/AsmParser/CMakeLists.txt
+++ llvm/lib/Target/X86/AsmParser/CMakeLists.txt
@@ -1,3 +1,6 @@
 add_llvm_component_library(LLVMX86AsmParser
   X86AsmParser.cpp
+  COMPONENT_PARENT X86
+  LINK_COMPONENTS MC MCParser Support X86Desc X86Info
+  ADD_TO_COMPONENT X86
   )
Index: llvm/lib/Target/X86/AsmParser/LLVMBuild.cmake
===================================================================
--- llvm/lib/Target/X86/AsmParser/LLVMBuild.cmake
+++ llvm/lib/Target/X86/AsmParser/LLVMBuild.cmake
@@ -1,7 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME X86AsmParser
-	PARENT X86
-	REQUIRED_LIBRARIES MC MCParser Support X86Desc X86Info
-	ADD_TO_LIBRARY_GROUPS X86
-)
Index: llvm/lib/Target/X86/CMakeLists.txt
===================================================================
--- llvm/lib/Target/X86/CMakeLists.txt
+++ llvm/lib/Target/X86/CMakeLists.txt
@@ -1,3 +1,6 @@
+add_custom_target(X86)
+set_property(TARGET X86 PROPERTY COMPONENT_HAS_JIT ON)
+
 set(LLVM_TARGET_DEFINITIONS X86.td)
 
 tablegen(LLVM X86GenAsmMatcher.inc -gen-asm-matcher)
@@ -76,7 +79,11 @@
   X86InsertWait.cpp
   )
 
-add_llvm_target(X86CodeGen ${sources})
+add_llvm_target(X86CodeGen ${sources}
+    COMPONENT_PARENT X86
+    LINK_COMPONENTS Analysis AsmPrinter CodeGen Core MC SelectionDAG Support Target X86Desc X86Info GlobalISel ProfileData CFGuard
+    ADD_TO_COMPONENT X86
+)
 
 add_subdirectory(AsmParser)
 add_subdirectory(Disassembler)
Index: llvm/lib/Target/X86/Disassembler/CMakeLists.txt
===================================================================
--- llvm/lib/Target/X86/Disassembler/CMakeLists.txt
+++ llvm/lib/Target/X86/Disassembler/CMakeLists.txt
@@ -1,3 +1,6 @@
 add_llvm_component_library(LLVMX86Disassembler
   X86Disassembler.cpp
+  COMPONENT_PARENT X86
+  LINK_COMPONENTS MCDisassembler Support X86Info
+  ADD_TO_COMPONENT X86
   )
Index: llvm/lib/Target/X86/Disassembler/LLVMBuild.cmake
===================================================================
--- llvm/lib/Target/X86/Disassembler/LLVMBuild.cmake
+++ llvm/lib/Target/X86/Disassembler/LLVMBuild.cmake
@@ -1,7 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME X86Disassembler
-	PARENT X86
-	REQUIRED_LIBRARIES MCDisassembler Support X86Info
-	ADD_TO_LIBRARY_GROUPS X86
-)
Index: llvm/lib/Target/X86/MCTargetDesc/CMakeLists.txt
===================================================================
--- llvm/lib/Target/X86/MCTargetDesc/CMakeLists.txt
+++ llvm/lib/Target/X86/MCTargetDesc/CMakeLists.txt
@@ -13,4 +13,8 @@
   X86WinCOFFObjectWriter.cpp
   X86WinCOFFStreamer.cpp
   X86WinCOFFTargetStreamer.cpp
+
+  COMPONENT_PARENT X86
+  LINK_COMPONENTS MC MCDisassembler Support X86Info BinaryFormat
+  ADD_TO_COMPONENT X86
   )
Index: llvm/lib/Target/X86/MCTargetDesc/LLVMBuild.cmake
===================================================================
--- llvm/lib/Target/X86/MCTargetDesc/LLVMBuild.cmake
+++ llvm/lib/Target/X86/MCTargetDesc/LLVMBuild.cmake
@@ -1,7 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME X86Desc
-	PARENT X86
-	REQUIRED_LIBRARIES MC MCDisassembler Support X86Info BinaryFormat
-	ADD_TO_LIBRARY_GROUPS X86
-)
Index: llvm/lib/Target/X86/TargetInfo/CMakeLists.txt
===================================================================
--- llvm/lib/Target/X86/TargetInfo/CMakeLists.txt
+++ llvm/lib/Target/X86/TargetInfo/CMakeLists.txt
@@ -1,3 +1,6 @@
 add_llvm_component_library(LLVMX86Info
   X86TargetInfo.cpp
+  COMPONENT_PARENT X86
+  LINK_COMPONENTS Support
+  ADD_TO_COMPONENT X86
   )
Index: llvm/lib/Target/X86/TargetInfo/LLVMBuild.cmake
===================================================================
--- llvm/lib/Target/X86/TargetInfo/LLVMBuild.cmake
+++ llvm/lib/Target/X86/TargetInfo/LLVMBuild.cmake
@@ -1,7 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME X86Info
-	PARENT X86
-	REQUIRED_LIBRARIES Support
-	ADD_TO_LIBRARY_GROUPS X86
-)
Index: llvm/lib/Testing/LLVMBuild.cmake
===================================================================
--- llvm/lib/Testing/LLVMBuild.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-LLVMBuildCommon(
-	SUBDIRECTORIES Support
-)
Index: llvm/lib/Testing/Support/LLVMBuild.cmake
===================================================================
--- llvm/lib/Testing/Support/LLVMBuild.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME TestingSupport
-	PARENT Libraries
-	REQUIRED_LIBRARIES Support
-	INSTALLED 0
-)
Index: llvm/lib/TextAPI/CMakeLists.txt
===================================================================
--- llvm/lib/TextAPI/CMakeLists.txt
+++ llvm/lib/TextAPI/CMakeLists.txt
@@ -13,4 +13,7 @@
   "${LLVM_MAIN_INCLUDE_DIR}/llvm/TextAPI"
   "${LLVM_MAIN_INCLUDE_DIR}/llvm/TextAPI/Elf"
   "${LLVM_MAIN_INCLUDE_DIR}/llvm/TextAPI/MachO"
+
+  COMPONENT_PARENT Libraries
+  LINK_COMPONENTS Support BinaryFormat
 )
Index: llvm/lib/TextAPI/LLVMBuild.cmake
===================================================================
--- llvm/lib/TextAPI/LLVMBuild.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME TextAPI
-	PARENT Libraries
-	REQUIRED_LIBRARIES Support BinaryFormat
-)
Index: llvm/lib/ToolDrivers/LLVMBuild.cmake
===================================================================
--- llvm/lib/ToolDrivers/LLVMBuild.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-LLVMBuildCommon(
-	SUBDIRECTORIES llvm-dlltool llvm-lib
-)
-LLVMBuildComponent(
-	TYPE Group
-	NAME ToolDrivers
-	PARENT Libraries
-)
Index: llvm/lib/ToolDrivers/llvm-dlltool/CMakeLists.txt
===================================================================
--- llvm/lib/ToolDrivers/llvm-dlltool/CMakeLists.txt
+++ llvm/lib/ToolDrivers/llvm-dlltool/CMakeLists.txt
@@ -4,6 +4,8 @@
 
 add_llvm_component_library(LLVMDlltoolDriver
   DlltoolDriver.cpp
+  COMPONENT_PARENT Libraries
+  LINK_COMPONENTS Object Option Support
   )
 
 add_dependencies(LLVMDlltoolDriver DllOptionsTableGen)
Index: llvm/lib/ToolDrivers/llvm-dlltool/LLVMBuild.cmake
===================================================================
--- llvm/lib/ToolDrivers/llvm-dlltool/LLVMBuild.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME DlltoolDriver
-	PARENT Libraries
-	REQUIRED_LIBRARIES Object Option Support
-)
Index: llvm/lib/ToolDrivers/llvm-lib/CMakeLists.txt
===================================================================
--- llvm/lib/ToolDrivers/llvm-lib/CMakeLists.txt
+++ llvm/lib/ToolDrivers/llvm-lib/CMakeLists.txt
@@ -15,5 +15,8 @@
 
   DEPENDS
   intrinsics_gen
+
+  COMPONENT_PARENT Libraries
+  LINK_COMPONENTS BinaryFormat BitReader Object Option Support
   )
 add_dependencies(LLVMLibDriver LibOptionsTableGen)
Index: llvm/lib/ToolDrivers/llvm-lib/LLVMBuild.cmake
===================================================================
--- llvm/lib/ToolDrivers/llvm-lib/LLVMBuild.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME LibDriver
-	PARENT Libraries
-	REQUIRED_LIBRARIES BinaryFormat BitReader Object Option Support
-)
Index: llvm/lib/Transforms/AggressiveInstCombine/CMakeLists.txt
===================================================================
--- llvm/lib/Transforms/AggressiveInstCombine/CMakeLists.txt
+++ llvm/lib/Transforms/AggressiveInstCombine/CMakeLists.txt
@@ -8,4 +8,6 @@
 
   DEPENDS
   intrinsics_gen
+  COMPONENT_PARENT Transforms
+  LINK_COMPONENTS Analysis Core Support TransformUtils
   )
Index: llvm/lib/Transforms/AggressiveInstCombine/LLVMBuild.cmake
===================================================================
--- llvm/lib/Transforms/AggressiveInstCombine/LLVMBuild.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME AggressiveInstCombine
-	PARENT Transforms
-	REQUIRED_LIBRARIES Analysis Core Support TransformUtils
-)
Index: llvm/lib/Transforms/CFGuard/CMakeLists.txt
===================================================================
--- llvm/lib/Transforms/CFGuard/CMakeLists.txt
+++ llvm/lib/Transforms/CFGuard/CMakeLists.txt
@@ -6,4 +6,6 @@
 
   DEPENDS
   intrinsics_gen
+  COMPONENT_PARENT Transforms
+  LINK_COMPONENTS Core Support
   )
Index: llvm/lib/Transforms/CFGuard/LLVMBuild.cmake
===================================================================
--- llvm/lib/Transforms/CFGuard/LLVMBuild.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME CFGuard
-	PARENT Transforms
-	REQUIRED_LIBRARIES Core Support
-)
Index: llvm/lib/Transforms/Coroutines/CMakeLists.txt
===================================================================
--- llvm/lib/Transforms/Coroutines/CMakeLists.txt
+++ llvm/lib/Transforms/Coroutines/CMakeLists.txt
@@ -12,4 +12,7 @@
   DEPENDS
   intrinsics_gen
   LLVMAnalysis
+
+  COMPONENT_PARENT Transforms
+  LINK_COMPONENTS Analysis Core IPO Scalar Support TransformUtils
   )
Index: llvm/lib/Transforms/Coroutines/LLVMBuild.cmake
===================================================================
--- llvm/lib/Transforms/Coroutines/LLVMBuild.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME Coroutines
-	PARENT Transforms
-	REQUIRED_LIBRARIES Analysis Core IPO Scalar Support TransformUtils
-)
Index: llvm/lib/Transforms/HelloNew/CMakeLists.txt
===================================================================
--- llvm/lib/Transforms/HelloNew/CMakeLists.txt
+++ llvm/lib/Transforms/HelloNew/CMakeLists.txt
@@ -3,4 +3,6 @@
 
   DEPENDS
   intrinsics_gen
+  COMPONENT_PARENT Transforms
+  LINK_COMPONENTS Core Support
   )
Index: llvm/lib/Transforms/HelloNew/LLVMBuild.cmake
===================================================================
--- llvm/lib/Transforms/HelloNew/LLVMBuild.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME HelloNew
-	PARENT Transforms
-	LIBRARY_NAME HelloNew
-	REQUIRED_LIBRARIES Core Support
-)
Index: llvm/lib/Transforms/IPO/CMakeLists.txt
===================================================================
--- llvm/lib/Transforms/IPO/CMakeLists.txt
+++ llvm/lib/Transforms/IPO/CMakeLists.txt
@@ -45,4 +45,9 @@
   DEPENDS
   intrinsics_gen
   omp_gen
+
+  COMPONENT_NAME ipo
+  COMPONENT_PARENT Transforms
+  LINK_COMPONENTS AggressiveInstCombine Analysis BitReader BitWriter Core FrontendOpenMP InstCombine IRReader Linker Object ProfileData Scalar Support TransformUtils Vectorize Instrumentation
+
   )
Index: llvm/lib/Transforms/IPO/LLVMBuild.cmake
===================================================================
--- llvm/lib/Transforms/IPO/LLVMBuild.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME IPO
-	PARENT Transforms
-	LIBRARY_NAME ipo
-	REQUIRED_LIBRARIES AggressiveInstCombine Analysis BitReader BitWriter Core FrontendOpenMP InstCombine IRReader Linker Object ProfileData Scalar Support TransformUtils Vectorize Instrumentation
-)
Index: llvm/lib/Transforms/InstCombine/CMakeLists.txt
===================================================================
--- llvm/lib/Transforms/InstCombine/CMakeLists.txt
+++ llvm/lib/Transforms/InstCombine/CMakeLists.txt
@@ -21,4 +21,6 @@
 
   DEPENDS
   intrinsics_gen
+  COMPONENT_PARENT Transforms
+  LINK_COMPONENTS Analysis Core Support TransformUtils
   )
Index: llvm/lib/Transforms/InstCombine/LLVMBuild.cmake
===================================================================
--- llvm/lib/Transforms/InstCombine/LLVMBuild.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME InstCombine
-	PARENT Transforms
-	REQUIRED_LIBRARIES Analysis Core Support TransformUtils
-)
Index: llvm/lib/Transforms/Instrumentation/CMakeLists.txt
===================================================================
--- llvm/lib/Transforms/Instrumentation/CMakeLists.txt
+++ llvm/lib/Transforms/Instrumentation/CMakeLists.txt
@@ -24,4 +24,6 @@
 
   DEPENDS
   intrinsics_gen
+  COMPONENT_PARENT Transforms
+  LINK_COMPONENTS Analysis Core MC Support TransformUtils ProfileData
   )
Index: llvm/lib/Transforms/Instrumentation/LLVMBuild.cmake
===================================================================
--- llvm/lib/Transforms/Instrumentation/LLVMBuild.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME Instrumentation
-	PARENT Transforms
-	REQUIRED_LIBRARIES Analysis Core MC Support TransformUtils ProfileData
-)
Index: llvm/lib/Transforms/LLVMBuild.cmake
===================================================================
--- llvm/lib/Transforms/LLVMBuild.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-LLVMBuildCommon(
-	SUBDIRECTORIES AggressiveInstCombine Coroutines HelloNew IPO InstCombine Instrumentation Scalar Utils Vectorize ObjCARC CFGuard
-)
-LLVMBuildComponent(
-	TYPE Group
-	NAME Transforms
-	PARENT Libraries
-)
Index: llvm/lib/Transforms/ObjCARC/CMakeLists.txt
===================================================================
--- llvm/lib/Transforms/ObjCARC/CMakeLists.txt
+++ llvm/lib/Transforms/ObjCARC/CMakeLists.txt
@@ -14,4 +14,8 @@
 
   DEPENDS
   intrinsics_gen
+
+  COMPONENT_PARENT Transforms
+  COMPONENT_NAME ObjCARC
+  LINK_COMPONENTS Analysis Core Support TransformUtils
   )
Index: llvm/lib/Transforms/ObjCARC/LLVMBuild.cmake
===================================================================
--- llvm/lib/Transforms/ObjCARC/LLVMBuild.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME ObjCARC
-	PARENT Transforms
-	LIBRARY_NAME ObjCARCOpts
-	REQUIRED_LIBRARIES Analysis Core Support TransformUtils
-)
Index: llvm/lib/Transforms/Scalar/CMakeLists.txt
===================================================================
--- llvm/lib/Transforms/Scalar/CMakeLists.txt
+++ llvm/lib/Transforms/Scalar/CMakeLists.txt
@@ -82,4 +82,8 @@
 
   DEPENDS
   intrinsics_gen
+
+  COMPONENT_PARENT Transforms
+  COMPONENT_NAME Scalar
+  LINK_COMPONENTS AggressiveInstCombine Analysis Core InstCombine Support TransformUtils
   )
Index: llvm/lib/Transforms/Scalar/LLVMBuild.cmake
===================================================================
--- llvm/lib/Transforms/Scalar/LLVMBuild.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME Scalar
-	PARENT Transforms
-	LIBRARY_NAME ScalarOpts
-	REQUIRED_LIBRARIES AggressiveInstCombine Analysis Core InstCombine Support TransformUtils
-)
Index: llvm/lib/Transforms/Utils/CMakeLists.txt
===================================================================
--- llvm/lib/Transforms/Utils/CMakeLists.txt
+++ llvm/lib/Transforms/Utils/CMakeLists.txt
@@ -79,4 +79,6 @@
 
   DEPENDS
   intrinsics_gen
+  COMPONENT_PARENT Transforms
+  LINK_COMPONENTS Analysis Core Support
   )
Index: llvm/lib/Transforms/Utils/LLVMBuild.cmake
===================================================================
--- llvm/lib/Transforms/Utils/LLVMBuild.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME TransformUtils
-	PARENT Transforms
-	REQUIRED_LIBRARIES Analysis Core Support
-)
Index: llvm/lib/Transforms/Vectorize/CMakeLists.txt
===================================================================
--- llvm/lib/Transforms/Vectorize/CMakeLists.txt
+++ llvm/lib/Transforms/Vectorize/CMakeLists.txt
@@ -18,4 +18,6 @@
 
   DEPENDS
   intrinsics_gen
+  COMPONENT_PARENT Transforms
+  LINK_COMPONENTS Analysis Core Support TransformUtils
   )
Index: llvm/lib/Transforms/Vectorize/LLVMBuild.cmake
===================================================================
--- llvm/lib/Transforms/Vectorize/LLVMBuild.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME Vectorize
-	PARENT Transforms
-	LIBRARY_NAME Vectorize
-	REQUIRED_LIBRARIES Analysis Core Support TransformUtils
-)
Index: llvm/lib/WindowsManifest/CMakeLists.txt
===================================================================
--- llvm/lib/WindowsManifest/CMakeLists.txt
+++ llvm/lib/WindowsManifest/CMakeLists.txt
@@ -10,7 +10,11 @@
   ADDITIONAL_HEADER_DIRS
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/WindowsManifest
   ${Backtrace_INCLUDE_DIRS}
-  LINK_LIBS ${imported_libs})
+  LINK_LIBS ${imported_libs}
+
+  COMPONENT_PARENT Libraries
+  LINK_COMPONENTS Support
+  )
 
 # This block is only needed for llvm-config. When we deprecate llvm-config and
 # move to using CMake export, this block can be removed.
Index: llvm/lib/WindowsManifest/LLVMBuild.cmake
===================================================================
--- llvm/lib/WindowsManifest/LLVMBuild.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME WindowsManifest
-	PARENT Libraries
-	REQUIRED_LIBRARIES Support
-)
Index: llvm/lib/XRay/CMakeLists.txt
===================================================================
--- llvm/lib/XRay/CMakeLists.txt
+++ llvm/lib/XRay/CMakeLists.txt
@@ -17,4 +17,7 @@
   ADDITIONAL_HEADER_DIRS
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/ADT
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/XRay
+
+  COMPONENT_PARENT Libraries
+  LINK_COMPONENTS Support Object
   )
Index: llvm/lib/XRay/LLVMBuild.cmake
===================================================================
--- llvm/lib/XRay/LLVMBuild.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME XRay
-	PARENT Libraries
-	REQUIRED_LIBRARIES Support Object
-	INSTALLED 1
-)
Index: llvm/projects/LLVMBuild.cmake
===================================================================
--- llvm/projects/LLVMBuild.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-LLVMBuildComponent(
-	TYPE Group
-	NAME Projects
-	PARENT $ROOT
-)
Index: llvm/utils/unittest/LLVMBuild.cmake
===================================================================
--- llvm/utils/unittest/LLVMBuild.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-LLVMBuildComponent(
-	TYPE Library
-	NAME gtest
-	PARENT Libraries
-	REQUIRED_LIBRARIES Support
-	INSTALLED 0
-)
-LLVMBuildComponent(
-	TYPE Library
-	NAME gtest_main
-	PARENT Libraries
-	REQUIRED_LIBRARIES gtest
-	INSTALLED 0
-)