Update build infrastructure for LLVM 10.0.0.

ok hackroom@
tested by plenty

8 files changed, 193 insertions, 140 deletions

diff --git a/gnu/usr.bin/clang/llvm-config/BuildVariables.inc.def b/gnu/usr.bin/clang/llvm-config/BuildVariables.inc.def
index 739593ea407..369b02abe14 100644
--- a/gnu/usr.bin/clang/llvm-config/BuildVariables.inc.def
+++ b/gnu/usr.bin/clang/llvm-config/BuildVariables.inc.def
@@ -1,9 +1,8 @@
 //===-- BuildVariables.inc.in - llvm-config build variables -*- C++ -*-----===//
 //
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
@@ -16,12 +15,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-#define LLVM_SRC_ROOT "/usr/src/gnu/llvm"
+#define LLVM_SRC_ROOT "/usr/src/gnu/llvm/llvm"
 #define LLVM_OBJ_ROOT "/usr/obj/gnu/usr.bin/clang"
-#define LLVM_CPPFLAGS "  -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS"
-#define LLVM_CFLAGS "-O2 -pipe -fPIC -Werror=date-time -Werror=unguarded-availability-new -Wall -Wextra -Wno-unused-parameter -Wwrite-strings -Wmissing-field-initializers -pedantic -Wno-long-long -Wcovered-switch-default -Wdelete-non-virtual-dtor -Wstring-conversion -fdiagnostics-color -ffunction-sections -fdata-sections -DNDEBUG -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS"
+#define LLVM_CPPFLAGS "-D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS"
+#define LLVM_CFLAGS " -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS"
 #define LLVM_LDFLAGS ""
-#define LLVM_CXXFLAGS "-O2 -pipe  -fno-ret-protector -mno-retpoline -fPIC -fvisibility-inlines-hidden -Werror=date-time -Werror=unguarded-availability-new -std=c++11 -Wall -Wextra -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wmissing-field-initializers -pedantic -Wno-long-long -Wcovered-switch-default -Wnon-virtual-dtor -Wdelete-non-virtual-dtor -Wstring-conversion -fdiagnostics-color -ffunction-sections -fdata-sections -DNDEBUG  -fno-exceptions -fno-rtti -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS"
+#define LLVM_CXXFLAGS "-std=c++14   -fno-exceptions -fno-rtti -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS"
 #define LLVM_BUILDMODE "Release"
 #define LLVM_LIBDIR_SUFFIX ""
 #define LLVM_SYSTEM_LIBS "-lz -lpthread -lm"
@@ -31,6 +30,6 @@
 #define LLVM_LINK_DYLIB 1
 #define LLVM_ENABLE_SHARED 0
 #define LLVM_DYLIB_COMPONENTS "all"
-#define LLVM_DYLIB_VERSION "7"
+#define LLVM_DYLIB_VERSION "10"
 #define LLVM_HAS_GLOBAL_ISEL 1
 #define LLVM_TOOLS_INSTALL_DIR "bin"
diff --git a/gnu/usr.bin/clang/llvm-config/LibraryDependencies.inc.AArch64 b/gnu/usr.bin/clang/llvm-config/LibraryDependencies.inc.AArch64
index 6a70816b71d..b5782db0778 100644
--- a/gnu/usr.bin/clang/llvm-config/LibraryDependencies.inc.AArch64
+++ b/gnu/usr.bin/clang/llvm-config/LibraryDependencies.inc.AArch64
@@ -17,47 +17,50 @@ struct AvailableComponent {
   bool IsInstalled;
 
   /// The list of libraries required when linking this component.
-  const char *RequiredLibraries[21];
-} AvailableComponents[75] = {
-  { "aarch64", nullptr, true, { "aarch64utils", "aarch64asmprinter", "aarch64info", "aarch64desc", "aarch64asmparser", "aarch64codegen", "aarch64disassembler" } },
+  const char *RequiredLibraries[25];
+} AvailableComponents[84] = {
+  { "aarch64", nullptr, true, { "aarch64info", "aarch64utils", "aarch64desc", "aarch64asmparser", "aarch64codegen", "aarch64disassembler" } },
   { "aarch64asmparser", "LLVMAArch64AsmParser", true, { "aarch64desc", "aarch64info", "aarch64utils", "mc", "mcparser", "support" } },
-  { "aarch64asmprinter", "LLVMAArch64AsmPrinter", true, { "aarch64utils", "mc", "support" } },
-  { "aarch64codegen", "LLVMAArch64CodeGen", true, { "aarch64asmprinter", "aarch64desc", "aarch64info", "aarch64utils", "analysis", "asmprinter", "codegen", "core", "mc", "scalaropts", "selectiondag", "support", "target", "globalisel" } },
-  { "aarch64desc", "LLVMAArch64Desc", true, { "aarch64asmprinter", "aarch64info", "mc", "support" } },
+  { "aarch64codegen", "LLVMAArch64CodeGen", true, { "aarch64desc", "aarch64info", "aarch64utils", "analysis", "asmprinter", "codegen", "core", "mc", "scalaropts", "selectiondag", "support", "target", "transformutils", "globalisel", "cfguard" } },
+  { "aarch64desc", "LLVMAArch64Desc", true, { "aarch64info", "aarch64utils", "mc", "support" } },
   { "aarch64disassembler", "LLVMAArch64Disassembler", true, { "aarch64desc", "aarch64info", "aarch64utils", "mc", "mcdisassembler", "support" } },
   { "aarch64info", "LLVMAArch64Info", true, { "support" } },
   { "aarch64utils", "LLVMAArch64Utils", true, { "support" } },
   { "aggressiveinstcombine", "LLVMAggressiveInstCombine", true, { "analysis", "core", "support", "transformutils" } },
-  { "all", nullptr, true, { "mcjit", "coroutines", "lineeditor", "libdriver", "engine", "windowsmanifest", "gtest_main", "objectyaml", "all-targets", "testingsupport", "mirparser", "orcjit", "native", "dlltooldriver", "nativecodegen", "tablegen", "coverage", "fuzzmutate", "symbolize", "lto" } },
+  { "all", nullptr, true, { "all-targets", "coroutines", "coverage", "debuginfogsym", "dlltooldriver", "dwarflinker", "engine", "frontendopenmp", "fuzzmutate", "gtest_main", "libdriver", "lineeditor", "lto", "mca", "mcjit", "native", "nativecodegen", "objectyaml", "orcjit", "symbolize", "tablegen", "testingsupport", "windowsmanifest", "xray" } },
   { "all-targets", nullptr, true, { "aarch64", "amdgpu" } },
-  { "amdgpu", nullptr, true, { "amdgpuutils", "amdgpuasmprinter", "amdgpuinfo", "amdgpudesc", "amdgpuasmparser", "amdgpucodegen", "amdgpudisassembler" } },
+  { "amdgpu", nullptr, true, { "amdgpuinfo", "amdgpuutils", "amdgpudesc", "amdgpuasmparser", "amdgpucodegen", "amdgpudisassembler" } },
   { "amdgpuasmparser", "LLVMAMDGPUAsmParser", true, { "mc", "mcparser", "amdgpudesc", "amdgpuinfo", "amdgpuutils", "support" } },
-  { "amdgpuasmprinter", "LLVMAMDGPUAsmPrinter", true, { "mc", "support", "amdgpuutils" } },
-  { "amdgpucodegen", "LLVMAMDGPUCodeGen", true, { "analysis", "asmprinter", "codegen", "core", "ipo", "mc", "amdgpuasmprinter", "amdgpudesc", "amdgpuinfo", "amdgpuutils", "scalaropts", "selectiondag", "support", "target", "transformutils", "vectorize", "globalisel" } },
-  { "amdgpudesc", "LLVMAMDGPUDesc", true, { "core", "mc", "amdgpuasmprinter", "amdgpuinfo", "amdgpuutils", "support" } },
+  { "amdgpucodegen", "LLVMAMDGPUCodeGen", true, { "analysis", "asmprinter", "codegen", "core", "ipo", "mc", "amdgpudesc", "amdgpuinfo", "amdgpuutils", "scalaropts", "selectiondag", "support", "target", "transformutils", "vectorize", "globalisel", "binaryformat", "mirparser" } },
+  { "amdgpudesc", "LLVMAMDGPUDesc", true, { "core", "mc", "amdgpuinfo", "amdgpuutils", "support", "binaryformat" } },
   { "amdgpudisassembler", "LLVMAMDGPUDisassembler", true, { "amdgpudesc", "amdgpuinfo", "amdgpuutils", "mc", "mcdisassembler", "support" } },
   { "amdgpuinfo", "LLVMAMDGPUInfo", true, { "support" } },
-  { "amdgpuutils", "LLVMAMDGPUUtils", true, { "core", "mc", "support" } },
+  { "amdgpuutils", "LLVMAMDGPUUtils", true, { "core", "mc", "binaryformat", "support" } },
   { "analysis", "LLVMAnalysis", true, { "binaryformat", "core", "object", "profiledata", "support" } },
   { "asmparser", "LLVMAsmParser", true, { "binaryformat", "core", "support" } },
-  { "asmprinter", "LLVMAsmPrinter", true, { "analysis", "binaryformat", "codegen", "core", "debuginfocodeview", "debuginfomsf", "mc", "mcparser", "support", "target" } },
+  { "asmprinter", "LLVMAsmPrinter", true, { "analysis", "binaryformat", "codegen", "core", "debuginfocodeview", "debuginfodwarf", "debuginfomsf", "mc", "mcparser", "remarks", "support", "target" } },
   { "binaryformat", "LLVMBinaryFormat", true, { "support" } },
-  { "bitreader", "LLVMBitReader", true, { "core", "support" } },
+  { "bitreader", "LLVMBitReader", true, { "bitstreamreader", "core", "support" } },
+  { "bitstreamreader", "LLVMBitstreamReader", true, { "support" } },
   { "bitwriter", "LLVMBitWriter", true, { "analysis", "core", "mc", "object", "support" } },
+  { "cfguard", "LLVMCFGuard", true, { "core", "support" } },
   { "codegen", "LLVMCodeGen", true, { "analysis", "bitreader", "bitwriter", "core", "mc", "profiledata", "scalaropts", "support", "target", "transformutils" } },
-  { "core", "LLVMCore", true, { "binaryformat", "support" } },
+  { "core", "LLVMCore", true, { "binaryformat", "remarks", "support" } },
   { "coroutines", "LLVMCoroutines", true, { "analysis", "core", "ipo", "scalaropts", "support", "transformutils" } },
   { "coverage", "LLVMCoverage", true, { "core", "object", "profiledata", "support" } },
   { "debuginfocodeview", "LLVMDebugInfoCodeView", true, { "support", "debuginfomsf" } },
   { "debuginfodwarf", "LLVMDebugInfoDWARF", true, { "binaryformat", "object", "mc", "support" } },
+  { "debuginfogsym", "LLVMDebugInfoGSYM", true, { "mc", "support" } },
   { "debuginfomsf", "LLVMDebugInfoMSF", true, { "support" } },
   { "debuginfopdb", "LLVMDebugInfoPDB", true, { "object", "support", "debuginfocodeview", "debuginfomsf" } },
   { "demangle", "LLVMDemangle", true, {  } },
   { "dlltooldriver", "LLVMDlltoolDriver", true, { "object", "option", "support" } },
+  { "dwarflinker", "LLVMDWARFLinker", true, { "debuginfodwarf", "asmprinter", "codegen", "mc", "object", "support" } },
   { "engine", nullptr, true, { "interpreter" } },
   { "executionengine", "LLVMExecutionEngine", true, { "core", "mc", "object", "runtimedyld", "support", "target" } },
+  { "frontendopenmp", "LLVMFrontendOpenMP", true, { "core", "support", "transformutils" } },
   { "fuzzmutate", "LLVMFuzzMutate", true, { "analysis", "bitreader", "bitwriter", "core", "scalaropts", "support", "target" } },
-  { "globalisel", "LLVMGlobalISel", true, { "analysis", "codegen", "core", "mc", "support", "target", "transformutils" } },
+  { "globalisel", "LLVMGlobalISel", true, { "analysis", "codegen", "core", "mc", "selectiondag", "support", "target", "transformutils" } },
   { "gtest", "gtest", false, { "support" } },
   { "gtest_main", "gtest_main", false, { "gtest" } },
   { "instcombine", "LLVMInstCombine", true, { "analysis", "core", "support", "transformutils" } },
@@ -65,11 +68,13 @@ struct AvailableComponent {
   { "interpreter", "LLVMInterpreter", true, { "codegen", "core", "executionengine", "support" } },
   { "ipo", "LLVMipo", true, { "aggressiveinstcombine", "analysis", "bitreader", "bitwriter", "core", "instcombine", "irreader", "linker", "object", "profiledata", "scalaropts", "support", "transformutils", "vectorize", "instrumentation" } },
   { "irreader", "LLVMIRReader", true, { "asmparser", "bitreader", "core", "support" } },
-  { "libdriver", "LLVMLibDriver", true, { "binaryformat", "object", "option", "support" } },
+  { "jitlink", "LLVMJITLink", true, { "binaryformat", "object", "support" } },
+  { "libdriver", "LLVMLibDriver", true, { "binaryformat", "bitreader", "object", "option", "support" } },
   { "lineeditor", "LLVMLineEditor", true, { "support" } },
   { "linker", "LLVMLinker", true, { "core", "support", "transformutils" } },
-  { "lto", "LLVMLTO", true, { "aggressiveinstcombine", "analysis", "bitreader", "bitwriter", "codegen", "core", "ipo", "instcombine", "linker", "mc", "objcarcopts", "object", "passes", "scalaropts", "support", "target", "transformutils" } },
+  { "lto", "LLVMLTO", true, { "aggressiveinstcombine", "analysis", "bitreader", "bitwriter", "codegen", "core", "ipo", "instcombine", "linker", "mc", "objcarcopts", "object", "passes", "remarks", "scalaropts", "support", "target", "transformutils" } },
   { "mc", "LLVMMC", true, { "support", "binaryformat", "debuginfocodeview" } },
+  { "mca", "LLVMMCA", true, { "mc", "support" } },
   { "mcdisassembler", "LLVMMCDisassembler", true, { "mc", "support" } },
   { "mcjit", "LLVMMCJIT", true, { "core", "executionengine", "object", "runtimedyld", "support", "target" } },
   { "mcparser", "LLVMMCParser", true, { "mc", "support" } },
@@ -77,12 +82,14 @@ struct AvailableComponent {
   { "native", nullptr, true, {  } },
   { "nativecodegen", nullptr, true, {  } },
   { "objcarcopts", "LLVMObjCARCOpts", true, { "analysis", "core", "support", "transformutils" } },
-  { "object", "LLVMObject", true, { "bitreader", "core", "mc", "binaryformat", "mcparser", "support" } },
-  { "objectyaml", "LLVMObjectYAML", true, { "support", "debuginfocodeview" } },
+  { "object", "LLVMObject", true, { "bitreader", "core", "mc", "binaryformat", "mcparser", "support", "textapi" } },
+  { "objectyaml", "LLVMObjectYAML", true, { "object", "support", "debuginfocodeview", "mc" } },
   { "option", "LLVMOption", true, { "support" } },
-  { "orcjit", "LLVMOrcJIT", true, { "core", "executionengine", "object", "mc", "runtimedyld", "support", "target", "transformutils" } },
+  { "orcerror", "LLVMOrcError", true, { "support" } },
+  { "orcjit", "LLVMOrcJIT", true, { "core", "executionengine", "jitlink", "object", "orcerror", "mc", "passes", "runtimedyld", "support", "target", "transformutils" } },
   { "passes", "LLVMPasses", true, { "aggressiveinstcombine", "analysis", "codegen", "core", "ipo", "instcombine", "scalaropts", "support", "target", "transformutils", "vectorize", "instrumentation" } },
   { "profiledata", "LLVMProfileData", true, { "core", "support" } },
+  { "remarks", "LLVMRemarks", true, { "bitstreamreader", "support" } },
   { "runtimedyld", "LLVMRuntimeDyld", true, { "mc", "object", "support" } },
   { "scalaropts", "LLVMScalarOpts", true, { "aggressiveinstcombine", "analysis", "core", "instcombine", "support", "transformutils" } },
   { "selectiondag", "LLVMSelectionDAG", true, { "analysis", "codegen", "core", "mc", "support", "target", "transformutils" } },
@@ -91,7 +98,9 @@ struct AvailableComponent {
   { "tablegen", "LLVMTableGen", true, { "support" } },
   { "target", "LLVMTarget", true, { "analysis", "core", "mc", "support" } },
   { "testingsupport", "LLVMTestingSupport", false, { "support" } },
+  { "textapi", "LLVMTextAPI", true, { "support", "binaryformat" } },
   { "transformutils", "LLVMTransformUtils", true, { "analysis", "core", "support" } },
   { "vectorize", "LLVMVectorize", true, { "analysis", "core", "support", "transformutils" } },
   { "windowsmanifest", "LLVMWindowsManifest", true, { "support" } },
+  { "xray", "LLVMXRay", true, { "support", "object" } },
 };
diff --git a/gnu/usr.bin/clang/llvm-config/LibraryDependencies.inc.ARM b/gnu/usr.bin/clang/llvm-config/LibraryDependencies.inc.ARM
index 54a96e8e7ff..c153070553c 100644
--- a/gnu/usr.bin/clang/llvm-config/LibraryDependencies.inc.ARM
+++ b/gnu/usr.bin/clang/llvm-config/LibraryDependencies.inc.ARM
@@ -17,47 +17,50 @@ struct AvailableComponent {
   bool IsInstalled;
 
   /// The list of libraries required when linking this component.
-  const char *RequiredLibraries[21];
-} AvailableComponents[75] = {
+  const char *RequiredLibraries[25];
+} AvailableComponents[84] = {
   { "aggressiveinstcombine", "LLVMAggressiveInstCombine", true, { "analysis", "core", "support", "transformutils" } },
-  { "all", nullptr, true, { "mcjit", "coroutines", "lineeditor", "libdriver", "engine", "fuzzmutate", "windowsmanifest", "gtest_main", "objectyaml", "all-targets", "testingsupport", "mirparser", "orcjit", "native", "dlltooldriver", "nativecodegen", "tablegen", "coverage", "symbolize", "lto" } },
+  { "all", nullptr, true, { "all-targets", "coroutines", "coverage", "debuginfogsym", "dlltooldriver", "dwarflinker", "engine", "frontendopenmp", "fuzzmutate", "gtest_main", "libdriver", "lineeditor", "lto", "mca", "mcjit", "native", "nativecodegen", "objectyaml", "orcjit", "symbolize", "tablegen", "testingsupport", "windowsmanifest", "xray" } },
   { "all-targets", nullptr, true, { "arm", "amdgpu" } },
-  { "amdgpu", nullptr, true, { "amdgpuutils", "amdgpuasmprinter", "amdgpuinfo", "amdgpudesc", "amdgpuasmparser", "amdgpucodegen", "amdgpudisassembler" } },
+  { "amdgpu", nullptr, true, { "amdgpuinfo", "amdgpuutils", "amdgpudesc", "amdgpuasmparser", "amdgpucodegen", "amdgpudisassembler" } },
   { "amdgpuasmparser", "LLVMAMDGPUAsmParser", true, { "mc", "mcparser", "amdgpudesc", "amdgpuinfo", "amdgpuutils", "support" } },
-  { "amdgpuasmprinter", "LLVMAMDGPUAsmPrinter", true, { "mc", "support", "amdgpuutils" } },
-  { "amdgpucodegen", "LLVMAMDGPUCodeGen", true, { "analysis", "asmprinter", "codegen", "core", "ipo", "mc", "amdgpuasmprinter", "amdgpudesc", "amdgpuinfo", "amdgpuutils", "scalaropts", "selectiondag", "support", "target", "transformutils", "vectorize", "globalisel" } },
-  { "amdgpudesc", "LLVMAMDGPUDesc", true, { "core", "mc", "amdgpuasmprinter", "amdgpuinfo", "amdgpuutils", "support" } },
+  { "amdgpucodegen", "LLVMAMDGPUCodeGen", true, { "analysis", "asmprinter", "codegen", "core", "ipo", "mc", "amdgpudesc", "amdgpuinfo", "amdgpuutils", "scalaropts", "selectiondag", "support", "target", "transformutils", "vectorize", "globalisel", "binaryformat", "mirparser" } },
+  { "amdgpudesc", "LLVMAMDGPUDesc", true, { "core", "mc", "amdgpuinfo", "amdgpuutils", "support", "binaryformat" } },
   { "amdgpudisassembler", "LLVMAMDGPUDisassembler", true, { "amdgpudesc", "amdgpuinfo", "amdgpuutils", "mc", "mcdisassembler", "support" } },
   { "amdgpuinfo", "LLVMAMDGPUInfo", true, { "support" } },
-  { "amdgpuutils", "LLVMAMDGPUUtils", true, { "core", "mc", "support" } },
+  { "amdgpuutils", "LLVMAMDGPUUtils", true, { "core", "mc", "binaryformat", "support" } },
   { "analysis", "LLVMAnalysis", true, { "binaryformat", "core", "object", "profiledata", "support" } },
-  { "arm", nullptr, true, { "armutils", "armasmprinter", "arminfo", "armdesc", "armasmparser", "armcodegen", "armdisassembler" } },
+  { "arm", nullptr, true, { "arminfo", "armutils", "armdesc", "armasmparser", "armcodegen", "armdisassembler" } },
   { "armasmparser", "LLVMARMAsmParser", true, { "armdesc", "arminfo", "mc", "mcparser", "support", "armutils" } },
-  { "armasmprinter", "LLVMARMAsmPrinter", true, { "mc", "support", "armutils" } },
-  { "armcodegen", "LLVMARMCodeGen", true, { "armasmprinter", "armdesc", "arminfo", "analysis", "asmprinter", "codegen", "core", "mc", "scalaropts", "selectiondag", "support", "target", "globalisel", "armutils", "transformutils" } },
-  { "armdesc", "LLVMARMDesc", true, { "armasmprinter", "arminfo", "mc", "mcdisassembler", "support" } },
+  { "armcodegen", "LLVMARMCodeGen", true, { "armdesc", "arminfo", "analysis", "asmprinter", "codegen", "core", "mc", "scalaropts", "selectiondag", "support", "target", "globalisel", "armutils", "transformutils", "cfguard" } },
+  { "armdesc", "LLVMARMDesc", true, { "arminfo", "armutils", "mc", "mcdisassembler", "support" } },
   { "armdisassembler", "LLVMARMDisassembler", true, { "armdesc", "arminfo", "mcdisassembler", "support", "armutils" } },
   { "arminfo", "LLVMARMInfo", true, { "support" } },
   { "armutils", "LLVMARMUtils", true, { "support" } },
   { "asmparser", "LLVMAsmParser", true, { "binaryformat", "core", "support" } },
-  { "asmprinter", "LLVMAsmPrinter", true, { "analysis", "binaryformat", "codegen", "core", "debuginfocodeview", "debuginfomsf", "mc", "mcparser", "support", "target" } },
+  { "asmprinter", "LLVMAsmPrinter", true, { "analysis", "binaryformat", "codegen", "core", "debuginfocodeview", "debuginfodwarf", "debuginfomsf", "mc", "mcparser", "remarks", "support", "target" } },
   { "binaryformat", "LLVMBinaryFormat", true, { "support" } },
-  { "bitreader", "LLVMBitReader", true, { "core", "support" } },
+  { "bitreader", "LLVMBitReader", true, { "bitstreamreader", "core", "support" } },
+  { "bitstreamreader", "LLVMBitstreamReader", true, { "support" } },
   { "bitwriter", "LLVMBitWriter", true, { "analysis", "core", "mc", "object", "support" } },
+  { "cfguard", "LLVMCFGuard", true, { "core", "support" } },
   { "codegen", "LLVMCodeGen", true, { "analysis", "bitreader", "bitwriter", "core", "mc", "profiledata", "scalaropts", "support", "target", "transformutils" } },
-  { "core", "LLVMCore", true, { "binaryformat", "support" } },
+  { "core", "LLVMCore", true, { "binaryformat", "remarks", "support" } },
   { "coroutines", "LLVMCoroutines", true, { "analysis", "core", "ipo", "scalaropts", "support", "transformutils" } },
   { "coverage", "LLVMCoverage", true, { "core", "object", "profiledata", "support" } },
   { "debuginfocodeview", "LLVMDebugInfoCodeView", true, { "support", "debuginfomsf" } },
   { "debuginfodwarf", "LLVMDebugInfoDWARF", true, { "binaryformat", "object", "mc", "support" } },
+  { "debuginfogsym", "LLVMDebugInfoGSYM", true, { "mc", "support" } },
   { "debuginfomsf", "LLVMDebugInfoMSF", true, { "support" } },
   { "debuginfopdb", "LLVMDebugInfoPDB", true, { "object", "support", "debuginfocodeview", "debuginfomsf" } },
   { "demangle", "LLVMDemangle", true, {  } },
   { "dlltooldriver", "LLVMDlltoolDriver", true, { "object", "option", "support" } },
+  { "dwarflinker", "LLVMDWARFLinker", true, { "debuginfodwarf", "asmprinter", "codegen", "mc", "object", "support" } },
   { "engine", nullptr, true, { "interpreter" } },
   { "executionengine", "LLVMExecutionEngine", true, { "core", "mc", "object", "runtimedyld", "support", "target" } },
+  { "frontendopenmp", "LLVMFrontendOpenMP", true, { "core", "support", "transformutils" } },
   { "fuzzmutate", "LLVMFuzzMutate", true, { "analysis", "bitreader", "bitwriter", "core", "scalaropts", "support", "target" } },
-  { "globalisel", "LLVMGlobalISel", true, { "analysis", "codegen", "core", "mc", "support", "target", "transformutils" } },
+  { "globalisel", "LLVMGlobalISel", true, { "analysis", "codegen", "core", "mc", "selectiondag", "support", "target", "transformutils" } },
   { "gtest", "gtest", false, { "support" } },
   { "gtest_main", "gtest_main", false, { "gtest" } },
   { "instcombine", "LLVMInstCombine", true, { "analysis", "core", "support", "transformutils" } },
@@ -65,11 +68,13 @@ struct AvailableComponent {
   { "interpreter", "LLVMInterpreter", true, { "codegen", "core", "executionengine", "support" } },
   { "ipo", "LLVMipo", true, { "aggressiveinstcombine", "analysis", "bitreader", "bitwriter", "core", "instcombine", "irreader", "linker", "object", "profiledata", "scalaropts", "support", "transformutils", "vectorize", "instrumentation" } },
   { "irreader", "LLVMIRReader", true, { "asmparser", "bitreader", "core", "support" } },
-  { "libdriver", "LLVMLibDriver", true, { "binaryformat", "object", "option", "support" } },
+  { "jitlink", "LLVMJITLink", true, { "binaryformat", "object", "support" } },
+  { "libdriver", "LLVMLibDriver", true, { "binaryformat", "bitreader", "object", "option", "support" } },
   { "lineeditor", "LLVMLineEditor", true, { "support" } },
   { "linker", "LLVMLinker", true, { "core", "support", "transformutils" } },
-  { "lto", "LLVMLTO", true, { "aggressiveinstcombine", "analysis", "bitreader", "bitwriter", "codegen", "core", "ipo", "instcombine", "linker", "mc", "objcarcopts", "object", "passes", "scalaropts", "support", "target", "transformutils" } },
+  { "lto", "LLVMLTO", true, { "aggressiveinstcombine", "analysis", "bitreader", "bitwriter", "codegen", "core", "ipo", "instcombine", "linker", "mc", "objcarcopts", "object", "passes", "remarks", "scalaropts", "support", "target", "transformutils" } },
   { "mc", "LLVMMC", true, { "support", "binaryformat", "debuginfocodeview" } },
+  { "mca", "LLVMMCA", true, { "mc", "support" } },
   { "mcdisassembler", "LLVMMCDisassembler", true, { "mc", "support" } },
   { "mcjit", "LLVMMCJIT", true, { "core", "executionengine", "object", "runtimedyld", "support", "target" } },
   { "mcparser", "LLVMMCParser", true, { "mc", "support" } },
@@ -77,12 +82,14 @@ struct AvailableComponent {
   { "native", nullptr, true, {  } },
   { "nativecodegen", nullptr, true, {  } },
   { "objcarcopts", "LLVMObjCARCOpts", true, { "analysis", "core", "support", "transformutils" } },
-  { "object", "LLVMObject", true, { "bitreader", "core", "mc", "binaryformat", "mcparser", "support" } },
-  { "objectyaml", "LLVMObjectYAML", true, { "support", "debuginfocodeview" } },
+  { "object", "LLVMObject", true, { "bitreader", "core", "mc", "binaryformat", "mcparser", "support", "textapi" } },
+  { "objectyaml", "LLVMObjectYAML", true, { "object", "support", "debuginfocodeview", "mc" } },
   { "option", "LLVMOption", true, { "support" } },
-  { "orcjit", "LLVMOrcJIT", true, { "core", "executionengine", "object", "mc", "runtimedyld", "support", "target", "transformutils" } },
+  { "orcerror", "LLVMOrcError", true, { "support" } },
+  { "orcjit", "LLVMOrcJIT", true, { "core", "executionengine", "jitlink", "object", "orcerror", "mc", "passes", "runtimedyld", "support", "target", "transformutils" } },
   { "passes", "LLVMPasses", true, { "aggressiveinstcombine", "analysis", "codegen", "core", "ipo", "instcombine", "scalaropts", "support", "target", "transformutils", "vectorize", "instrumentation" } },
   { "profiledata", "LLVMProfileData", true, { "core", "support" } },
+  { "remarks", "LLVMRemarks", true, { "bitstreamreader", "support" } },
   { "runtimedyld", "LLVMRuntimeDyld", true, { "mc", "object", "support" } },
   { "scalaropts", "LLVMScalarOpts", true, { "aggressiveinstcombine", "analysis", "core", "instcombine", "support", "transformutils" } },
   { "selectiondag", "LLVMSelectionDAG", true, { "analysis", "codegen", "core", "mc", "support", "target", "transformutils" } },
@@ -91,7 +98,9 @@ struct AvailableComponent {
   { "tablegen", "LLVMTableGen", true, { "support" } },
   { "target", "LLVMTarget", true, { "analysis", "core", "mc", "support" } },
   { "testingsupport", "LLVMTestingSupport", false, { "support" } },
+  { "textapi", "LLVMTextAPI", true, { "support", "binaryformat" } },
   { "transformutils", "LLVMTransformUtils", true, { "analysis", "core", "support" } },
   { "vectorize", "LLVMVectorize", true, { "analysis", "core", "support", "transformutils" } },
   { "windowsmanifest", "LLVMWindowsManifest", true, { "support" } },
+  { "xray", "LLVMXRay", true, { "support", "object" } },
 };
diff --git a/gnu/usr.bin/clang/llvm-config/LibraryDependencies.inc.Mips b/gnu/usr.bin/clang/llvm-config/LibraryDependencies.inc.Mips
index 32f54f3115b..6d22d8566a6 100644
--- a/gnu/usr.bin/clang/llvm-config/LibraryDependencies.inc.Mips
+++ b/gnu/usr.bin/clang/llvm-config/LibraryDependencies.inc.Mips
@@ -17,39 +17,43 @@ struct AvailableComponent {
   bool IsInstalled;
 
   /// The list of libraries required when linking this component.
-  const char *RequiredLibraries[21];
-} AvailableComponents[74] = {
+  const char *RequiredLibraries[26];
+} AvailableComponents[83] = {
   { "aggressiveinstcombine", "LLVMAggressiveInstCombine", true, { "analysis", "core", "support", "transformutils" } },
-  { "all", nullptr, true, { "mcjit", "coroutines", "lineeditor", "libdriver", "engine", "windowsmanifest", "gtest_main", "objectyaml", "all-targets", "testingsupport", "mirparser", "orcjit", "native", "dlltooldriver", "nativecodegen", "tablegen", "coverage", "fuzzmutate", "symbolize", "lto" } },
+  { "all", nullptr, true, { "all-targets", "cfguard", "coroutines", "coverage", "debuginfogsym", "dlltooldriver", "dwarflinker", "engine", "frontendopenmp", "fuzzmutate", "gtest_main", "libdriver", "lineeditor", "lto", "mca", "mcjit", "native", "nativecodegen", "objectyaml", "orcjit", "symbolize", "tablegen", "testingsupport", "windowsmanifest", "xray" } },
   { "all-targets", nullptr, true, { "mips", "amdgpu" } },
-  { "amdgpu", nullptr, true, { "amdgpuutils", "amdgpuasmprinter", "amdgpuinfo", "amdgpudesc", "amdgpuasmparser", "amdgpucodegen", "amdgpudisassembler" } },
+  { "amdgpu", nullptr, true, { "amdgpuinfo", "amdgpuutils", "amdgpudesc", "amdgpuasmparser", "amdgpucodegen", "amdgpudisassembler" } },
   { "amdgpuasmparser", "LLVMAMDGPUAsmParser", true, { "mc", "mcparser", "amdgpudesc", "amdgpuinfo", "amdgpuutils", "support" } },
-  { "amdgpuasmprinter", "LLVMAMDGPUAsmPrinter", true, { "mc", "support", "amdgpuutils" } },
-  { "amdgpucodegen", "LLVMAMDGPUCodeGen", true, { "analysis", "asmprinter", "codegen", "core", "ipo", "mc", "amdgpuasmprinter", "amdgpudesc", "amdgpuinfo", "amdgpuutils", "scalaropts", "selectiondag", "support", "target", "transformutils", "vectorize", "globalisel" } },
-  { "amdgpudesc", "LLVMAMDGPUDesc", true, { "core", "mc", "amdgpuasmprinter", "amdgpuinfo", "amdgpuutils", "support" } },
+  { "amdgpucodegen", "LLVMAMDGPUCodeGen", true, { "analysis", "asmprinter", "codegen", "core", "ipo", "mc", "amdgpudesc", "amdgpuinfo", "amdgpuutils", "scalaropts", "selectiondag", "support", "target", "transformutils", "vectorize", "globalisel", "binaryformat", "mirparser" } },
+  { "amdgpudesc", "LLVMAMDGPUDesc", true, { "core", "mc", "amdgpuinfo", "amdgpuutils", "support", "binaryformat" } },
   { "amdgpudisassembler", "LLVMAMDGPUDisassembler", true, { "amdgpudesc", "amdgpuinfo", "amdgpuutils", "mc", "mcdisassembler", "support" } },
   { "amdgpuinfo", "LLVMAMDGPUInfo", true, { "support" } },
-  { "amdgpuutils", "LLVMAMDGPUUtils", true, { "core", "mc", "support" } },
+  { "amdgpuutils", "LLVMAMDGPUUtils", true, { "core", "mc", "binaryformat", "support" } },
   { "analysis", "LLVMAnalysis", true, { "binaryformat", "core", "object", "profiledata", "support" } },
   { "asmparser", "LLVMAsmParser", true, { "binaryformat", "core", "support" } },
-  { "asmprinter", "LLVMAsmPrinter", true, { "analysis", "binaryformat", "codegen", "core", "debuginfocodeview", "debuginfomsf", "mc", "mcparser", "support", "target" } },
+  { "asmprinter", "LLVMAsmPrinter", true, { "analysis", "binaryformat", "codegen", "core", "debuginfocodeview", "debuginfodwarf", "debuginfomsf", "mc", "mcparser", "remarks", "support", "target" } },
   { "binaryformat", "LLVMBinaryFormat", true, { "support" } },
-  { "bitreader", "LLVMBitReader", true, { "core", "support" } },
+  { "bitreader", "LLVMBitReader", true, { "bitstreamreader", "core", "support" } },
+  { "bitstreamreader", "LLVMBitstreamReader", true, { "support" } },
   { "bitwriter", "LLVMBitWriter", true, { "analysis", "core", "mc", "object", "support" } },
+  { "cfguard", "LLVMCFGuard", true, { "core", "support" } },
   { "codegen", "LLVMCodeGen", true, { "analysis", "bitreader", "bitwriter", "core", "mc", "profiledata", "scalaropts", "support", "target", "transformutils" } },
-  { "core", "LLVMCore", true, { "binaryformat", "support" } },
+  { "core", "LLVMCore", true, { "binaryformat", "remarks", "support" } },
   { "coroutines", "LLVMCoroutines", true, { "analysis", "core", "ipo", "scalaropts", "support", "transformutils" } },
   { "coverage", "LLVMCoverage", true, { "core", "object", "profiledata", "support" } },
   { "debuginfocodeview", "LLVMDebugInfoCodeView", true, { "support", "debuginfomsf" } },
   { "debuginfodwarf", "LLVMDebugInfoDWARF", true, { "binaryformat", "object", "mc", "support" } },
+  { "debuginfogsym", "LLVMDebugInfoGSYM", true, { "mc", "support" } },
   { "debuginfomsf", "LLVMDebugInfoMSF", true, { "support" } },
   { "debuginfopdb", "LLVMDebugInfoPDB", true, { "object", "support", "debuginfocodeview", "debuginfomsf" } },
   { "demangle", "LLVMDemangle", true, {  } },
   { "dlltooldriver", "LLVMDlltoolDriver", true, { "object", "option", "support" } },
+  { "dwarflinker", "LLVMDWARFLinker", true, { "debuginfodwarf", "asmprinter", "codegen", "mc", "object", "support" } },
   { "engine", nullptr, true, { "interpreter" } },
   { "executionengine", "LLVMExecutionEngine", true, { "core", "mc", "object", "runtimedyld", "support", "target" } },
+  { "frontendopenmp", "LLVMFrontendOpenMP", true, { "core", "support", "transformutils" } },
   { "fuzzmutate", "LLVMFuzzMutate", true, { "analysis", "bitreader", "bitwriter", "core", "scalaropts", "support", "target" } },
-  { "globalisel", "LLVMGlobalISel", true, { "analysis", "codegen", "core", "mc", "support", "target", "transformutils" } },
+  { "globalisel", "LLVMGlobalISel", true, { "analysis", "codegen", "core", "mc", "selectiondag", "support", "target", "transformutils" } },
   { "gtest", "gtest", false, { "support" } },
   { "gtest_main", "gtest_main", false, { "gtest" } },
   { "instcombine", "LLVMInstCombine", true, { "analysis", "core", "support", "transformutils" } },
@@ -57,31 +61,34 @@ struct AvailableComponent {
   { "interpreter", "LLVMInterpreter", true, { "codegen", "core", "executionengine", "support" } },
   { "ipo", "LLVMipo", true, { "aggressiveinstcombine", "analysis", "bitreader", "bitwriter", "core", "instcombine", "irreader", "linker", "object", "profiledata", "scalaropts", "support", "transformutils", "vectorize", "instrumentation" } },
   { "irreader", "LLVMIRReader", true, { "asmparser", "bitreader", "core", "support" } },
-  { "libdriver", "LLVMLibDriver", true, { "binaryformat", "object", "option", "support" } },
+  { "jitlink", "LLVMJITLink", true, { "binaryformat", "object", "support" } },
+  { "libdriver", "LLVMLibDriver", true, { "binaryformat", "bitreader", "object", "option", "support" } },
   { "lineeditor", "LLVMLineEditor", true, { "support" } },
   { "linker", "LLVMLinker", true, { "core", "support", "transformutils" } },
-  { "lto", "LLVMLTO", true, { "aggressiveinstcombine", "analysis", "bitreader", "bitwriter", "codegen", "core", "ipo", "instcombine", "linker", "mc", "objcarcopts", "object", "passes", "scalaropts", "support", "target", "transformutils" } },
+  { "lto", "LLVMLTO", true, { "aggressiveinstcombine", "analysis", "bitreader", "bitwriter", "codegen", "core", "ipo", "instcombine", "linker", "mc", "objcarcopts", "object", "passes", "remarks", "scalaropts", "support", "target", "transformutils" } },
   { "mc", "LLVMMC", true, { "support", "binaryformat", "debuginfocodeview" } },
+  { "mca", "LLVMMCA", true, { "mc", "support" } },
   { "mcdisassembler", "LLVMMCDisassembler", true, { "mc", "support" } },
   { "mcjit", "LLVMMCJIT", true, { "core", "executionengine", "object", "runtimedyld", "support", "target" } },
   { "mcparser", "LLVMMCParser", true, { "mc", "support" } },
-  { "mips", nullptr, true, { "mipsasmprinter", "mipsinfo", "mipsdesc", "mipsasmparser", "mipscodegen", "mipsdisassembler" } },
+  { "mips", nullptr, true, { "mipsinfo", "mipsdesc", "mipsasmparser", "mipscodegen", "mipsdisassembler" } },
   { "mipsasmparser", "LLVMMipsAsmParser", true, { "mc", "mcparser", "mipsdesc", "mipsinfo", "support" } },
-  { "mipsasmprinter", "LLVMMipsAsmPrinter", true, { "mc", "support" } },
-  { "mipscodegen", "LLVMMipsCodeGen", true, { "analysis", "asmprinter", "codegen", "core", "mc", "mipsasmprinter", "mipsdesc", "mipsinfo", "selectiondag", "support", "target", "globalisel" } },
-  { "mipsdesc", "LLVMMipsDesc", true, { "mc", "mipsasmprinter", "mipsinfo", "support" } },
+  { "mipscodegen", "LLVMMipsCodeGen", true, { "analysis", "asmprinter", "codegen", "core", "mc", "mipsdesc", "mipsinfo", "selectiondag", "support", "target", "globalisel" } },
+  { "mipsdesc", "LLVMMipsDesc", true, { "mc", "mipsinfo", "support" } },
   { "mipsdisassembler", "LLVMMipsDisassembler", true, { "mcdisassembler", "mipsinfo", "support" } },
   { "mipsinfo", "LLVMMipsInfo", true, { "support" } },
   { "mirparser", "LLVMMIRParser", true, { "asmparser", "binaryformat", "codegen", "core", "mc", "support", "target" } },
   { "native", nullptr, true, {  } },
   { "nativecodegen", nullptr, true, {  } },
   { "objcarcopts", "LLVMObjCARCOpts", true, { "analysis", "core", "support", "transformutils" } },
-  { "object", "LLVMObject", true, { "bitreader", "core", "mc", "binaryformat", "mcparser", "support" } },
-  { "objectyaml", "LLVMObjectYAML", true, { "support", "debuginfocodeview" } },
+  { "object", "LLVMObject", true, { "bitreader", "core", "mc", "binaryformat", "mcparser", "support", "textapi" } },
+  { "objectyaml", "LLVMObjectYAML", true, { "object", "support", "debuginfocodeview", "mc" } },
   { "option", "LLVMOption", true, { "support" } },
-  { "orcjit", "LLVMOrcJIT", true, { "core", "executionengine", "object", "mc", "runtimedyld", "support", "target", "transformutils" } },
+  { "orcerror", "LLVMOrcError", true, { "support" } },
+  { "orcjit", "LLVMOrcJIT", true, { "core", "executionengine", "jitlink", "object", "orcerror", "mc", "passes", "runtimedyld", "support", "target", "transformutils" } },
   { "passes", "LLVMPasses", true, { "aggressiveinstcombine", "analysis", "codegen", "core", "ipo", "instcombine", "scalaropts", "support", "target", "transformutils", "vectorize", "instrumentation" } },
   { "profiledata", "LLVMProfileData", true, { "core", "support" } },
+  { "remarks", "LLVMRemarks", true, { "bitstreamreader", "support" } },
   { "runtimedyld", "LLVMRuntimeDyld", true, { "mc", "object", "support" } },
   { "scalaropts", "LLVMScalarOpts", true, { "aggressiveinstcombine", "analysis", "core", "instcombine", "support", "transformutils" } },
   { "selectiondag", "LLVMSelectionDAG", true, { "analysis", "codegen", "core", "mc", "support", "target", "transformutils" } },
@@ -90,7 +97,9 @@ struct AvailableComponent {
   { "tablegen", "LLVMTableGen", true, { "support" } },
   { "target", "LLVMTarget", true, { "analysis", "core", "mc", "support" } },
   { "testingsupport", "LLVMTestingSupport", false, { "support" } },
+  { "textapi", "LLVMTextAPI", true, { "support", "binaryformat" } },
   { "transformutils", "LLVMTransformUtils", true, { "analysis", "core", "support" } },
   { "vectorize", "LLVMVectorize", true, { "analysis", "core", "support", "transformutils" } },
   { "windowsmanifest", "LLVMWindowsManifest", true, { "support" } },
+  { "xray", "LLVMXRay", true, { "support", "object" } },
 };
diff --git a/gnu/usr.bin/clang/llvm-config/LibraryDependencies.inc.PowerPC b/gnu/usr.bin/clang/llvm-config/LibraryDependencies.inc.PowerPC
index 2c001e2d56c..b913e96bc3c 100644
--- a/gnu/usr.bin/clang/llvm-config/LibraryDependencies.inc.PowerPC
+++ b/gnu/usr.bin/clang/llvm-config/LibraryDependencies.inc.PowerPC
@@ -17,39 +17,43 @@ struct AvailableComponent {
   bool IsInstalled;
 
   /// The list of libraries required when linking this component.
-  const char *RequiredLibraries[21];
-} AvailableComponents[74] = {
+  const char *RequiredLibraries[26];
+} AvailableComponents[83] = {
   { "aggressiveinstcombine", "LLVMAggressiveInstCombine", true, { "analysis", "core", "support", "transformutils" } },
-  { "all", nullptr, true, { "mcjit", "coroutines", "lineeditor", "libdriver", "engine", "windowsmanifest", "gtest_main", "objectyaml", "all-targets", "testingsupport", "mirparser", "orcjit", "native", "dlltooldriver", "nativecodegen", "tablegen", "coverage", "fuzzmutate", "symbolize", "lto" } },
+  { "all", nullptr, true, { "all-targets", "cfguard", "coroutines", "coverage", "debuginfogsym", "dlltooldriver", "dwarflinker", "engine", "frontendopenmp", "fuzzmutate", "gtest_main", "libdriver", "lineeditor", "lto", "mca", "mcjit", "native", "nativecodegen", "objectyaml", "orcjit", "symbolize", "tablegen", "testingsupport", "windowsmanifest", "xray" } },
   { "all-targets", nullptr, true, { "powerpc", "amdgpu" } },
-  { "amdgpu", nullptr, true, { "amdgpuutils", "amdgpuasmprinter", "amdgpuinfo", "amdgpudesc", "amdgpuasmparser", "amdgpucodegen", "amdgpudisassembler" } },
+  { "amdgpu", nullptr, true, { "amdgpuinfo", "amdgpuutils", "amdgpudesc", "amdgpuasmparser", "amdgpucodegen", "amdgpudisassembler" } },
   { "amdgpuasmparser", "LLVMAMDGPUAsmParser", true, { "mc", "mcparser", "amdgpudesc", "amdgpuinfo", "amdgpuutils", "support" } },
-  { "amdgpuasmprinter", "LLVMAMDGPUAsmPrinter", true, { "mc", "support", "amdgpuutils" } },
-  { "amdgpucodegen", "LLVMAMDGPUCodeGen", true, { "analysis", "asmprinter", "codegen", "core", "ipo", "mc", "amdgpuasmprinter", "amdgpudesc", "amdgpuinfo", "amdgpuutils", "scalaropts", "selectiondag", "support", "target", "transformutils", "vectorize", "globalisel" } },
-  { "amdgpudesc", "LLVMAMDGPUDesc", true, { "core", "mc", "amdgpuasmprinter", "amdgpuinfo", "amdgpuutils", "support" } },
+  { "amdgpucodegen", "LLVMAMDGPUCodeGen", true, { "analysis", "asmprinter", "codegen", "core", "ipo", "mc", "amdgpudesc", "amdgpuinfo", "amdgpuutils", "scalaropts", "selectiondag", "support", "target", "transformutils", "vectorize", "globalisel", "binaryformat", "mirparser" } },
+  { "amdgpudesc", "LLVMAMDGPUDesc", true, { "core", "mc", "amdgpuinfo", "amdgpuutils", "support", "binaryformat" } },
   { "amdgpudisassembler", "LLVMAMDGPUDisassembler", true, { "amdgpudesc", "amdgpuinfo", "amdgpuutils", "mc", "mcdisassembler", "support" } },
   { "amdgpuinfo", "LLVMAMDGPUInfo", true, { "support" } },
-  { "amdgpuutils", "LLVMAMDGPUUtils", true, { "core", "mc", "support" } },
+  { "amdgpuutils", "LLVMAMDGPUUtils", true, { "core", "mc", "binaryformat", "support" } },
   { "analysis", "LLVMAnalysis", true, { "binaryformat", "core", "object", "profiledata", "support" } },
   { "asmparser", "LLVMAsmParser", true, { "binaryformat", "core", "support" } },
-  { "asmprinter", "LLVMAsmPrinter", true, { "analysis", "binaryformat", "codegen", "core", "debuginfocodeview", "debuginfomsf", "mc", "mcparser", "support", "target" } },
+  { "asmprinter", "LLVMAsmPrinter", true, { "analysis", "binaryformat", "codegen", "core", "debuginfocodeview", "debuginfodwarf", "debuginfomsf", "mc", "mcparser", "remarks", "support", "target" } },
   { "binaryformat", "LLVMBinaryFormat", true, { "support" } },
-  { "bitreader", "LLVMBitReader", true, { "core", "support" } },
+  { "bitreader", "LLVMBitReader", true, { "bitstreamreader", "core", "support" } },
+  { "bitstreamreader", "LLVMBitstreamReader", true, { "support" } },
   { "bitwriter", "LLVMBitWriter", true, { "analysis", "core", "mc", "object", "support" } },
+  { "cfguard", "LLVMCFGuard", true, { "core", "support" } },
   { "codegen", "LLVMCodeGen", true, { "analysis", "bitreader", "bitwriter", "core", "mc", "profiledata", "scalaropts", "support", "target", "transformutils" } },
-  { "core", "LLVMCore", true, { "binaryformat", "support" } },
+  { "core", "LLVMCore", true, { "binaryformat", "remarks", "support" } },
   { "coroutines", "LLVMCoroutines", true, { "analysis", "core", "ipo", "scalaropts", "support", "transformutils" } },
   { "coverage", "LLVMCoverage", true, { "core", "object", "profiledata", "support" } },
   { "debuginfocodeview", "LLVMDebugInfoCodeView", true, { "support", "debuginfomsf" } },
   { "debuginfodwarf", "LLVMDebugInfoDWARF", true, { "binaryformat", "object", "mc", "support" } },
+  { "debuginfogsym", "LLVMDebugInfoGSYM", true, { "mc", "support" } },
   { "debuginfomsf", "LLVMDebugInfoMSF", true, { "support" } },
   { "debuginfopdb", "LLVMDebugInfoPDB", true, { "object", "support", "debuginfocodeview", "debuginfomsf" } },
   { "demangle", "LLVMDemangle", true, {  } },
   { "dlltooldriver", "LLVMDlltoolDriver", true, { "object", "option", "support" } },
+  { "dwarflinker", "LLVMDWARFLinker", true, { "debuginfodwarf", "asmprinter", "codegen", "mc", "object", "support" } },
   { "engine", nullptr, true, { "interpreter" } },
   { "executionengine", "LLVMExecutionEngine", true, { "core", "mc", "object", "runtimedyld", "support", "target" } },
+  { "frontendopenmp", "LLVMFrontendOpenMP", true, { "core", "support", "transformutils" } },
   { "fuzzmutate", "LLVMFuzzMutate", true, { "analysis", "bitreader", "bitwriter", "core", "scalaropts", "support", "target" } },
-  { "globalisel", "LLVMGlobalISel", true, { "analysis", "codegen", "core", "mc", "support", "target", "transformutils" } },
+  { "globalisel", "LLVMGlobalISel", true, { "analysis", "codegen", "core", "mc", "selectiondag", "support", "target", "transformutils" } },
   { "gtest", "gtest", false, { "support" } },
   { "gtest_main", "gtest_main", false, { "gtest" } },
   { "instcombine", "LLVMInstCombine", true, { "analysis", "core", "support", "transformutils" } },
@@ -57,11 +61,13 @@ struct AvailableComponent {
   { "interpreter", "LLVMInterpreter", true, { "codegen", "core", "executionengine", "support" } },
   { "ipo", "LLVMipo", true, { "aggressiveinstcombine", "analysis", "bitreader", "bitwriter", "core", "instcombine", "irreader", "linker", "object", "profiledata", "scalaropts", "support", "transformutils", "vectorize", "instrumentation" } },
   { "irreader", "LLVMIRReader", true, { "asmparser", "bitreader", "core", "support" } },
-  { "libdriver", "LLVMLibDriver", true, { "binaryformat", "object", "option", "support" } },
+  { "jitlink", "LLVMJITLink", true, { "binaryformat", "object", "support" } },
+  { "libdriver", "LLVMLibDriver", true, { "binaryformat", "bitreader", "object", "option", "support" } },
   { "lineeditor", "LLVMLineEditor", true, { "support" } },
   { "linker", "LLVMLinker", true, { "core", "support", "transformutils" } },
-  { "lto", "LLVMLTO", true, { "aggressiveinstcombine", "analysis", "bitreader", "bitwriter", "codegen", "core", "ipo", "instcombine", "linker", "mc", "objcarcopts", "object", "passes", "scalaropts", "support", "target", "transformutils" } },
+  { "lto", "LLVMLTO", true, { "aggressiveinstcombine", "analysis", "bitreader", "bitwriter", "codegen", "core", "ipo", "instcombine", "linker", "mc", "objcarcopts", "object", "passes", "remarks", "scalaropts", "support", "target", "transformutils" } },
   { "mc", "LLVMMC", true, { "support", "binaryformat", "debuginfocodeview" } },
+  { "mca", "LLVMMCA", true, { "mc", "support" } },
   { "mcdisassembler", "LLVMMCDisassembler", true, { "mc", "support" } },
   { "mcjit", "LLVMMCJIT", true, { "core", "executionengine", "object", "runtimedyld", "support", "target" } },
   { "mcparser", "LLVMMCParser", true, { "mc", "support" } },
@@ -69,19 +75,20 @@ struct AvailableComponent {
   { "native", nullptr, true, {  } },
   { "nativecodegen", nullptr, true, {  } },
   { "objcarcopts", "LLVMObjCARCOpts", true, { "analysis", "core", "support", "transformutils" } },
-  { "object", "LLVMObject", true, { "bitreader", "core", "mc", "binaryformat", "mcparser", "support" } },
-  { "objectyaml", "LLVMObjectYAML", true, { "support", "debuginfocodeview" } },
+  { "object", "LLVMObject", true, { "bitreader", "core", "mc", "binaryformat", "mcparser", "support", "textapi" } },
+  { "objectyaml", "LLVMObjectYAML", true, { "object", "support", "debuginfocodeview", "mc" } },
   { "option", "LLVMOption", true, { "support" } },
-  { "orcjit", "LLVMOrcJIT", true, { "core", "executionengine", "object", "mc", "runtimedyld", "support", "target", "transformutils" } },
+  { "orcerror", "LLVMOrcError", true, { "support" } },
+  { "orcjit", "LLVMOrcJIT", true, { "core", "executionengine", "jitlink", "object", "orcerror", "mc", "passes", "runtimedyld", "support", "target", "transformutils" } },
   { "passes", "LLVMPasses", true, { "aggressiveinstcombine", "analysis", "codegen", "core", "ipo", "instcombine", "scalaropts", "support", "target", "transformutils", "vectorize", "instrumentation" } },
-  { "powerpc", nullptr, true, { "powerpcasmprinter", "powerpcinfo", "powerpcdesc", "powerpcasmparser", "powerpccodegen", "powerpcdisassembler" } },
+  { "powerpc", nullptr, true, { "powerpcinfo", "powerpcdesc", "powerpcasmparser", "powerpccodegen", "powerpcdisassembler" } },
   { "powerpcasmparser", "LLVMPowerPCAsmParser", true, { "mc", "mcparser", "powerpcdesc", "powerpcinfo", "support" } },
-  { "powerpcasmprinter", "LLVMPowerPCAsmPrinter", true, { "mc", "support" } },
-  { "powerpccodegen", "LLVMPowerPCCodeGen", true, { "analysis", "asmprinter", "codegen", "core", "mc", "powerpcasmprinter", "powerpcdesc", "powerpcinfo", "scalaropts", "selectiondag", "support", "target", "transformutils" } },
-  { "powerpcdesc", "LLVMPowerPCDesc", true, { "mc", "powerpcasmprinter", "powerpcinfo", "support" } },
+  { "powerpccodegen", "LLVMPowerPCCodeGen", true, { "analysis", "asmprinter", "codegen", "core", "mc", "powerpcdesc", "powerpcinfo", "scalaropts", "selectiondag", "support", "target", "transformutils" } },
+  { "powerpcdesc", "LLVMPowerPCDesc", true, { "mc", "powerpcinfo", "support" } },
   { "powerpcdisassembler", "LLVMPowerPCDisassembler", true, { "mcdisassembler", "powerpcinfo", "support" } },
   { "powerpcinfo", "LLVMPowerPCInfo", true, { "support" } },
   { "profiledata", "LLVMProfileData", true, { "core", "support" } },
+  { "remarks", "LLVMRemarks", true, { "bitstreamreader", "support" } },
   { "runtimedyld", "LLVMRuntimeDyld", true, { "mc", "object", "support" } },
   { "scalaropts", "LLVMScalarOpts", true, { "aggressiveinstcombine", "analysis", "core", "instcombine", "support", "transformutils" } },
   { "selectiondag", "LLVMSelectionDAG", true, { "analysis", "codegen", "core", "mc", "support", "target", "transformutils" } },
@@ -90,7 +97,9 @@ struct AvailableComponent {
   { "tablegen", "LLVMTableGen", true, { "support" } },
   { "target", "LLVMTarget", true, { "analysis", "core", "mc", "support" } },
   { "testingsupport", "LLVMTestingSupport", false, { "support" } },
+  { "textapi", "LLVMTextAPI", true, { "support", "binaryformat" } },
   { "transformutils", "LLVMTransformUtils", true, { "analysis", "core", "support" } },
   { "vectorize", "LLVMVectorize", true, { "analysis", "core", "support", "transformutils" } },
   { "windowsmanifest", "LLVMWindowsManifest", true, { "support" } },
+  { "xray", "LLVMXRay", true, { "support", "object" } },
 };
diff --git a/gnu/usr.bin/clang/llvm-config/LibraryDependencies.inc.Sparc b/gnu/usr.bin/clang/llvm-config/LibraryDependencies.inc.Sparc
index 928b1c3f68d..92b37e95b80 100644
--- a/gnu/usr.bin/clang/llvm-config/LibraryDependencies.inc.Sparc
+++ b/gnu/usr.bin/clang/llvm-config/LibraryDependencies.inc.Sparc
@@ -17,39 +17,43 @@ struct AvailableComponent {
   bool IsInstalled;
 
   /// The list of libraries required when linking this component.
-  const char *RequiredLibraries[21];
-} AvailableComponents[74] = {
+  const char *RequiredLibraries[26];
+} AvailableComponents[83] = {
   { "aggressiveinstcombine", "LLVMAggressiveInstCombine", true, { "analysis", "core", "support", "transformutils" } },
-  { "all", nullptr, true, { "mcjit", "coroutines", "libdriver", "engine", "windowsmanifest", "lineeditor", "gtest_main", "objectyaml", "all-targets", "testingsupport", "mirparser", "orcjit", "native", "dlltooldriver", "nativecodegen", "coverage", "fuzzmutate", "tablegen", "symbolize", "lto" } },
+  { "all", nullptr, true, { "all-targets", "cfguard", "coroutines", "coverage", "debuginfogsym", "dlltooldriver", "dwarflinker", "engine", "frontendopenmp", "fuzzmutate", "gtest_main", "libdriver", "lineeditor", "lto", "mca", "mcjit", "native", "nativecodegen", "objectyaml", "orcjit", "symbolize", "tablegen", "testingsupport", "windowsmanifest", "xray" } },
   { "all-targets", nullptr, true, { "sparc", "amdgpu" } },
-  { "amdgpu", nullptr, true, { "amdgpuutils", "amdgpuasmprinter", "amdgpuinfo", "amdgpudesc", "amdgpuasmparser", "amdgpucodegen", "amdgpudisassembler" } },
+  { "amdgpu", nullptr, true, { "amdgpuinfo", "amdgpuutils", "amdgpudesc", "amdgpuasmparser", "amdgpucodegen", "amdgpudisassembler" } },
   { "amdgpuasmparser", "LLVMAMDGPUAsmParser", true, { "mc", "mcparser", "amdgpudesc", "amdgpuinfo", "amdgpuutils", "support" } },
-  { "amdgpuasmprinter", "LLVMAMDGPUAsmPrinter", true, { "mc", "support", "amdgpuutils" } },
-  { "amdgpucodegen", "LLVMAMDGPUCodeGen", true, { "analysis", "asmprinter", "codegen", "core", "ipo", "mc", "amdgpuasmprinter", "amdgpudesc", "amdgpuinfo", "amdgpuutils", "scalaropts", "selectiondag", "support", "target", "transformutils", "vectorize", "globalisel" } },
-  { "amdgpudesc", "LLVMAMDGPUDesc", true, { "core", "mc", "amdgpuasmprinter", "amdgpuinfo", "amdgpuutils", "support" } },
+  { "amdgpucodegen", "LLVMAMDGPUCodeGen", true, { "analysis", "asmprinter", "codegen", "core", "ipo", "mc", "amdgpudesc", "amdgpuinfo", "amdgpuutils", "scalaropts", "selectiondag", "support", "target", "transformutils", "vectorize", "globalisel", "binaryformat", "mirparser" } },
+  { "amdgpudesc", "LLVMAMDGPUDesc", true, { "core", "mc", "amdgpuinfo", "amdgpuutils", "support", "binaryformat" } },
   { "amdgpudisassembler", "LLVMAMDGPUDisassembler", true, { "amdgpudesc", "amdgpuinfo", "amdgpuutils", "mc", "mcdisassembler", "support" } },
   { "amdgpuinfo", "LLVMAMDGPUInfo", true, { "support" } },
-  { "amdgpuutils", "LLVMAMDGPUUtils", true, { "core", "mc", "support" } },
+  { "amdgpuutils", "LLVMAMDGPUUtils", true, { "core", "mc", "binaryformat", "support" } },
   { "analysis", "LLVMAnalysis", true, { "binaryformat", "core", "object", "profiledata", "support" } },
   { "asmparser", "LLVMAsmParser", true, { "binaryformat", "core", "support" } },
-  { "asmprinter", "LLVMAsmPrinter", true, { "analysis", "binaryformat", "codegen", "core", "debuginfocodeview", "debuginfomsf", "mc", "mcparser", "support", "target" } },
+  { "asmprinter", "LLVMAsmPrinter", true, { "analysis", "binaryformat", "codegen", "core", "debuginfocodeview", "debuginfodwarf", "debuginfomsf", "mc", "mcparser", "remarks", "support", "target" } },
   { "binaryformat", "LLVMBinaryFormat", true, { "support" } },
-  { "bitreader", "LLVMBitReader", true, { "core", "support" } },
+  { "bitreader", "LLVMBitReader", true, { "bitstreamreader", "core", "support" } },
+  { "bitstreamreader", "LLVMBitstreamReader", true, { "support" } },
   { "bitwriter", "LLVMBitWriter", true, { "analysis", "core", "mc", "object", "support" } },
+  { "cfguard", "LLVMCFGuard", true, { "core", "support" } },
   { "codegen", "LLVMCodeGen", true, { "analysis", "bitreader", "bitwriter", "core", "mc", "profiledata", "scalaropts", "support", "target", "transformutils" } },
-  { "core", "LLVMCore", true, { "binaryformat", "support" } },
+  { "core", "LLVMCore", true, { "binaryformat", "remarks", "support" } },
   { "coroutines", "LLVMCoroutines", true, { "analysis", "core", "ipo", "scalaropts", "support", "transformutils" } },
   { "coverage", "LLVMCoverage", true, { "core", "object", "profiledata", "support" } },
   { "debuginfocodeview", "LLVMDebugInfoCodeView", true, { "support", "debuginfomsf" } },
   { "debuginfodwarf", "LLVMDebugInfoDWARF", true, { "binaryformat", "object", "mc", "support" } },
+  { "debuginfogsym", "LLVMDebugInfoGSYM", true, { "mc", "support" } },
   { "debuginfomsf", "LLVMDebugInfoMSF", true, { "support" } },
   { "debuginfopdb", "LLVMDebugInfoPDB", true, { "object", "support", "debuginfocodeview", "debuginfomsf" } },
   { "demangle", "LLVMDemangle", true, {  } },
   { "dlltooldriver", "LLVMDlltoolDriver", true, { "object", "option", "support" } },
+  { "dwarflinker", "LLVMDWARFLinker", true, { "debuginfodwarf", "asmprinter", "codegen", "mc", "object", "support" } },
   { "engine", nullptr, true, { "interpreter" } },
   { "executionengine", "LLVMExecutionEngine", true, { "core", "mc", "object", "runtimedyld", "support", "target" } },
+  { "frontendopenmp", "LLVMFrontendOpenMP", true, { "core", "support", "transformutils" } },
   { "fuzzmutate", "LLVMFuzzMutate", true, { "analysis", "bitreader", "bitwriter", "core", "scalaropts", "support", "target" } },
-  { "globalisel", "LLVMGlobalISel", true, { "analysis", "codegen", "core", "mc", "support", "target", "transformutils" } },
+  { "globalisel", "LLVMGlobalISel", true, { "analysis", "codegen", "core", "mc", "selectiondag", "support", "target", "transformutils" } },
   { "gtest", "gtest", false, { "support" } },
   { "gtest_main", "gtest_main", false, { "gtest" } },
   { "instcombine", "LLVMInstCombine", true, { "analysis", "core", "support", "transformutils" } },
@@ -57,11 +61,13 @@ struct AvailableComponent {
   { "interpreter", "LLVMInterpreter", true, { "codegen", "core", "executionengine", "support" } },
   { "ipo", "LLVMipo", true, { "aggressiveinstcombine", "analysis", "bitreader", "bitwriter", "core", "instcombine", "irreader", "linker", "object", "profiledata", "scalaropts", "support", "transformutils", "vectorize", "instrumentation" } },
   { "irreader", "LLVMIRReader", true, { "asmparser", "bitreader", "core", "support" } },
-  { "libdriver", "LLVMLibDriver", true, { "binaryformat", "object", "option", "support" } },
+  { "jitlink", "LLVMJITLink", true, { "binaryformat", "object", "support" } },
+  { "libdriver", "LLVMLibDriver", true, { "binaryformat", "bitreader", "object", "option", "support" } },
   { "lineeditor", "LLVMLineEditor", true, { "support" } },
   { "linker", "LLVMLinker", true, { "core", "support", "transformutils" } },
-  { "lto", "LLVMLTO", true, { "aggressiveinstcombine", "analysis", "bitreader", "bitwriter", "codegen", "core", "ipo", "instcombine", "linker", "mc", "objcarcopts", "object", "passes", "scalaropts", "support", "target", "transformutils" } },
+  { "lto", "LLVMLTO", true, { "aggressiveinstcombine", "analysis", "bitreader", "bitwriter", "codegen", "core", "ipo", "instcombine", "linker", "mc", "objcarcopts", "object", "passes", "remarks", "scalaropts", "support", "target", "transformutils" } },
   { "mc", "LLVMMC", true, { "support", "binaryformat", "debuginfocodeview" } },
+  { "mca", "LLVMMCA", true, { "mc", "support" } },
   { "mcdisassembler", "LLVMMCDisassembler", true, { "mc", "support" } },
   { "mcjit", "LLVMMCJIT", true, { "core", "executionengine", "object", "runtimedyld", "support", "target" } },
   { "mcparser", "LLVMMCParser", true, { "mc", "support" } },
@@ -69,20 +75,21 @@ struct AvailableComponent {
   { "native", nullptr, true, {  } },
   { "nativecodegen", nullptr, true, {  } },
   { "objcarcopts", "LLVMObjCARCOpts", true, { "analysis", "core", "support", "transformutils" } },
-  { "object", "LLVMObject", true, { "bitreader", "core", "mc", "binaryformat", "mcparser", "support" } },
-  { "objectyaml", "LLVMObjectYAML", true, { "support", "debuginfocodeview" } },
+  { "object", "LLVMObject", true, { "bitreader", "core", "mc", "binaryformat", "mcparser", "support", "textapi" } },
+  { "objectyaml", "LLVMObjectYAML", true, { "object", "support", "debuginfocodeview", "mc" } },
   { "option", "LLVMOption", true, { "support" } },
-  { "orcjit", "LLVMOrcJIT", true, { "core", "executionengine", "object", "mc", "runtimedyld", "support", "target", "transformutils" } },
+  { "orcerror", "LLVMOrcError", true, { "support" } },
+  { "orcjit", "LLVMOrcJIT", true, { "core", "executionengine", "jitlink", "object", "orcerror", "mc", "passes", "runtimedyld", "support", "target", "transformutils" } },
   { "passes", "LLVMPasses", true, { "aggressiveinstcombine", "analysis", "codegen", "core", "ipo", "instcombine", "scalaropts", "support", "target", "transformutils", "vectorize", "instrumentation" } },
   { "profiledata", "LLVMProfileData", true, { "core", "support" } },
+  { "remarks", "LLVMRemarks", true, { "bitstreamreader", "support" } },
   { "runtimedyld", "LLVMRuntimeDyld", true, { "mc", "object", "support" } },
   { "scalaropts", "LLVMScalarOpts", true, { "aggressiveinstcombine", "analysis", "core", "instcombine", "support", "transformutils" } },
   { "selectiondag", "LLVMSelectionDAG", true, { "analysis", "codegen", "core", "mc", "support", "target", "transformutils" } },
-  { "sparc", nullptr, true, { "sparcasmprinter", "sparcinfo", "sparcdesc", "sparcasmparser", "sparccodegen", "sparcdisassembler" } },
+  { "sparc", nullptr, true, { "sparcinfo", "sparcdesc", "sparcasmparser", "sparccodegen", "sparcdisassembler" } },
   { "sparcasmparser", "LLVMSparcAsmParser", true, { "mc", "mcparser", "sparcdesc", "sparcinfo", "support" } },
-  { "sparcasmprinter", "LLVMSparcAsmPrinter", true, { "mc", "support" } },
-  { "sparccodegen", "LLVMSparcCodeGen", true, { "asmprinter", "codegen", "core", "mc", "selectiondag", "sparcasmprinter", "sparcdesc", "sparcinfo", "support", "target" } },
-  { "sparcdesc", "LLVMSparcDesc", true, { "mc", "sparcasmprinter", "sparcinfo", "support" } },
+  { "sparccodegen", "LLVMSparcCodeGen", true, { "asmprinter", "codegen", "core", "mc", "selectiondag", "sparcdesc", "sparcinfo", "support", "target" } },
+  { "sparcdesc", "LLVMSparcDesc", true, { "mc", "sparcinfo", "support" } },
   { "sparcdisassembler", "LLVMSparcDisassembler", true, { "mcdisassembler", "sparcinfo", "support" } },
   { "sparcinfo", "LLVMSparcInfo", true, { "support" } },
   { "support", "LLVMSupport", true, { "demangle" } },
@@ -90,7 +97,9 @@ struct AvailableComponent {
   { "tablegen", "LLVMTableGen", true, { "support" } },
   { "target", "LLVMTarget", true, { "analysis", "core", "mc", "support" } },
   { "testingsupport", "LLVMTestingSupport", false, { "support" } },
+  { "textapi", "LLVMTextAPI", true, { "support", "binaryformat" } },
   { "transformutils", "LLVMTransformUtils", true, { "analysis", "core", "support" } },
   { "vectorize", "LLVMVectorize", true, { "analysis", "core", "support", "transformutils" } },
   { "windowsmanifest", "LLVMWindowsManifest", true, { "support" } },
+  { "xray", "LLVMXRay", true, { "support", "object" } },
 };
diff --git a/gnu/usr.bin/clang/llvm-config/LibraryDependencies.inc.X86 b/gnu/usr.bin/clang/llvm-config/LibraryDependencies.inc.X86
index 1b6d3dc9d67..07c732eda12 100644
--- a/gnu/usr.bin/clang/llvm-config/LibraryDependencies.inc.X86
+++ b/gnu/usr.bin/clang/llvm-config/LibraryDependencies.inc.X86
@@ -17,39 +17,43 @@ struct AvailableComponent {
   bool IsInstalled;
 
   /// The list of libraries required when linking this component.
-  const char *RequiredLibraries[20];
-} AvailableComponents[75] = {
+  const char *RequiredLibraries[24];
+} AvailableComponents[84] = {
   { "aggressiveinstcombine", "LLVMAggressiveInstCombine", true, { "analysis", "core", "support", "transformutils" } },
-  { "all", nullptr, true, { "coroutines", "interpreter", "lineeditor", "libdriver", "engine", "windowsmanifest", "gtest_main", "objectyaml", "all-targets", "testingsupport", "mirparser", "coverage", "orcjit", "dlltooldriver", "nativecodegen", "tablegen", "fuzzmutate", "symbolize", "lto" } },
+  { "all", nullptr, true, { "all-targets", "coroutines", "coverage", "debuginfogsym", "dlltooldriver", "dwarflinker", "engine", "frontendopenmp", "fuzzmutate", "gtest_main", "interpreter", "libdriver", "lineeditor", "lto", "mca", "nativecodegen", "objectyaml", "orcjit", "symbolize", "tablegen", "testingsupport", "windowsmanifest", "xray" } },
   { "all-targets", nullptr, true, { "x86", "amdgpu" } },
-  { "amdgpu", nullptr, true, { "amdgpuutils", "amdgpuasmprinter", "amdgpuinfo", "amdgpudesc", "amdgpuasmparser", "amdgpucodegen", "amdgpudisassembler" } },
+  { "amdgpu", nullptr, true, { "amdgpuinfo", "amdgpuutils", "amdgpudesc", "amdgpuasmparser", "amdgpucodegen", "amdgpudisassembler" } },
   { "amdgpuasmparser", "LLVMAMDGPUAsmParser", true, { "mc", "mcparser", "amdgpudesc", "amdgpuinfo", "amdgpuutils", "support" } },
-  { "amdgpuasmprinter", "LLVMAMDGPUAsmPrinter", true, { "mc", "support", "amdgpuutils" } },
-  { "amdgpucodegen", "LLVMAMDGPUCodeGen", true, { "analysis", "asmprinter", "codegen", "core", "ipo", "mc", "amdgpuasmprinter", "amdgpudesc", "amdgpuinfo", "amdgpuutils", "scalaropts", "selectiondag", "support", "target", "transformutils", "vectorize", "globalisel" } },
-  { "amdgpudesc", "LLVMAMDGPUDesc", true, { "core", "mc", "amdgpuasmprinter", "amdgpuinfo", "amdgpuutils", "support" } },
+  { "amdgpucodegen", "LLVMAMDGPUCodeGen", true, { "analysis", "asmprinter", "codegen", "core", "ipo", "mc", "amdgpudesc", "amdgpuinfo", "amdgpuutils", "scalaropts", "selectiondag", "support", "target", "transformutils", "vectorize", "globalisel", "binaryformat", "mirparser" } },
+  { "amdgpudesc", "LLVMAMDGPUDesc", true, { "core", "mc", "amdgpuinfo", "amdgpuutils", "support", "binaryformat" } },
   { "amdgpudisassembler", "LLVMAMDGPUDisassembler", true, { "amdgpudesc", "amdgpuinfo", "amdgpuutils", "mc", "mcdisassembler", "support" } },
   { "amdgpuinfo", "LLVMAMDGPUInfo", true, { "support" } },
-  { "amdgpuutils", "LLVMAMDGPUUtils", true, { "core", "mc", "support" } },
+  { "amdgpuutils", "LLVMAMDGPUUtils", true, { "core", "mc", "binaryformat", "support" } },
   { "analysis", "LLVMAnalysis", true, { "binaryformat", "core", "object", "profiledata", "support" } },
   { "asmparser", "LLVMAsmParser", true, { "binaryformat", "core", "support" } },
-  { "asmprinter", "LLVMAsmPrinter", true, { "analysis", "binaryformat", "codegen", "core", "debuginfocodeview", "debuginfomsf", "mc", "mcparser", "support", "target" } },
+  { "asmprinter", "LLVMAsmPrinter", true, { "analysis", "binaryformat", "codegen", "core", "debuginfocodeview", "debuginfodwarf", "debuginfomsf", "mc", "mcparser", "remarks", "support", "target" } },
   { "binaryformat", "LLVMBinaryFormat", true, { "support" } },
-  { "bitreader", "LLVMBitReader", true, { "core", "support" } },
+  { "bitreader", "LLVMBitReader", true, { "bitstreamreader", "core", "support" } },
+  { "bitstreamreader", "LLVMBitstreamReader", true, { "support" } },
   { "bitwriter", "LLVMBitWriter", true, { "analysis", "core", "mc", "object", "support" } },
+  { "cfguard", "LLVMCFGuard", true, { "core", "support" } },
   { "codegen", "LLVMCodeGen", true, { "analysis", "bitreader", "bitwriter", "core", "mc", "profiledata", "scalaropts", "support", "target", "transformutils" } },
-  { "core", "LLVMCore", true, { "binaryformat", "support" } },
+  { "core", "LLVMCore", true, { "binaryformat", "remarks", "support" } },
   { "coroutines", "LLVMCoroutines", true, { "analysis", "core", "ipo", "scalaropts", "support", "transformutils" } },
   { "coverage", "LLVMCoverage", true, { "core", "object", "profiledata", "support" } },
   { "debuginfocodeview", "LLVMDebugInfoCodeView", true, { "support", "debuginfomsf" } },
   { "debuginfodwarf", "LLVMDebugInfoDWARF", true, { "binaryformat", "object", "mc", "support" } },
+  { "debuginfogsym", "LLVMDebugInfoGSYM", true, { "mc", "support" } },
   { "debuginfomsf", "LLVMDebugInfoMSF", true, { "support" } },
   { "debuginfopdb", "LLVMDebugInfoPDB", true, { "object", "support", "debuginfocodeview", "debuginfomsf" } },
   { "demangle", "LLVMDemangle", true, {  } },
   { "dlltooldriver", "LLVMDlltoolDriver", true, { "object", "option", "support" } },
+  { "dwarflinker", "LLVMDWARFLinker", true, { "debuginfodwarf", "asmprinter", "codegen", "mc", "object", "support" } },
   { "engine", nullptr, true, { "mcjit", "native" } },
   { "executionengine", "LLVMExecutionEngine", true, { "core", "mc", "object", "runtimedyld", "support", "target" } },
+  { "frontendopenmp", "LLVMFrontendOpenMP", true, { "core", "support", "transformutils" } },
   { "fuzzmutate", "LLVMFuzzMutate", true, { "analysis", "bitreader", "bitwriter", "core", "scalaropts", "support", "target" } },
-  { "globalisel", "LLVMGlobalISel", true, { "analysis", "codegen", "core", "mc", "support", "target", "transformutils" } },
+  { "globalisel", "LLVMGlobalISel", true, { "analysis", "codegen", "core", "mc", "selectiondag", "support", "target", "transformutils" } },
   { "gtest", "gtest", false, { "support" } },
   { "gtest_main", "gtest_main", false, { "gtest" } },
   { "instcombine", "LLVMInstCombine", true, { "analysis", "core", "support", "transformutils" } },
@@ -57,11 +61,13 @@ struct AvailableComponent {
   { "interpreter", "LLVMInterpreter", true, { "codegen", "core", "executionengine", "support" } },
   { "ipo", "LLVMipo", true, { "aggressiveinstcombine", "analysis", "bitreader", "bitwriter", "core", "instcombine", "irreader", "linker", "object", "profiledata", "scalaropts", "support", "transformutils", "vectorize", "instrumentation" } },
   { "irreader", "LLVMIRReader", true, { "asmparser", "bitreader", "core", "support" } },
-  { "libdriver", "LLVMLibDriver", true, { "binaryformat", "object", "option", "support" } },
+  { "jitlink", "LLVMJITLink", true, { "binaryformat", "object", "support" } },
+  { "libdriver", "LLVMLibDriver", true, { "binaryformat", "bitreader", "object", "option", "support" } },
   { "lineeditor", "LLVMLineEditor", true, { "support" } },
   { "linker", "LLVMLinker", true, { "core", "support", "transformutils" } },
-  { "lto", "LLVMLTO", true, { "aggressiveinstcombine", "analysis", "bitreader", "bitwriter", "codegen", "core", "ipo", "instcombine", "linker", "mc", "objcarcopts", "object", "passes", "scalaropts", "support", "target", "transformutils" } },
+  { "lto", "LLVMLTO", true, { "aggressiveinstcombine", "analysis", "bitreader", "bitwriter", "codegen", "core", "ipo", "instcombine", "linker", "mc", "objcarcopts", "object", "passes", "remarks", "scalaropts", "support", "target", "transformutils" } },
   { "mc", "LLVMMC", true, { "support", "binaryformat", "debuginfocodeview" } },
+  { "mca", "LLVMMCA", true, { "mc", "support" } },
   { "mcdisassembler", "LLVMMCDisassembler", true, { "mc", "support" } },
   { "mcjit", "LLVMMCJIT", true, { "core", "executionengine", "object", "runtimedyld", "support", "target" } },
   { "mcparser", "LLVMMCParser", true, { "mc", "support" } },
@@ -69,12 +75,14 @@ struct AvailableComponent {
   { "native", nullptr, true, { "x86" } },
   { "nativecodegen", nullptr, true, { "x86codegen" } },
   { "objcarcopts", "LLVMObjCARCOpts", true, { "analysis", "core", "support", "transformutils" } },
-  { "object", "LLVMObject", true, { "bitreader", "core", "mc", "binaryformat", "mcparser", "support" } },
-  { "objectyaml", "LLVMObjectYAML", true, { "support", "debuginfocodeview" } },
+  { "object", "LLVMObject", true, { "bitreader", "core", "mc", "binaryformat", "mcparser", "support", "textapi" } },
+  { "objectyaml", "LLVMObjectYAML", true, { "object", "support", "debuginfocodeview", "mc" } },
   { "option", "LLVMOption", true, { "support" } },
-  { "orcjit", "LLVMOrcJIT", true, { "core", "executionengine", "object", "mc", "runtimedyld", "support", "target", "transformutils" } },
+  { "orcerror", "LLVMOrcError", true, { "support" } },
+  { "orcjit", "LLVMOrcJIT", true, { "core", "executionengine", "jitlink", "object", "orcerror", "mc", "passes", "runtimedyld", "support", "target", "transformutils" } },
   { "passes", "LLVMPasses", true, { "aggressiveinstcombine", "analysis", "codegen", "core", "ipo", "instcombine", "scalaropts", "support", "target", "transformutils", "vectorize", "instrumentation" } },
   { "profiledata", "LLVMProfileData", true, { "core", "support" } },
+  { "remarks", "LLVMRemarks", true, { "bitstreamreader", "support" } },
   { "runtimedyld", "LLVMRuntimeDyld", true, { "mc", "object", "support" } },
   { "scalaropts", "LLVMScalarOpts", true, { "aggressiveinstcombine", "analysis", "core", "instcombine", "support", "transformutils" } },
   { "selectiondag", "LLVMSelectionDAG", true, { "analysis", "codegen", "core", "mc", "support", "target", "transformutils" } },
@@ -83,15 +91,16 @@ struct AvailableComponent {
   { "tablegen", "LLVMTableGen", true, { "support" } },
   { "target", "LLVMTarget", true, { "analysis", "core", "mc", "support" } },
   { "testingsupport", "LLVMTestingSupport", false, { "support" } },
+  { "textapi", "LLVMTextAPI", true, { "support", "binaryformat" } },
   { "transformutils", "LLVMTransformUtils", true, { "analysis", "core", "support" } },
   { "vectorize", "LLVMVectorize", true, { "analysis", "core", "support", "transformutils" } },
   { "windowsmanifest", "LLVMWindowsManifest", true, { "support" } },
-  { "x86", nullptr, true, { "x86utils", "x86asmprinter", "x86info", "x86desc", "x86codegen", "x86asmparser", "x86disassembler" } },
-  { "x86asmparser", "LLVMX86AsmParser", true, { "mc", "mcparser", "support", "x86desc", "x86info", "x86asmprinter" } },
-  { "x86asmprinter", "LLVMX86AsmPrinter", true, { "mc", "support", "x86utils" } },
-  { "x86codegen", "LLVMX86CodeGen", true, { "analysis", "asmprinter", "codegen", "core", "mc", "selectiondag", "support", "target", "x86asmprinter", "x86desc", "x86info", "x86utils", "globalisel" } },
-  { "x86desc", "LLVMX86Desc", true, { "mc", "mcdisassembler", "object", "support", "x86asmprinter", "x86info" } },
+  { "x86", nullptr, true, { "x86info", "x86utils", "x86desc", "x86codegen", "x86asmparser", "x86disassembler" } },
+  { "x86asmparser", "LLVMX86AsmParser", true, { "mc", "mcparser", "support", "x86desc", "x86info" } },
+  { "x86codegen", "LLVMX86CodeGen", true, { "analysis", "asmprinter", "codegen", "core", "mc", "selectiondag", "support", "target", "x86desc", "x86info", "x86utils", "globalisel", "profiledata", "cfguard" } },
+  { "x86desc", "LLVMX86Desc", true, { "mc", "mcdisassembler", "object", "support", "x86info", "x86utils" } },
   { "x86disassembler", "LLVMX86Disassembler", true, { "mcdisassembler", "support", "x86info" } },
   { "x86info", "LLVMX86Info", true, { "support" } },
-  { "x86utils", "LLVMX86Utils", true, { "core", "support" } },
+  { "x86utils", "LLVMX86Utils", true, { "support" } },
+  { "xray", "LLVMXRay", true, { "support", "object" } },
 };
diff --git a/gnu/usr.bin/clang/llvm-config/Makefile b/gnu/usr.bin/clang/llvm-config/Makefile
index 14de86eda2c..0c5d04e6cad 100644
--- a/gnu/usr.bin/clang/llvm-config/Makefile
+++ b/gnu/usr.bin/clang/llvm-config/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2019/03/05 14:01:08 jsg Exp $
+# $OpenBSD: Makefile,v 1.3 2020/08/03 14:45:31 patrick Exp $
 
 PROG=	llvm-config
 BINDIR= /usr/bin
@@ -6,7 +6,7 @@ BINDIR= /usr/bin
 NATIVE_ARCHS=AArch64 ARM Mips PowerPC Sparc X86
 
 PYTHON=		python2
-LLVMBUILD=	${.CURDIR}/../../../llvm/utils/llvm-build/llvm-build
+LLVMBUILD=	${.CURDIR}/../../../llvm/llvm/utils/llvm-build/llvm-build
 
 .include <bsd.own.mk>
 SRCS=	llvm-config.cpp
@@ -36,7 +36,7 @@ reconf:
 
 CLEANFILES+= BuildVariables.inc LibraryDependencies.inc
 
-.PATH:	${.CURDIR}/../../../llvm/tools/llvm-config
+.PATH:	${.CURDIR}/../../../llvm/llvm/tools/llvm-config
 
 .include <bsd.prog.mk>