[CMake] Reorder and reformat deps

2026-01-25 10:55:58 +08:00 · 2023-04-17 00:17:45 +09:00
parent 20411c7029
commit 7d5d987e93
77 changed files with 174 additions and 157 deletions
--- a/clang-tools-extra/clang-tidy/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/CMakeLists.txt
@@ -26,9 +26,9 @@ add_clang_library(clangTidy

 clang_target_link_libraries(clangTidy
  PRIVATE
-  clangAnalysis
  clangAST
  clangASTMatchers
+  clangAnalysis
  clangBasic
  clangFormat
  clangFrontend
--- a/clang/lib/CodeGen/CMakeLists.txt
+++ b/clang/lib/CodeGen/CMakeLists.txt
@@ -1,4 +1,5 @@
 set(LLVM_LINK_COMPONENTS
+  AggressiveInstCombine
  Analysis
  BitReader
  BitWriter
@@ -12,7 +13,6 @@ set(LLVM_LINK_COMPONENTS
  IPO
  IRPrinter
  IRReader
-  AggressiveInstCombine
  InstCombine
  Instrumentation
  LTO
@@ -93,8 +93,8 @@ add_clang_library(clangCodeGen
  intrinsics_gen

  LINK_LIBS
-  clangAnalysis
  clangAST
+  clangAnalysis
  clangBasic
  clangFrontend
  clangLex
--- a/clang/lib/Interpreter/CMakeLists.txt
+++ b/clang/lib/Interpreter/CMakeLists.txt
@@ -21,13 +21,13 @@ add_clang_library(clangInterpreter
  clangAST
  clangAnalysis
  clangBasic
+  clangCodeGen
  clangDriver
  clangEdit
  clangFrontend
+  clangFrontendTool
  clangLex
  clangParse
  clangSema
  clangSerialization
-  clangCodeGen
-  clangFrontendTool
  )
--- a/clang/lib/Tooling/DependencyScanning/CMakeLists.txt
+++ b/clang/lib/Tooling/DependencyScanning/CMakeLists.txt
@@ -27,4 +27,4 @@ add_clang_library(clangDependencyScanning
  clangParse
  clangSerialization
  clangTooling
-)
+  )
--- a/clang/tools/clang-scan-deps/CMakeLists.txt
+++ b/clang/tools/clang-scan-deps/CMakeLists.txt
@@ -20,6 +20,7 @@ set(CLANG_SCAN_DEPS_LIB_DEPS
  clangAST
  clangBasic
  clangCodeGen
+  clangDependencyScanning
  clangDriver
  clangFrontend
  clangFrontendTool
@@ -27,7 +28,6 @@ set(CLANG_SCAN_DEPS_LIB_DEPS
  clangParse
  clangSerialization
  clangTooling
-  clangDependencyScanning
  )

 clang_target_link_libraries(clang-scan-deps
--- a/clang/unittests/Analysis/CMakeLists.txt
+++ b/clang/unittests/Analysis/CMakeLists.txt
@@ -14,9 +14,9 @@ add_clang_unittest(ClangAnalysisTests

 clang_target_link_libraries(ClangAnalysisTests
  PRIVATE
-  clangAnalysis
  clangAST
  clangASTMatchers
+  clangAnalysis
  clangBasic
  clangFrontend
  clangLex
--- a/clang/unittests/Analysis/FlowSensitive/CMakeLists.txt
+++ b/clang/unittests/Analysis/FlowSensitive/CMakeLists.txt
@@ -27,11 +27,11 @@ add_clang_unittest(ClangAnalysisFlowSensitiveTests

 clang_target_link_libraries(ClangAnalysisFlowSensitiveTests
  PRIVATE
+  clangAST
+  clangASTMatchers
  clangAnalysis
  clangAnalysisFlowSensitive
  clangAnalysisFlowSensitiveModels
-  clangAST
-  clangASTMatchers
  clangBasic
  clangFrontend
  clangLex
--- a/clang/unittests/DirectoryWatcher/CMakeLists.txt
+++ b/clang/unittests/DirectoryWatcher/CMakeLists.txt
@@ -11,8 +11,8 @@ if(APPLE OR CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME STREQUAL Wind
  target_link_libraries(DirectoryWatcherTests
    PRIVATE
    LLVMTestingSupport
-    clangDirectoryWatcher
    clangBasic
+    clangDirectoryWatcher
    )

 endif()
--- a/clang/unittests/Introspection/CMakeLists.txt
+++ b/clang/unittests/Introspection/CMakeLists.txt
@@ -11,10 +11,10 @@ clang_target_link_libraries(IntrospectionTests
  PRIVATE
  clangAST
  clangASTMatchers
-  clangTooling
  clangBasic
-  clangSerialization
  clangFrontend
+  clangSerialization
+  clangTooling
  )
 target_link_libraries(IntrospectionTests
  PRIVATE
--- a/clang/unittests/Sema/CMakeLists.txt
+++ b/clang/unittests/Sema/CMakeLists.txt
@@ -24,7 +24,7 @@ clang_target_link_libraries(SemaTests

 target_link_libraries(SemaTests
  PRIVATE
-  clangTesting
  LLVMTestingAnnotations
  LLVMTestingSupport
-)
+  clangTesting
+  )
--- a/llvm/lib/DWARFLinker/CMakeLists.txt
+++ b/llvm/lib/DWARFLinker/CMakeLists.txt
@@ -11,10 +11,10 @@ add_llvm_component_library(LLVMDWARFLinker
  intrinsics_gen

  LINK_COMPONENTS
-  BinaryFormat
-  DebugInfoDWARF
  AsmPrinter
+  BinaryFormat
  CodeGen
+  DebugInfoDWARF
  MC
  Object
  Support
--- a/llvm/lib/DWARFLinkerParallel/CMakeLists.txt
+++ b/llvm/lib/DWARFLinkerParallel/CMakeLists.txt
@@ -9,11 +9,11 @@ add_llvm_component_library(LLVMDWARFLinkerParallel
  intrinsics_gen

  LINK_COMPONENTS
-  BinaryFormat
-  DebugInfoDWARF
  AsmPrinter
+  BinaryFormat
  CodeGen
+  DebugInfoDWARF
  MC
  Object
  Support
-)
+  )
--- a/llvm/lib/DWP/CMakeLists.txt
+++ b/llvm/lib/DWP/CMakeLists.txt
@@ -14,4 +14,4 @@ add_llvm_component_library(LLVMDWP
  Object
  Support
  Target
-)
+  )
--- a/llvm/lib/LTO/CMakeLists.txt
+++ b/llvm/lib/LTO/CMakeLists.txt
@@ -36,4 +36,4 @@ add_llvm_component_library(LLVMLTO
  Target
  TargetParser
  TransformUtils
-)
+  )
--- a/llvm/lib/Target/AArch64/CMakeLists.txt
+++ b/llvm/lib/Target/AArch64/CMakeLists.txt
@@ -97,8 +97,10 @@ add_llvm_target(AArch64CodeGen
  AArch64Utils
  Analysis
  AsmPrinter
+  CFGuard
  CodeGen
  Core
+  GlobalISel
  MC
  Scalar
  SelectionDAG
@@ -106,12 +108,10 @@ add_llvm_target(AArch64CodeGen
  Target
  TargetParser
  TransformUtils
-  GlobalISel
-  CFGuard

  ADD_TO_COMPONENT
  AArch64
-)
+  )

 add_subdirectory(AsmParser)
 add_subdirectory(Disassembler)
--- a/llvm/lib/Target/AArch64/MCTargetDesc/CMakeLists.txt
+++ b/llvm/lib/Target/AArch64/MCTargetDesc/CMakeLists.txt
@@ -15,14 +15,15 @@ add_llvm_component_library(LLVMAArch64Desc
  LINK_COMPONENTS
  AArch64Info
  AArch64Utils
-  MC
  BinaryFormat
+  MC
  Support
  TargetParser

  ADD_TO_COMPONENT
  AArch64
-)
+  )
+
 add_dependencies(LLVMAArch64Desc AArch64CommonTableGen)

 # Hack: we need to include 'main' target directory to grab private headers
--- a/llvm/lib/Target/AMDGPU/AsmParser/CMakeLists.txt
+++ b/llvm/lib/Target/AMDGPU/AsmParser/CMakeLists.txt
@@ -2,11 +2,11 @@ add_llvm_component_library(LLVMAMDGPUAsmParser
  AMDGPUAsmParser.cpp

  LINK_COMPONENTS
-  MC
-  MCParser
  AMDGPUDesc
  AMDGPUInfo
  AMDGPUUtils
+  MC
+  MCParser
  Support
  TargetParser

--- a/llvm/lib/Target/AMDGPU/CMakeLists.txt
+++ b/llvm/lib/Target/AMDGPU/CMakeLists.txt
@@ -165,16 +165,19 @@ add_llvm_target(AMDGPUCodeGen
  SIWholeQuadMode.cpp

  LINK_COMPONENTS
-  Analysis
-  AsmPrinter
-  CodeGen
-  Core
-  IPO
-  MC
-  Passes
  AMDGPUDesc
  AMDGPUInfo
  AMDGPUUtils
+  Analysis
+  AsmPrinter
+  BinaryFormat
+  CodeGen
+  Core
+  GlobalISel
+  IPO
+  MC
+  MIRParser
+  Passes
  Scalar
  SelectionDAG
  Support
@@ -182,9 +185,6 @@ add_llvm_target(AMDGPUCodeGen
  TargetParser
  TransformUtils
  Vectorize
-  GlobalISel
-  BinaryFormat
-  MIRParser

  ADD_TO_COMPONENT
  AMDGPU
--- a/llvm/lib/Target/AMDGPU/MCA/CMakeLists.txt
+++ b/llvm/lib/Target/AMDGPU/MCA/CMakeLists.txt
@@ -2,14 +2,14 @@ add_llvm_component_library(LLVMAMDGPUTargetMCA
  AMDGPUCustomBehaviour.cpp

  LINK_COMPONENTS
-  MC
-  MCParser
  AMDGPUDesc
  AMDGPUInfo
  AMDGPUUtils
+  MC
+  MCA
+  MCParser
  Support
  TargetParser
-  MCA

  ADD_TO_COMPONENT
  AMDGPU
--- a/llvm/lib/Target/AMDGPU/MCTargetDesc/CMakeLists.txt
+++ b/llvm/lib/Target/AMDGPU/MCTargetDesc/CMakeLists.txt
@@ -13,16 +13,16 @@ add_llvm_component_library(LLVMAMDGPUDesc
  SIMCCodeEmitter.cpp

  LINK_COMPONENTS
-  Core
-  MC
  AMDGPUInfo
  AMDGPUUtils
-  Support
  BinaryFormat
+  Core
+  MC
+  Support
  TargetParser

  ADD_TO_COMPONENT
  AMDGPU
-)
+  )

 add_dependencies(LLVMAMDGPUDesc LLVMAMDGPUUtils)
--- a/llvm/lib/Target/AMDGPU/Utils/CMakeLists.txt
+++ b/llvm/lib/Target/AMDGPU/Utils/CMakeLists.txt
@@ -7,9 +7,9 @@ add_llvm_component_library(LLVMAMDGPUUtils

  LINK_COMPONENTS
  Analysis
+  BinaryFormat
  Core
  MC
-  BinaryFormat
  Support
  TargetParser

--- a/llvm/lib/Target/ARM/AsmParser/CMakeLists.txt
+++ b/llvm/lib/Target/ARM/AsmParser/CMakeLists.txt
@@ -4,11 +4,11 @@ add_llvm_component_library(LLVMARMAsmParser
  LINK_COMPONENTS
  ARMDesc
  ARMInfo
+  ARMUtils
  MC
  MCParser
  Support
  TargetParser
-  ARMUtils

  ADD_TO_COMPONENT
  ARM
--- a/llvm/lib/Target/ARM/CMakeLists.txt
+++ b/llvm/lib/Target/ARM/CMakeLists.txt
@@ -72,10 +72,13 @@ add_llvm_target(ARMCodeGen
  LINK_COMPONENTS
  ARMDesc
  ARMInfo
+  ARMUtils
  Analysis
  AsmPrinter
+  CFGuard
  CodeGen
  Core
+  GlobalISel
  IPO
  MC
  Scalar
@@ -83,10 +86,7 @@ add_llvm_target(ARMCodeGen
  Support
  Target
  TargetParser
-  GlobalISel
-  ARMUtils
  TransformUtils
-  CFGuard

  ADD_TO_COMPONENT
  ARM
--- a/llvm/lib/Target/ARM/Disassembler/CMakeLists.txt
+++ b/llvm/lib/Target/ARM/Disassembler/CMakeLists.txt
@@ -4,10 +4,10 @@ add_llvm_component_library(LLVMARMDisassembler
  LINK_COMPONENTS
  ARMDesc
  ARMInfo
-  MCDisassembler
-  MC
-  Support
  ARMUtils
+  MC
+  MCDisassembler
+  Support

  ADD_TO_COMPONENT
  ARM
--- a/llvm/lib/Target/ARM/MCTargetDesc/CMakeLists.txt
+++ b/llvm/lib/Target/ARM/MCTargetDesc/CMakeLists.txt
@@ -17,10 +17,10 @@ add_llvm_component_library(LLVMARMDesc
  LINK_COMPONENTS
  ARMInfo
  ARMUtils
+  BinaryFormat
  MC
  MCDisassembler
  Support
-  BinaryFormat
  TargetParser

  ADD_TO_COMPONENT
--- a/llvm/lib/Target/AVR/AsmParser/CMakeLists.txt
+++ b/llvm/lib/Target/AVR/AsmParser/CMakeLists.txt
@@ -2,12 +2,12 @@ add_llvm_component_library(LLVMAVRAsmParser
  AVRAsmParser.cpp

  LINK_COMPONENTS
-  MC
-  MCParser
  AVRDesc
  AVRInfo
+  MC
+  MCParser
  Support

  ADD_TO_COMPONENT
  AVR
-)
+  )
--- a/llvm/lib/Target/AVR/CMakeLists.txt
+++ b/llvm/lib/Target/AVR/CMakeLists.txt
@@ -32,19 +32,19 @@ add_llvm_target(AVRCodeGen
  intrinsics_gen

  LINK_COMPONENTS
+  AVRDesc
+  AVRInfo
  AsmPrinter
  CodeGen
  Core
  MC
-  AVRDesc
-  AVRInfo
  SelectionDAG
  Support
  Target

  ADD_TO_COMPONENT
  AVR
-)
+  )

 add_subdirectory(AsmParser)
 add_subdirectory(Disassembler)
--- a/llvm/lib/Target/AVR/Disassembler/CMakeLists.txt
+++ b/llvm/lib/Target/AVR/Disassembler/CMakeLists.txt
@@ -2,12 +2,12 @@ add_llvm_component_library(LLVMAVRDisassembler
  AVRDisassembler.cpp

  LINK_COMPONENTS
-  MCDisassembler
-  MC
-  Support
  AVRInfo
+  MC
+  MCDisassembler
+  Support

  ADD_TO_COMPONENT
  AVR
-)
+  )

--- a/llvm/lib/Target/BPF/CMakeLists.txt
+++ b/llvm/lib/Target/BPF/CMakeLists.txt
@@ -38,12 +38,12 @@ add_llvm_target(BPFCodeGen
  LINK_COMPONENTS
  Analysis
  AsmPrinter
-  CodeGen
-  Core
-  MC
  BPFDesc
  BPFInfo
+  CodeGen
+  Core
  IPO
+  MC
  Scalar
  SelectionDAG
  Support
--- a/llvm/lib/Target/Hexagon/CMakeLists.txt
+++ b/llvm/lib/Target/Hexagon/CMakeLists.txt
@@ -87,7 +87,7 @@ add_llvm_target(HexagonCodeGen

  ADD_TO_COMPONENT
  Hexagon
-)
+  )

 add_subdirectory(AsmParser)
 add_subdirectory(Disassembler)
--- a/llvm/lib/Target/Lanai/AsmParser/CMakeLists.txt
+++ b/llvm/lib/Target/Lanai/AsmParser/CMakeLists.txt
@@ -4,11 +4,11 @@ add_llvm_component_library(LLVMLanaiAsmParser
  LanaiAsmParser.cpp

  LINK_COMPONENTS
+  LanaiDesc
+  LanaiInfo
  MC
  MCParser
  Support
-  LanaiDesc
-  LanaiInfo

  ADD_TO_COMPONENT
  Lanai
--- a/llvm/lib/Target/Lanai/CMakeLists.txt
+++ b/llvm/lib/Target/Lanai/CMakeLists.txt
@@ -47,7 +47,7 @@ add_llvm_target(LanaiCodeGen

  ADD_TO_COMPONENT
  Lanai
-)
+  )

 add_subdirectory(AsmParser)
 add_subdirectory(Disassembler)
--- a/llvm/lib/Target/LoongArch/CMakeLists.txt
+++ b/llvm/lib/Target/LoongArch/CMakeLists.txt
@@ -32,9 +32,9 @@ add_llvm_target(LoongArchCodeGen
  AsmPrinter
  CodeGen
  Core
-  MC
  LoongArchDesc
  LoongArchInfo
+  MC
  Scalar
  SelectionDAG
  Support
--- a/llvm/lib/Target/MSP430/AsmParser/CMakeLists.txt
+++ b/llvm/lib/Target/MSP430/AsmParser/CMakeLists.txt
@@ -10,4 +10,4 @@ add_llvm_component_library(LLVMMSP430AsmParser

  ADD_TO_COMPONENT
  MSP430
-)
+  )
--- a/llvm/lib/Target/Mips/CMakeLists.txt
+++ b/llvm/lib/Target/Mips/CMakeLists.txt
@@ -70,6 +70,7 @@ add_llvm_target(MipsCodeGen
  AsmPrinter
  CodeGen
  Core
+  GlobalISel
  MC
  MipsDesc
  MipsInfo
@@ -77,7 +78,6 @@ add_llvm_target(MipsCodeGen
  Support
  Target
  TargetParser
-  GlobalISel

  ADD_TO_COMPONENT
  Mips
--- a/llvm/lib/Target/NVPTX/CMakeLists.txt
+++ b/llvm/lib/Target/NVPTX/CMakeLists.txt
@@ -61,7 +61,7 @@ add_llvm_target(NVPTXCodeGen

  ADD_TO_COMPONENT
  NVPTX
-)
+  )

 add_subdirectory(MCTargetDesc)
 add_subdirectory(TargetInfo)
--- a/llvm/lib/Target/PowerPC/CMakeLists.txt
+++ b/llvm/lib/Target/PowerPC/CMakeLists.txt
@@ -67,6 +67,7 @@ add_llvm_target(PowerPCCodeGen
  BinaryFormat
  CodeGen
  Core
+  GlobalISel
  MC
  PowerPCDesc
  PowerPCInfo
@@ -76,7 +77,6 @@ add_llvm_target(PowerPCCodeGen
  Target
  TargetParser
  TransformUtils
-  GlobalISel

  ADD_TO_COMPONENT
  PowerPC
--- a/llvm/lib/Target/PowerPC/MCTargetDesc/CMakeLists.txt
+++ b/llvm/lib/Target/PowerPC/MCTargetDesc/CMakeLists.txt
@@ -12,10 +12,10 @@ add_llvm_component_library(LLVMPowerPCDesc
  PPCXCOFFStreamer.cpp

  LINK_COMPONENTS
+  BinaryFormat
  MC
  PowerPCInfo
  Support
-  BinaryFormat
  TargetParser

  ADD_TO_COMPONENT
--- a/llvm/lib/Target/RISCV/CMakeLists.txt
+++ b/llvm/lib/Target/RISCV/CMakeLists.txt
@@ -51,9 +51,10 @@ add_llvm_target(RISCVCodeGen
  LINK_COMPONENTS
  Analysis
  AsmPrinter
-  Core
-  IPO
  CodeGen
+  Core
+  GlobalISel
+  IPO
  MC
  RISCVDesc
  RISCVInfo
@@ -62,7 +63,6 @@ add_llvm_target(RISCVCodeGen
  Target
  TargetParser
  TransformUtils
-  GlobalISel

  ADD_TO_COMPONENT
  RISCV
--- a/llvm/lib/Target/RISCV/MCA/CMakeLists.txt
+++ b/llvm/lib/Target/RISCV/MCA/CMakeLists.txt
@@ -3,11 +3,11 @@ add_llvm_component_library(LLVMRISCVTargetMCA

  LINK_COMPONENTS
  MC
+  MCA
  MCParser
  RISCVDesc
  RISCVInfo
  Support
-  MCA

  ADD_TO_COMPONENT
  RISCV
--- a/llvm/lib/Target/VE/AsmParser/CMakeLists.txt
+++ b/llvm/lib/Target/VE/AsmParser/CMakeLists.txt
@@ -4,9 +4,9 @@ add_llvm_component_library(LLVMVEAsmParser
  LINK_COMPONENTS
  MC
  MCParser
+  Support
  VEDesc
  VEInfo
-  Support

  ADD_TO_COMPONENT
  VE
--- a/llvm/lib/Target/VE/CMakeLists.txt
+++ b/llvm/lib/Target/VE/CMakeLists.txt
@@ -35,10 +35,10 @@ add_llvm_target(VECodeGen
  Core
  MC
  SelectionDAG
-  VEDesc
-  VEInfo
  Support
  Target
+  VEDesc
+  VEInfo

  ADD_TO_COMPONENT
  VE
--- a/llvm/lib/Target/VE/Disassembler/CMakeLists.txt
+++ b/llvm/lib/Target/VE/Disassembler/CMakeLists.txt
@@ -2,10 +2,10 @@ add_llvm_component_library(LLVMVEDisassembler
  VEDisassembler.cpp

  LINK_COMPONENTS
-  MCDisassembler
  MC
-  VEInfo
+  MCDisassembler
  Support
+  VEInfo

  ADD_TO_COMPONENT
  VE
--- a/llvm/lib/Target/VE/MCTargetDesc/CMakeLists.txt
+++ b/llvm/lib/Target/VE/MCTargetDesc/CMakeLists.txt
@@ -10,9 +10,9 @@ add_llvm_component_library(LLVMVEDesc

  LINK_COMPONENTS
  MC
-  VEInfo
  Support
  TargetParser
+  VEInfo

  ADD_TO_COMPONENT
  VE
--- a/llvm/lib/Target/WebAssembly/AsmParser/CMakeLists.txt
+++ b/llvm/lib/Target/WebAssembly/AsmParser/CMakeLists.txt
@@ -5,10 +5,10 @@ add_llvm_component_library(LLVMWebAssemblyAsmParser
  LINK_COMPONENTS
  MC
  MCParser
-  WebAssemblyDesc
-  WebAssemblyInfo
  Support
  TargetParser
+  WebAssemblyDesc
+  WebAssemblyInfo

  ADD_TO_COMPONENT
  WebAssembly
--- a/llvm/lib/Target/WebAssembly/CMakeLists.txt
+++ b/llvm/lib/Target/WebAssembly/CMakeLists.txt
@@ -80,7 +80,7 @@ add_llvm_target(WebAssemblyCodeGen

  ADD_TO_COMPONENT
  WebAssembly
-)
+  )

 add_subdirectory(AsmParser)
 add_subdirectory(Disassembler)
--- a/llvm/lib/Target/WebAssembly/Disassembler/CMakeLists.txt
+++ b/llvm/lib/Target/WebAssembly/Disassembler/CMakeLists.txt
@@ -2,11 +2,11 @@ add_llvm_component_library(LLVMWebAssemblyDisassembler
  WebAssemblyDisassembler.cpp

  LINK_COMPONENTS
-  WebAssemblyDesc
-  MCDisassembler
-  WebAssemblyInfo
-  Support
  MC
+  MCDisassembler
+  Support
+  WebAssemblyDesc
+  WebAssemblyInfo

  ADD_TO_COMPONENT
  WebAssembly
--- a/llvm/lib/Target/WebAssembly/MCTargetDesc/CMakeLists.txt
+++ b/llvm/lib/Target/WebAssembly/MCTargetDesc/CMakeLists.txt
@@ -16,4 +16,4 @@ add_llvm_component_library(LLVMWebAssemblyDesc

  ADD_TO_COMPONENT
  WebAssembly
-)
+  )
--- a/llvm/lib/Target/X86/CMakeLists.txt
+++ b/llvm/lib/Target/X86/CMakeLists.txt
@@ -93,10 +93,13 @@ add_llvm_target(X86CodeGen ${sources}
  LINK_COMPONENTS
  Analysis
  AsmPrinter
+  CFGuard
  CodeGen
  Core
+  GlobalISel
  Instrumentation
  MC
+  ProfileData
  SelectionDAG
  Support
  Target
@@ -104,13 +107,10 @@ add_llvm_target(X86CodeGen ${sources}
  TransformUtils
  X86Desc
  X86Info
-  GlobalISel
-  ProfileData
-  CFGuard

  ADD_TO_COMPONENT
  X86
-)
+  )

 add_subdirectory(AsmParser)
 add_subdirectory(Disassembler)
--- a/llvm/lib/Target/X86/MCA/CMakeLists.txt
+++ b/llvm/lib/Target/X86/MCA/CMakeLists.txt
@@ -3,12 +3,12 @@ add_llvm_component_library(LLVMX86TargetMCA

  LINK_COMPONENTS
  MC
+  MCA
  MCParser
-  X86Desc
-  X86Info
  Support
  TargetParser
-  MCA
+  X86Desc
+  X86Info

  ADD_TO_COMPONENT
  X86
--- a/llvm/lib/Target/X86/MCTargetDesc/CMakeLists.txt
+++ b/llvm/lib/Target/X86/MCTargetDesc/CMakeLists.txt
@@ -17,12 +17,12 @@ add_llvm_component_library(LLVMX86Desc
  X86WinCOFFTargetStreamer.cpp

  LINK_COMPONENTS
+  BinaryFormat
  MC
  MCDisassembler
  Support
  TargetParser
  X86Info
-  BinaryFormat

  ADD_TO_COMPONENT
  X86
--- a/llvm/lib/Target/XCore/Disassembler/CMakeLists.txt
+++ b/llvm/lib/Target/XCore/Disassembler/CMakeLists.txt
@@ -2,8 +2,8 @@ add_llvm_component_library(LLVMXCoreDisassembler
  XCoreDisassembler.cpp

  LINK_COMPONENTS
-  MCDisassembler
  MC
+  MCDisassembler
  Support
  XCoreInfo

--- a/llvm/tools/dsymutil/CMakeLists.txt
+++ b/llvm/tools/dsymutil/CMakeLists.txt
@@ -7,12 +7,12 @@ set(LLVM_LINK_COMPONENTS
  AllTargetsDescs
  AllTargetsInfos
  AsmPrinter
-  DebugInfoDWARF
+  CodeGen
  DWARFLinker
  DWARFLinkerParallel
+  DebugInfoDWARF
  MC
  Object
-  CodeGen
  Option
  Remarks
  Support
--- a/llvm/tools/llvm-debuginfo-analyzer/CMakeLists.txt
+++ b/llvm/tools/llvm-debuginfo-analyzer/CMakeLists.txt
@@ -1,11 +1,11 @@
 set(LLVM_LINK_COMPONENTS
  AllTargetsDescs
-  AllTargetsInfos
  AllTargetsDisassemblers
+  AllTargetsInfos
  BinaryFormat
-  DebugInfoLogicalView
  DebugInfoCodeView
  DebugInfoDWARF
+  DebugInfoLogicalView
  DebugInfoPDB
  MC
  MCDisassembler
--- a/llvm/tools/llvm-dwarfutil/CMakeLists.txt
+++ b/llvm/tools/llvm-dwarfutil/CMakeLists.txt
@@ -3,9 +3,12 @@ tablegen(LLVM Options.inc -gen-opt-parser-defs)
 add_public_tablegen_target(DwarfutilTableGen)

 set(LLVM_LINK_COMPONENTS
-  DebugInfoDWARF
+  AllTargetsCodeGens
+  AllTargetsDescs
+  AllTargetsInfos
  DWARFLinker
  DWARFLinkerParallel
+  DebugInfoDWARF
  MC
  ObjCopy
  Object
@@ -13,9 +16,6 @@ set(LLVM_LINK_COMPONENTS
  Support
  Target
  TargetParser
-  AllTargetsCodeGens
-  AllTargetsDescs
-  AllTargetsInfos
  )

 add_llvm_tool(llvm-dwarfutil
--- a/llvm/tools/llvm-exegesis/lib/AArch64/CMakeLists.txt
+++ b/llvm/tools/llvm-exegesis/lib/AArch64/CMakeLists.txt
@@ -5,10 +5,10 @@ include_directories(

 set(LLVM_LINK_COMPONENTS
  AArch64
-  Exegesis
  Core
-  Support
+  Exegesis
  MC
+  Support
  )

 add_llvm_library(LLVMExegesisAArch64
--- a/llvm/tools/llvm-exegesis/lib/Mips/CMakeLists.txt
+++ b/llvm/tools/llvm-exegesis/lib/Mips/CMakeLists.txt
@@ -4,12 +4,12 @@ include_directories(
  )

 set(LLVM_LINK_COMPONENTS
-  Mips
-  Exegesis
  Core
+  Exegesis
+  MC
+  Mips
  Support
  TargetParser
-  MC
  )

 add_llvm_library(LLVMExegesisMips
--- a/llvm/tools/llvm-exegesis/lib/PowerPC/CMakeLists.txt
+++ b/llvm/tools/llvm-exegesis/lib/PowerPC/CMakeLists.txt
@@ -4,12 +4,12 @@ include_directories(
  )

 set(LLVM_LINK_COMPONENTS
-  PowerPC
-  Exegesis
  Core
+  Exegesis
+  MC
+  PowerPC
  Support
  TargetParser
-  MC
  )

 add_llvm_library(LLVMExegesisPowerPC
--- a/llvm/tools/llvm-exegesis/lib/X86/CMakeLists.txt
+++ b/llvm/tools/llvm-exegesis/lib/X86/CMakeLists.txt
@@ -4,13 +4,13 @@ include_directories(
  )

 set(LLVM_LINK_COMPONENTS
-  X86
-  Exegesis
+  CodeGen
  Core
+  Exegesis
+  MC
  Support
  TargetParser
-  CodeGen
-  MC
+  X86
  )

 add_llvm_library(LLVMExegesisX86
--- a/llvm/tools/llvm-gsymutil/CMakeLists.txt
+++ b/llvm/tools/llvm-gsymutil/CMakeLists.txt
@@ -11,5 +11,4 @@ set(LLVM_LINK_COMPONENTS

 add_llvm_tool(llvm-gsymutil
  llvm-gsymutil.cpp
-
  )
--- a/llvm/tools/llvm-ifs/CMakeLists.txt
+++ b/llvm/tools/llvm-ifs/CMakeLists.txt
@@ -2,11 +2,11 @@ set(LLVM_LINK_COMPONENTS
  BinaryFormat
  InterfaceStub
  Object
+  ObjectYAML
+  Option
  Support
  TargetParser
  TextAPI
-  ObjectYAML
-  Option
  )

 set(LLVM_TARGET_DEFINITIONS Opts.td)
--- a/llvm/tools/llvm-modextract/CMakeLists.txt
+++ b/llvm/tools/llvm-modextract/CMakeLists.txt
@@ -1,8 +1,8 @@
 set(LLVM_LINK_COMPONENTS
-  IRReader
  BitReader
  BitWriter
  Core
+  IRReader
  Support
  )

--- a/llvm/tools/llvm-opt-fuzzer/CMakeLists.txt
+++ b/llvm/tools/llvm-opt-fuzzer/CMakeLists.txt
@@ -1,4 +1,5 @@
 set(LLVM_LINK_COMPONENTS
+  AggressiveInstCombine
  AllTargetsAsmParsers
  AllTargetsCodeGens
  AllTargetsDescs
@@ -9,23 +10,22 @@ set(LLVM_LINK_COMPONENTS
  CodeGen
  Core
  Coroutines
+  FuzzMutate
+  FuzzerCLI
  IPO
  IRReader
-  AggressiveInstCombine
  InstCombine
  Instrumentation
-  FuzzerCLI
-  FuzzMutate
  MC
  ObjCARCOpts
+  Passes
  ScalarOpts
  Support
  Target
  TargetParser
  TransformUtils
  Vectorize
-  Passes
-)
+  )

 add_llvm_fuzzer(llvm-opt-fuzzer
  llvm-opt-fuzzer.cpp
--- a/llvm/tools/llvm-opt-report/CMakeLists.txt
+++ b/llvm/tools/llvm-opt-report/CMakeLists.txt
@@ -1,4 +1,10 @@
-set(LLVM_LINK_COMPONENTS Core Demangle Object Remarks Support)
+set(LLVM_LINK_COMPONENTS
+  Core
+  Demangle
+  Object
+  Remarks
+  Support
+  )

 add_llvm_tool(llvm-opt-report
  OptReport.cpp
--- a/llvm/tools/llvm-profdata/CMakeLists.txt
+++ b/llvm/tools/llvm-profdata/CMakeLists.txt
@@ -1,8 +1,8 @@
 set(LLVM_LINK_COMPONENTS
  Core
-  ProfileData
-  Object
  DebugInfoDWARF
+  Object
+  ProfileData
  Support
  )

--- a/llvm/tools/llvm-readobj/CMakeLists.txt
+++ b/llvm/tools/llvm-readobj/CMakeLists.txt
@@ -1,15 +1,14 @@
 set(LLVM_LINK_COMPONENTS
+  BinaryFormat
  DebugInfoCodeView
  DebugInfoDWARF
+  DebugInfoMSF
+  DebugInfoPDB
  Demangle
  Object
-  BinaryFormat
  Option
  Support
  TargetParser
-  DebugInfoCodeView
-  DebugInfoMSF
-  DebugInfoPDB
  )

 set(LLVM_TARGET_DEFINITIONS Opts.td)
--- a/llvm/tools/llvm-reduce/CMakeLists.txt
+++ b/llvm/tools/llvm-reduce/CMakeLists.txt
@@ -8,6 +8,7 @@ set(LLVM_LINK_COMPONENTS
  BitWriter
  CodeGen
  Core
+  IPO
  IRReader
  MC
  MIRParser
@@ -16,7 +17,6 @@ set(LLVM_LINK_COMPONENTS
  Target
  TargetParser
  TransformUtils
-  IPO
  )

 add_llvm_tool(llvm-reduce
--- a/llvm/tools/llvm-remark-size-diff/CMakeLists.txt
+++ b/llvm/tools/llvm-remark-size-diff/CMakeLists.txt
@@ -1,5 +1,11 @@
-set(LLVM_LINK_COMPONENTS Core Demangle Object Remarks Support)
+set(LLVM_LINK_COMPONENTS
+  Core
+  Demangle
+  Object
+  Remarks
+  Support
+  )

 add_llvm_tool(llvm-remark-size-diff
  RemarkSizeDiff.cpp
-)
+  )
--- a/llvm/tools/llvm-remarkutil/CMakeLists.txt
+++ b/llvm/tools/llvm-remarkutil/CMakeLists.txt
@@ -1,5 +1,11 @@
-set(LLVM_LINK_COMPONENTS Core Demangle Object Remarks Support)
+set(LLVM_LINK_COMPONENTS
+  Core
+  Demangle
+  Object
+  Remarks
+  Support
+  )

 add_llvm_tool(llvm-remarkutil
  RemarkUtil.cpp
-)
+  )
--- a/llvm/tools/sancov/CMakeLists.txt
+++ b/llvm/tools/sancov/CMakeLists.txt
@@ -8,8 +8,8 @@ set(LLVM_LINK_COMPONENTS
  MCDisassembler
  Object
  Support
-  TargetParser
  Symbolize
+  TargetParser
  )

 add_llvm_tool(sancov
--- a/llvm/unittests/DWARFLinkerParallel/CMakeLists.txt
+++ b/llvm/unittests/DWARFLinkerParallel/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(LLVM_LINK_COMPONENTS
-  Support
  DWARFLinkerParallel
+  Support
  )

 add_llvm_unittest(DWARFLinkerParallelTests
--- a/llvm/unittests/Frontend/CMakeLists.txt
+++ b/llvm/unittests/Frontend/CMakeLists.txt
@@ -1,10 +1,10 @@
 set(LLVM_LINK_COMPONENTS
  Analysis
  Core
-  FrontendOpenMP
  FrontendOpenACC
-  Support
+  FrontendOpenMP
  Passes
+  Support
  TargetParser
  TransformUtils
  )
--- a/llvm/unittests/Target/AArch64/CMakeLists.txt
+++ b/llvm/unittests/Target/AArch64/CMakeLists.txt
@@ -5,9 +5,9 @@ include_directories(

 set(LLVM_LINK_COMPONENTS
  AArch64CodeGen
-  AArch64Utils
  AArch64Desc
  AArch64Info
+  AArch64Utils
  AsmParser
  CodeGen
  Core
--- a/llvm/unittests/Target/ARM/CMakeLists.txt
+++ b/llvm/unittests/Target/ARM/CMakeLists.txt
@@ -16,7 +16,7 @@ set(LLVM_LINK_COMPONENTS
  Support
  Target
  TargetParser
-)
+  )

 add_llvm_target_unittest(ARMTests
  MachineInstrTest.cpp
--- a/llvm/unittests/Target/LoongArch/CMakeLists.txt
+++ b/llvm/unittests/Target/LoongArch/CMakeLists.txt
@@ -4,11 +4,11 @@ include_directories(
  )

 set(LLVM_LINK_COMPONENTS
+  CodeGen
+  Core
  LoongArchCodeGen
  LoongArchDesc
  LoongArchInfo
-  CodeGen
-  Core
  MC
  MIRParser
  SelectionDAG
--- a/llvm/unittests/Target/X86/CMakeLists.txt
+++ b/llvm/unittests/Target/X86/CMakeLists.txt
@@ -8,10 +8,10 @@ set(LLVM_LINK_COMPONENTS
  AsmParser
  CodeGen
  Core
-  Passes
  InstCombine
  MC
  MIRParser
+  Passes
  Support
  Target
  TargetParser
--- a/llvm/unittests/TextAPI/CMakeLists.txt
+++ b/llvm/unittests/TextAPI/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(LLVM_LINK_COMPONENTS
  TextAPI
-)
+  )

 add_llvm_unittest(TextAPITests
  TextStubV1Tests.cpp
@@ -8,6 +8,6 @@ add_llvm_unittest(TextAPITests
  TextStubV3Tests.cpp
  TextStubV4Tests.cpp
  TextStubV5Tests.cpp
-)
+  )

 target_link_libraries(TextAPITests PRIVATE LLVMTestingSupport)