Update build infrastructure for LLVM 10.0.0.

ok hackroom@ tested by plenty
author: patrick <patrick@openbsd.org> 2020-08-03 14:45:22 +0000
committer: patrick <patrick@openbsd.org> 2020-08-03 14:45:22 +0000
commit: aa1fa3d4849d8c6172fb7a884e8fa612b2ab7385 (patch)
tree: e5a6c06e6050389a3a59e70ad18bf927de2a901f
parent: Import LLVM 10.0.0 release including clang, lld and lldb. (diff)
download: wireguard-openbsd-aa1fa3d4849d8c6172fb7a884e8fa612b2ab7385.tar.xz
wireguard-openbsd-aa1fa3d4849d8c6172fb7a884e8fa612b2ab7385.zip
201 files changed, 1908 insertions, 809 deletions
diff --git a/gnu/usr.bin/clang/Makefile b/gnu/usr.bin/clang/Makefile
index 7774de69a80..4c1fb13b8ef 100644
--- a/gnu/usr.bin/clang/Makefile
+++ b/gnu/usr.bin/clang/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2019/11/09 16:45:48 mortimer Exp $
+# $OpenBSD: Makefile,v 1.13 2020/08/03 14:45:22 patrick Exp $
 
 .include <bsd.own.mk>
 
@@ -43,12 +43,21 @@ SUBDIR+=libclangFrontendTool
 
 SUBDIR+=clang
 
+SUBDIR+=include/lld/ELF
+
 SUBDIR+=liblldCommon
 SUBDIR+=liblldCore
 SUBDIR+=liblldELF
 
 SUBDIR+=lld
 
+SUBDIR+=lldb-tblgen
+SUBDIR+=include/lldb/Commands
+SUBDIR+=include/lldb/Core
+SUBDIR+=include/lldb/Interpreter
+SUBDIR+=include/lldb/Plugins
+SUBDIR+=include/lldb/Target
+
 SUBDIR+=liblldbABI
 SUBDIR+=liblldbAPI
 SUBDIR+=liblldbBreakpoint
diff --git a/gnu/usr.bin/clang/Makefile.arch b/gnu/usr.bin/clang/Makefile.arch
index 85deb95ac92..6e544f15af3 100644
--- a/gnu/usr.bin/clang/Makefile.arch
+++ b/gnu/usr.bin/clang/Makefile.arch
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.arch,v 1.7 2020/05/30 19:22:00 drahn Exp $
+# $OpenBSD: Makefile.arch,v 1.8 2020/08/03 14:45:22 patrick Exp $
 
 LLVM_ARCHS=AArch64 AMDGPU ARM Mips PowerPC Sparc X86
 
@@ -18,7 +18,6 @@ LLVM_ARCH=	Mips
 .endif
 
 BACKEND_ASMPARSER?=
-BACKEND_ASMPRINTER?=
 BACKEND_CODEGEN?=
 BACKEND_DESC?=
 BACKEND_DISASSEMBLER?=
@@ -28,7 +27,6 @@ BACKEND_UTILS?=
 .for arch in ${LLVM_ARCHS}
 .if "${arch}" == ${LLVM_ARCH} || "${arch}" == "AMDGPU" || make(obj)
 BACKEND_ASMPARSER+=	LLVM${arch}AsmParser
-BACKEND_ASMPRINTER+=	LLVM${arch}AsmPrinter
 BACKEND_CODEGEN+=	LLVM${arch}CodeGen
 BACKEND_DESC+=		LLVM${arch}Desc
 BACKEND_DISASSEMBLER+=	LLVM${arch}Disassembler
@@ -41,7 +39,6 @@ BACKEND_UTILS+=		LLVM${arch}Utils
 .endfor
 
 BACKEND_LIBS+=		${BACKEND_ASMPARSER}
-BACKEND_LIBS+=		${BACKEND_ASMPRINTER}
 BACKEND_LIBS+=		${BACKEND_CODEGEN}
 BACKEND_LIBS+=		${BACKEND_DESC}
 BACKEND_LIBS+=		${BACKEND_DISASSEMBLER}
diff --git a/gnu/usr.bin/clang/Makefile.inc b/gnu/usr.bin/clang/Makefile.inc
index 2bda4878c0f..841c3279b43 100644
--- a/gnu/usr.bin/clang/Makefile.inc
+++ b/gnu/usr.bin/clang/Makefile.inc
@@ -1,6 +1,9 @@
-# $OpenBSD: Makefile.inc,v 1.18 2019/11/26 10:58:23 sthen Exp $
+# $OpenBSD: Makefile.inc,v 1.19 2020/08/03 14:45:22 patrick Exp $
 
-LLVM_SRCS?=	${.CURDIR}/../../../llvm
+CLANG_SRCS?=	${.CURDIR}/../../../llvm/clang
+LLDB_SRCS?=	${.CURDIR}/../../../llvm/lldb
+LLD_SRCS?=	${.CURDIR}/../../../llvm/lld
+LLVM_SRCS?=	${.CURDIR}/../../../llvm/llvm
 
 .if ${COMPILER_VERSION:L} != "clang"
 CC=		clang
@@ -16,9 +19,9 @@ CXX=		eg++
 DEBUG=
 NOPIE=
 
-CLANG_INCLUDES=	-I${LLVM_SRCS}/tools/clang/include
-LLDB_INCLUDES=	-I${LLVM_SRCS}/tools/lldb/include \
-		-I${LLVM_SRCS}/tools/lldb/source
+CLANG_INCLUDES=	-I${CLANG_SRCS}/include
+LLDB_INCLUDES=	-I${LLDB_SRCS}/include \
+		-I${LLDB_SRCS}/source
 CPPFLAGS+=	-I${LLVM_SRCS}/include -I${.CURDIR}/../include -I${.OBJDIR} \
 		-I${.OBJDIR}/../include
 CPPFLAGS+=	-DNDEBUG
@@ -53,15 +56,14 @@ TRIPLE=		${MACHINE_ARCH}-unknown-openbsd${OSREV}
 .endif
 CPPFLAGS+=	-DLLVM_PREFIX=\"/usr\"
 .include "Makefile.arch"
-CPPFLAGS+=-DLLDB_DISABLE_PYTHON
 
 # upstream defaults
 CFLAGS+=	-ffunction-sections
 .if ${MACHINE_ARCH} != "powerpc"
 # XXX
-CFLAGS+=        -fdata-sections
+CFLAGS+=	-fdata-sections
 .endif
-CXXFLAGS+=	-std=c++11
+CXXFLAGS+=	-std=c++14
 CXXFLAGS+=	-fvisibility-inlines-hidden
 CXXFLAGS+=	-fno-exceptions -fno-rtti
 # warnings (from upstream)
diff --git a/gnu/usr.bin/clang/clang-tblgen/Makefile b/gnu/usr.bin/clang/clang-tblgen/Makefile
index a971aafd8ef..cb28a6a1f2a 100644
--- a/gnu/usr.bin/clang/clang-tblgen/Makefile
+++ b/gnu/usr.bin/clang/clang-tblgen/Makefile
@@ -1,22 +1,28 @@
-# $OpenBSD: Makefile,v 1.6 2018/04/06 14:44:04 patrick Exp $
+# $OpenBSD: Makefile,v 1.7 2020/08/03 14:45:22 patrick Exp $
 
 PROG=	clang-tblgen
 NOMAN=
 
 .include <bsd.own.mk>
-SRCS=	ClangASTNodesEmitter.cpp \
+SRCS=	ASTTableGen.cpp \
+	ClangASTNodesEmitter.cpp \
+	ClangASTPropertiesEmitter.cpp \
 	ClangAttrEmitter.cpp \
 	ClangCommentCommandInfoEmitter.cpp \
 	ClangCommentHTMLNamedCharacterReferenceEmitter.cpp \
 	ClangCommentHTMLTagsEmitter.cpp \
 	ClangDataCollectorsEmitter.cpp \
 	ClangDiagnosticsEmitter.cpp \
+	ClangOpcodesEmitter.cpp \
+	ClangOpenCLBuiltinEmitter.cpp \
 	ClangOptionDocEmitter.cpp \
 	ClangSACheckersEmitter.cpp \
+	ClangTypeNodesEmitter.cpp \
+	MveEmitter.cpp \
 	NeonEmitter.cpp \
 	TableGen.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/tools/clang/utils/TableGen
+.PATH:	${.CURDIR}/../../../llvm/clang/utils/TableGen
 
 LLVM_LIBDEPS=	LLVMTableGen LLVMSupport
 
diff --git a/gnu/usr.bin/clang/clang/Makefile b/gnu/usr.bin/clang/clang/Makefile
index 52b390ce2e1..fa53a87c7a4 100644
--- a/gnu/usr.bin/clang/clang/Makefile
+++ b/gnu/usr.bin/clang/clang/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2019/05/16 15:38:56 schwarze Exp $
+# $OpenBSD: Makefile,v 1.16 2020/08/03 14:45:22 patrick Exp $
 
 .include <bsd.own.mk>
 
@@ -25,9 +25,9 @@ maninstall:
 	rm -f cpp.1 && ln clang.1 cpp.1; }
 .endif
 
-CPPFLAGS+=	-I${.CURDIR}/../../../llvm/tools/clang/include
+CPPFLAGS+=	-I${.CURDIR}/../../../llvm/clang/include
 
-.PATH:	${.CURDIR}/../../../llvm/tools/clang/tools/driver
+.PATH:	${.CURDIR}/../../../llvm/clang/tools/driver
 
 LLVM_LIBDEPS=	LLVM \
 		clangFrontendTool \
diff --git a/gnu/usr.bin/clang/clang/clang.1 b/gnu/usr.bin/clang/clang/clang.1
index 7d255ca634a..54de509dd86 100644
--- a/gnu/usr.bin/clang/clang/clang.1
+++ b/gnu/usr.bin/clang/clang/clang.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "CLANG, CLANG++, CLANG-CPP" "1" "Jun 23, 2019" "8" "Clang"
+.TH "CLANG, CLANG++, CLANG-CPP" "1" "Jun 15, 2020" "10" "Clang"
 .SH NAME
 clang, clang++, clang-cpp \- the Clang C, C++, and Objective-C compiler
 .
@@ -457,8 +457,21 @@ strings and other optimizations.
 .UNINDENT
 .INDENT 0.0
 .TP
-.B \-flax\-vector\-conversions
+.B \-flax\-vector\-conversions, \-flax\-vector\-conversions=<kind>, \-fno\-lax\-vector\-conversions
 Allow loose type checking rules for implicit vector conversions.
+Possible values of <kind>:
+.INDENT 7.0
+.IP \(bu 2
+\fBnone\fP: allow no implicit conversions between vectors
+.IP \(bu 2
+\fBinteger\fP: allow implicit bitcasts between integer vectors of the same
+overall bit\-width
+.IP \(bu 2
+\fBall\fP: allow implicit bitcasts between any vectors of the same
+overall bit\-width
+.UNINDENT
+.sp
+<kind> defaults to \fBinteger\fP if unspecified.
 .UNINDENT
 .INDENT 0.0
 .TP
@@ -498,7 +511,7 @@ Specify the architecture to build for.
 .INDENT 0.0
 .TP
 .B \-mmacosx\-version\-min=<version>
-When building for Mac OS X, specify the minimum version supported by your
+When building for macOS, specify the minimum version supported by your
 application.
 .UNINDENT
 .INDENT 0.0
@@ -509,6 +522,18 @@ application.
 .UNINDENT
 .INDENT 0.0
 .TP
+.B \-\-print\-supported\-cpus
+Print out a list of supported processors for the given target (specified
+through \-\-target=<architecture> or \-arch <architecture>). If no target is
+specified, the system default target will be used.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-mcpu=?, \-mtune=?
+Aliases of \-\-print\-supported\-cpus
+.UNINDENT
+.INDENT 0.0
+.TP
 .B \-march=<cpu>
 Specify that Clang should generate code for a specific processor family
 member and later.  For example, if you specify \-march=i486, the compiler is
@@ -856,6 +881,6 @@ output of the compiler, along with information to reproduce.
 .SH AUTHOR
 Maintained by the Clang / LLVM Team (<http://clang.llvm.org>)
 .SH COPYRIGHT
-2007-2019, The Clang Team
+2007-2020, The Clang Team
 .\" Generated by docutils manpage writer.
 .
diff --git a/gnu/usr.bin/clang/include/clang/AST/Makefile b/gnu/usr.bin/clang/include/clang/AST/Makefile
index eec59e69909..c0ccc94b49f 100644
--- a/gnu/usr.bin/clang/include/clang/AST/Makefile
+++ b/gnu/usr.bin/clang/include/clang/AST/Makefile
@@ -1,15 +1,19 @@
-# $OpenBSD: Makefile,v 1.4 2019/06/23 22:07:37 patrick Exp $
+# $OpenBSD: Makefile,v 1.5 2020/08/03 14:45:22 patrick Exp $
 
 .include <bsd.own.mk>
 
 TBLGEN=	${.OBJDIR}/../../../clang-tblgen/clang-tblgen
-CLANG_INC=${.CURDIR}/../../../../../llvm/tools/clang/include
+CLANG_SRCS=${.CURDIR}/../../../../../llvm/clang
+CLANG_INC=${CLANG_SRCS}/include
 
 GEN= AttrImpl.inc AttrTextNodeDump.inc AttrNodeTraverse.inc
 GEN+=AttrVisitor.inc Attrs.inc
 GEN+=CommentCommandInfo.inc CommentCommandList.inc
 GEN+=CommentHTMLNamedCharacterReferences.inc CommentHTMLTags.inc
-GEN+=CommentHTMLTagsProperties.inc CommentNodes.inc DeclNodes.inc StmtNodes.inc
+GEN+=CommentHTMLTagsProperties.inc CommentNodes.inc DeclNodes.inc
+GEN+=StmtNodes.inc TypeNodes.inc Opcodes.inc
+GEN+=AbstractBasicReader.inc AbstractBasicWriter.inc
+GEN+=AbstractTypeReader.inc AbstractTypeWriter.inc
 
 all: ${GEN}
 
@@ -61,15 +65,39 @@ CommentHTMLTagsProperties.inc: ${CLANG_INC}/clang/AST/CommentHTMLTags.td
 		-o ${.TARGET} ${.ALLSRC}
 
 CommentNodes.inc: ${CLANG_INC}/clang/Basic/CommentNodes.td
-	${TBLGEN} -gen-clang-comment-nodes \
+	${TBLGEN} -I${CLANG_INC} -gen-clang-comment-nodes \
 		-o ${.TARGET} ${.ALLSRC}
 
 DeclNodes.inc: ${CLANG_INC}/clang/Basic/DeclNodes.td
-	${TBLGEN} -gen-clang-decl-nodes \
+	${TBLGEN} -I${CLANG_INC} -gen-clang-decl-nodes \
 		-o ${.TARGET} ${.ALLSRC}
 
 StmtNodes.inc: ${CLANG_INC}/clang/Basic/StmtNodes.td
-	${TBLGEN} -gen-clang-stmt-nodes \
+	${TBLGEN} -I${CLANG_INC} -gen-clang-stmt-nodes \
 		-o ${.TARGET} ${.ALLSRC}
-		
+
+TypeNodes.inc: ${CLANG_INC}/clang/Basic/TypeNodes.td
+	${TBLGEN} -I${CLANG_INC} -gen-clang-type-nodes \
+		-o ${.TARGET} ${.ALLSRC}
+
+Opcodes.inc: ${CLANG_SRCS}/lib/AST/Interp/Opcodes.td
+	${TBLGEN} -gen-clang-opcodes \
+		-o ${.TARGET} ${.ALLSRC}
+
+AbstractBasicReader.inc: ${CLANG_INC}/clang/AST/PropertiesBase.td
+	${TBLGEN} -I${CLANG_INC} -gen-clang-basic-reader \
+		-o ${.TARGET} ${.ALLSRC}
+
+AbstractBasicWriter.inc: ${CLANG_INC}/clang/AST/PropertiesBase.td
+	${TBLGEN} -I${CLANG_INC} -gen-clang-basic-writer \
+		-o ${.TARGET} ${.ALLSRC}
+
+AbstractTypeReader.inc: ${CLANG_INC}/clang/AST/TypeProperties.td
+	${TBLGEN} -I${CLANG_INC} -gen-clang-type-reader \
+		-o ${.TARGET} ${.ALLSRC}
+
+AbstractTypeWriter.inc: ${CLANG_INC}/clang/AST/TypeProperties.td
+	${TBLGEN} -I${CLANG_INC} -gen-clang-type-writer \
+		-o ${.TARGET} ${.ALLSRC}
+
 .include <bsd.obj.mk>
diff --git a/gnu/usr.bin/clang/include/clang/Basic/Makefile b/gnu/usr.bin/clang/include/clang/Basic/Makefile
index f40c4d1ad6c..ea5cf50d1bc 100644
--- a/gnu/usr.bin/clang/include/clang/Basic/Makefile
+++ b/gnu/usr.bin/clang/include/clang/Basic/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.6 2019/01/27 16:59:41 patrick Exp $
+# $OpenBSD: Makefile,v 1.7 2020/08/03 14:45:22 patrick Exp $
 
 .include <bsd.own.mk>
 
 TBLGEN= ${.OBJDIR}/../../../clang-tblgen/clang-tblgen
-CLANG_INC=${.CURDIR}/../../../../../llvm/tools/clang/include
+CLANG_INC=${.CURDIR}/../../../../../llvm/clang/include
 
 GEN= AttrList.inc DiagnosticASTKinds.inc DiagnosticAnalysisKinds.inc
 GEN+=DiagnosticCommentKinds.inc DiagnosticCommonKinds.inc
@@ -13,6 +13,8 @@ GEN+=DiagnosticIndexName.inc DiagnosticLexKinds.inc DiagnosticParseKinds.inc
 GEN+=DiagnosticRefactoringKinds.inc
 GEN+=DiagnosticSemaKinds.inc DiagnosticSerializationKinds.inc
 GEN+=arm_fp16.inc arm_neon.inc
+GEN+=arm_mve_builtins.inc arm_mve_builtin_cg.inc
+GEN+=arm_mve_builtin_sema.inc arm_mve_builtin_aliases.inc
 GEN+=AttrHasAttributeImpl.inc AttrSubMatchRulesList.inc
 
 all: ${GEN}
@@ -59,4 +61,20 @@ arm_neon.inc: ${CLANG_INC}/clang/Basic/arm_neon.td
 	${TBLGEN} -I${CLANG_INC}/clang/Basic -gen-arm-neon-sema \
 		-o ${.TARGET} ${.ALLSRC}
 
+arm_mve_builtins.inc: ${CLANG_INC}/clang/Basic/arm_mve.td
+	${TBLGEN} -I${CLANG_INC}/clang/Basic -gen-arm-mve-builtin-def \
+		-o ${.TARGET} ${.ALLSRC}
+
+arm_mve_builtin_cg.inc: ${CLANG_INC}/clang/Basic/arm_mve.td
+	${TBLGEN} -I${CLANG_INC}/clang/Basic -gen-arm-mve-builtin-codegen \
+		-o ${.TARGET} ${.ALLSRC}
+
+arm_mve_builtin_sema.inc: ${CLANG_INC}/clang/Basic/arm_mve.td
+	${TBLGEN} -I${CLANG_INC}/clang/Basic -gen-arm-mve-builtin-sema \
+		-o ${.TARGET} ${.ALLSRC}
+
+arm_mve_builtin_aliases.inc: ${CLANG_INC}/clang/Basic/arm_mve.td
+	${TBLGEN} -I${CLANG_INC}/clang/Basic -gen-arm-mve-builtin-aliases \
+		-o ${.TARGET} ${.ALLSRC}
+
 .include <bsd.obj.mk>
diff --git a/gnu/usr.bin/clang/include/clang/Basic/Version.inc b/gnu/usr.bin/clang/include/clang/Basic/Version.inc
index d5d086e2388..9cf9d6901e9 100644
--- a/gnu/usr.bin/clang/include/clang/Basic/Version.inc
+++ b/gnu/usr.bin/clang/include/clang/Basic/Version.inc
@@ -1,9 +1,9 @@
-/*	$OpenBSD: Version.inc,v 1.9 2019/09/01 16:40:01 patrick Exp $ */
+/*	$OpenBSD: Version.inc,v 1.10 2020/08/03 14:45:22 patrick Exp $ */
 
-#define	CLANG_VERSION			8.0.1
-#define	CLANG_VERSION_STRING		"8.0.1"
-#define	CLANG_VERSION_MAJOR		8
+#define	CLANG_VERSION			10.0.0
+#define	CLANG_VERSION_STRING		"10.0.0"
+#define	CLANG_VERSION_MAJOR		10
 #define	CLANG_VERSION_MINOR		0
-#define	CLANG_VERSION_PATCHLEVEL	1
+#define	CLANG_VERSION_PATCHLEVEL	0
 
 #define	CLANG_VENDOR		"OpenBSD "
diff --git a/gnu/usr.bin/clang/include/clang/Config/config.h b/gnu/usr.bin/clang/include/clang/Config/config.h
index 6bd0a87e7ec..97b2fca62d1 100644
--- a/gnu/usr.bin/clang/include/clang/Config/config.h
+++ b/gnu/usr.bin/clang/include/clang/Config/config.h
@@ -23,6 +23,9 @@
 /* Default runtime library to use. */
 #define CLANG_DEFAULT_RTLIB ""
 
+/* Default unwind library to use. */
+#define CLANG_DEFAULT_UNWINDLIB ""
+
 /* Default objcopy to use */
 #define CLANG_DEFAULT_OBJCOPY ""
 
@@ -54,14 +57,11 @@
 /* Define if we have libxml2 */
 /* #undef CLANG_HAVE_LIBXML */
 
-/* Define if we have z3 and want to build it */
-/* undef CLANG_ANALYZER_WITH_Z3 */
-
 /* Define if we have sys/resource.h (rlimits) */
 #define CLANG_HAVE_RLIMITS 1
 
 /* The LLVM product name and version */
-#define BACKEND_PACKAGE_STRING "LLVM 8.0.1"
+#define BACKEND_PACKAGE_STRING "LLVM 10.0.0"
 
 /* Linker version detected at compile time. */
 /* #undef HOST_LINK_VERSION */
@@ -80,4 +80,7 @@
 #define CLANG_ENABLE_OBJC_REWRITER 0
 #define CLANG_ENABLE_STATIC_ANALYZER 0
 
+/* Spawn a new process clang.exe for the CC1 tool invocation, when necessary */
+#define CLANG_SPAWN_CC1 0
+
 #endif
diff --git a/gnu/usr.bin/clang/include/clang/Driver/Makefile b/gnu/usr.bin/clang/include/clang/Driver/Makefile
index 1df0da22bb8..11e80e51c9c 100644
--- a/gnu/usr.bin/clang/include/clang/Driver/Makefile
+++ b/gnu/usr.bin/clang/include/clang/Driver/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.3 2017/07/09 15:28:34 espie Exp $
+# $OpenBSD: Makefile,v 1.4 2020/08/03 14:45:22 patrick Exp $
 
 .include <bsd.own.mk>
 
 TBLGEN=	${.OBJDIR}/../../../llvm-tblgen/llvm-tblgen
-CLANG_INC=${.CURDIR}/../../../../../llvm/tools/clang/include
+CLANG_INC=${.CURDIR}/../../../../../llvm/clang/include
 
 GEN= Options.inc
 
@@ -17,7 +17,7 @@ clean cleandir:
 
 Options.inc: ${CLANG_INC}/clang/Driver/Options.td
 	${TBLGEN} -I${CLANG_INC}/clang/Driver \
-		-I${.CURDIR}/../../../../../llvm/include -gen-opt-parser-defs \
+		-I${.CURDIR}/../../../../../llvm/llvm/include -gen-opt-parser-defs \
 		-o ${.TARGET} ${.ALLSRC}
 
 .include <bsd.obj.mk>
diff --git a/gnu/usr.bin/clang/include/clang/Parse/Makefile b/gnu/usr.bin/clang/include/clang/Parse/Makefile
index 050283e3afa..a08e9e1a30f 100644
--- a/gnu/usr.bin/clang/include/clang/Parse/Makefile
+++ b/gnu/usr.bin/clang/include/clang/Parse/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.4 2017/10/04 20:57:09 patrick Exp $
+# $OpenBSD: Makefile,v 1.5 2020/08/03 14:45:22 patrick Exp $
 
 .include <bsd.own.mk>
 
 TBLGEN= ${.OBJDIR}/../../../clang-tblgen/clang-tblgen
-CLANG_INC=${.CURDIR}/../../../../../llvm/tools/clang/include
+CLANG_INC=${.CURDIR}/../../../../../llvm/clang/include
 
 GEN= AttrParserStringSwitches.inc AttrSubMatchRulesParserStringSwitches.inc
 
diff --git a/gnu/usr.bin/clang/include/clang/Sema/Makefile b/gnu/usr.bin/clang/include/clang/Sema/Makefile
index 200bfe29170..cbdc0f299aa 100644
--- a/gnu/usr.bin/clang/include/clang/Sema/Makefile
+++ b/gnu/usr.bin/clang/include/clang/Sema/Makefile
@@ -1,12 +1,14 @@
-# $OpenBSD: Makefile,v 1.3 2017/07/09 15:28:34 espie Exp $
+# $OpenBSD: Makefile,v 1.4 2020/08/03 14:45:22 patrick Exp $
 
 .include <bsd.own.mk>
 
 TBLGEN= ${.OBJDIR}/../../../clang-tblgen/clang-tblgen
-CLANG_INC=${.CURDIR}/../../../../../llvm/tools/clang/include
+CLANG_SRCS=${.CURDIR}/../../../../../llvm/clang
+CLANG_INC=${CLANG_SRCS}/include
 
 GEN= AttrParsedAttrImpl.inc AttrParsedAttrKinds.inc AttrParsedAttrList.inc
 GEN+=AttrSpellingListIndex.inc AttrTemplateInstantiate.inc
+GEN+=OpenCLBuiltins.inc
 
 all: ${GEN}
 
@@ -36,4 +38,8 @@ AttrTemplateInstantiate.inc: ${CLANG_INC}/clang/Basic/Attr.td
 	${TBLGEN} -I${CLANG_INC} -gen-clang-attr-template-instantiate \
 		-o ${.TARGET} ${.ALLSRC}
 
+OpenCLBuiltins.inc: ${CLANG_SRCS}/lib/Sema/OpenCLBuiltins.td
+	${TBLGEN} -gen-clang-opencl-builtins \
+		-o ${.TARGET} ${.ALLSRC}
+
 .include <bsd.obj.mk>
diff --git a/gnu/usr.bin/clang/include/clang/Serialization/Makefile b/gnu/usr.bin/clang/include/clang/Serialization/Makefile
index ed60cceb9d0..729dc63f702 100644
--- a/gnu/usr.bin/clang/include/clang/Serialization/Makefile
+++ b/gnu/usr.bin/clang/include/clang/Serialization/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.3 2017/07/09 15:28:34 espie Exp $
+# $OpenBSD: Makefile,v 1.4 2020/08/03 14:45:22 patrick Exp $
 
 .include <bsd.own.mk>
 
 TBLGEN= ${.OBJDIR}/../../../clang-tblgen/clang-tblgen
-CLANG_INC=${.CURDIR}/../../../../../llvm/tools/clang/include
+CLANG_INC=${.CURDIR}/../../../../../llvm/clang/include
 
 GEN= AttrPCHRead.inc AttrPCHWrite.inc
 
diff --git a/gnu/usr.bin/clang/include/clang/StaticAnalyzer/Checkers/Makefile b/gnu/usr.bin/clang/include/clang/StaticAnalyzer/Checkers/Makefile
index 96b0e52d0f8..310bd11c7d5 100644
--- a/gnu/usr.bin/clang/include/clang/StaticAnalyzer/Checkers/Makefile
+++ b/gnu/usr.bin/clang/include/clang/StaticAnalyzer/Checkers/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.1 2018/04/06 14:44:04 patrick Exp $
+# $OpenBSD: Makefile,v 1.2 2020/08/03 14:45:22 patrick Exp $
 
 .include <bsd.own.mk>
 
 TBLGEN=	${.OBJDIR}/../../../../clang-tblgen/clang-tblgen
-CLANG_INC=${.CURDIR}/../../../../../../llvm/tools/clang/include
+CLANG_INC=${.CURDIR}/../../../../../../llvm/clang/include
 
 GEN= Checkers.inc
 
diff --git a/gnu/usr.bin/clang/include/clang/intrin/Makefile b/gnu/usr.bin/clang/include/clang/intrin/Makefile
index 5a021bb1901..aa842233c51 100644
--- a/gnu/usr.bin/clang/include/clang/intrin/Makefile
+++ b/gnu/usr.bin/clang/include/clang/intrin/Makefile
@@ -1,14 +1,14 @@
-# $OpenBSD: Makefile,v 1.21 2020/07/02 15:45:13 kettenis Exp $
+# $OpenBSD: Makefile,v 1.22 2020/08/03 14:45:22 patrick Exp $
 
 .include <bsd.own.mk>
 
-LLVM_V=			8.0.1
+LLVM_V=			10.0.0
 CLANG_INTR_INCDIR=	/usr/lib/clang/${LLVM_V}/include
 
 TBLGEN= ${.OBJDIR}/../../../clang-tblgen/clang-tblgen
-CLANG_INC=${.CURDIR}/../../../../../llvm/tools/clang/include
+CLANG_INC=${.CURDIR}/../../../../../llvm/clang/include
 
-.PATH:	${.CURDIR}/../../../../../llvm/tools/clang/lib/Headers
+.PATH:	${.CURDIR}/../../../../../llvm/clang/lib/Headers
 
 GEN=
 HEADERS=	stdalign.h \
@@ -22,11 +22,13 @@ HEADERS=	stdalign.h \
 .if ${MACHINE_ARCH} == "aarch64" || ${MACHINE_ARCH} == "arm"
 GEN+=		arm_neon.h
 GEN+=		arm_fp16.h
-HEADERS+=	arm_acle.h ${GEN}
+GEN+=		arm_mve.h
+HEADERS+=	arm_acle.h arm_cmse.h ${GEN}
 .elif ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
 HEADERS+=	adxintrin.h \
 		ammintrin.h \
 		avx2intrin.h \
+		avx512bf16intrin.h \
 		avx512bitalgintrin.h \
 		avx512bwintrin.h \
 		avx512cdintrin.h \
@@ -40,15 +42,18 @@ HEADERS+=	adxintrin.h \
 		avx512vbmiintrin.h \
 		avx512vbmivlintrin.h \
 		avx512vlbitalgintrin.h \
+		avx512vlbf16intrin.h \
 		avx512vlbwintrin.h \
 		avx512vlcdintrin.h \
 		avx512vldqintrin.h \
 		avx512vlintrin.h \
 		avx512vlvbmi2intrin.h \
-		avx512vlvnniintrin.h \
-		avx512vnniintrin.h \
+		avx512vp2intersectintrin.h \
+		avx512vlvp2intersectintrin.h \
 		avx512vpopcntdqintrin.h \
 		avx512vpopcntdqvlintrin.h \
+		avx512vnniintrin.h \
+		avx512vlvnniintrin.h \
 		avxintrin.h \
 		bmi2intrin.h \
 		bmiintrin.h \
@@ -59,6 +64,7 @@ HEADERS+=	adxintrin.h \
 		clwbintrin.h \
 		clzerointrin.h \
 		emmintrin.h \
+		enqcmdintrin.h \
 		f16cintrin.h \
 		fma4intrin.h \
 		fmaintrin.h \
@@ -130,4 +136,8 @@ arm_fp16.h: ${CLANG_INC}/clang/Basic/arm_fp16.td
 	${TBLGEN} -gen-arm-fp16 -I${CLANG_INC}/clang/Basic \
 	    -o ${.TARGET} ${.ALLSRC}
 
+arm_mve.h: ${CLANG_INC}/clang/Basic/arm_mve.td
+	${TBLGEN} -gen-arm-mve-header -I${CLANG_INC}/clang/Basic \
+	    -o ${.TARGET} ${.ALLSRC}
+
 .include <bsd.obj.mk>
diff --git a/gnu/usr.bin/clang/include/lld/Common/Version.inc b/gnu/usr.bin/clang/include/lld/Common/Version.inc
index d49d272d998..b88cfde339c 100644
--- a/gnu/usr.bin/clang/include/lld/Common/Version.inc
+++ b/gnu/usr.bin/clang/include/lld/Common/Version.inc
@@ -1,8 +1,8 @@
-/*	$OpenBSD: Version.inc,v 1.4 2019/09/01 16:40:03 patrick Exp $ */
+/*	$OpenBSD: Version.inc,v 1.5 2020/08/03 14:45:22 patrick Exp $ */
 
-#define	LLD_VERSION			8.0.1
-#define	LLD_VERSION_STRING		"8.0.1"
-#define	LLD_VERSION_MAJOR		8
+#define	LLD_VERSION			10.0.0
+#define	LLD_VERSION_STRING		"10.0.0"
+#define	LLD_VERSION_MAJOR		10
 #define	LLD_VERSION_MINOR		0
 #define	LLD_REVISION_STRING		""
 #define	LLD_REPOSITORY_STRING		""
diff --git a/gnu/usr.bin/clang/include/lld/ELF/Makefile b/gnu/usr.bin/clang/include/lld/ELF/Makefile
new file mode 100644
index 00000000000..01f7cf4b1b5
--- /dev/null
+++ b/gnu/usr.bin/clang/include/lld/ELF/Makefile
@@ -0,0 +1,24 @@
+# $OpenBSD: Makefile,v 1.1 2020/08/03 14:45:22 patrick Exp $
+
+.include <bsd.own.mk>
+
+LLVM_SRCS=	${.CURDIR}/../../../../../llvm/llvm
+LLD_SRCS=	${.CURDIR}/../../../../../llvm/lld
+
+DEFS=	Options.inc
+
+all: ${DEFS}
+
+install:
+	@# Nothing here so far ...
+
+clean cleandir:
+	rm -f ${DEFS}
+
+Options.inc: ${LLD_SRCS}/ELF/Options.td
+	${.OBJDIR}/../../../llvm-tblgen/llvm-tblgen -gen-opt-parser-defs \
+		-I ${LLVM_SRCS}/include \
+		-o ${.TARGET} ${.ALLSRC}
+
+
+.include <bsd.obj.mk>
diff --git a/gnu/usr.bin/clang/include/lldb/Commands/Makefile b/gnu/usr.bin/clang/include/lldb/Commands/Makefile
new file mode 100644
index 00000000000..0b5976aeba6
--- /dev/null
+++ b/gnu/usr.bin/clang/include/lldb/Commands/Makefile
@@ -0,0 +1,22 @@
+# $OpenBSD: Makefile,v 1.1 2020/08/03 14:45:22 patrick Exp $
+
+.include <bsd.own.mk>
+
+LLDB_SRCS=	${.CURDIR}/../../../../../llvm/lldb
+
+DEFS=	CommandOptions.inc
+
+all: ${DEFS}
+
+install:
+	@# Nothing here so far ...
+
+clean cleandir:
+	rm -f ${DEFS}
+
+CommandOptions.inc: ${LLDB_SRCS}/source/Commands/Options.td
+	${.OBJDIR}/../../../lldb-tblgen/lldb-tblgen -gen-lldb-option-defs \
+		-I${LLDB_SRCS}/source/Commands \
+		-o ${.TARGET} ${.ALLSRC}
+
+.include <bsd.obj.mk>
diff --git a/gnu/usr.bin/clang/include/lldb/Core/Makefile b/gnu/usr.bin/clang/include/lldb/Core/Makefile
new file mode 100644
index 00000000000..4ad038b7103
--- /dev/null
+++ b/gnu/usr.bin/clang/include/lldb/Core/Makefile
@@ -0,0 +1,27 @@
+# $OpenBSD: Makefile,v 1.1 2020/08/03 14:45:22 patrick Exp $
+
+.include <bsd.own.mk>
+
+LLDB_SRCS=	${.CURDIR}/../../../../../llvm/lldb
+
+DEFS=	CoreProperties.inc CorePropertiesEnum.inc
+
+all: ${DEFS}
+
+install:
+	@# Nothing here so far ...
+
+clean cleandir:
+	rm -f ${DEFS}
+
+CoreProperties.inc: ${LLDB_SRCS}/source/Core/CoreProperties.td
+	${.OBJDIR}/../../../lldb-tblgen/lldb-tblgen -gen-lldb-property-defs \
+		-I${LLDB_SRCS}/source/Core \
+		-o ${.TARGET} ${.ALLSRC}
+
+CorePropertiesEnum.inc: ${LLDB_SRCS}/source/Core/CoreProperties.td
+	${.OBJDIR}/../../../lldb-tblgen/lldb-tblgen -gen-lldb-property-enum-defs \
+		-I${LLDB_SRCS}/source/Core \
+		-o ${.TARGET} ${.ALLSRC}
+
+.include <bsd.obj.mk>
diff --git a/gnu/usr.bin/clang/include/lldb/Host/Config.h b/gnu/usr.bin/clang/include/lldb/Host/Config.h
index b4855d79b77..38ab5a580a0 100644
--- a/gnu/usr.bin/clang/include/lldb/Host/Config.h
+++ b/gnu/usr.bin/clang/include/lldb/Host/Config.h
@@ -1,24 +1,19 @@
 //===-- Config.h -----------------------------------------------*- 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
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef LLDB_HOST_CONFIG_H
 #define LLDB_HOST_CONFIG_H
 
-#define LLDB_CONFIG_TERMIOS_SUPPORTED
-
 #define LLDB_EDITLINE_USE_WCHAR 0
 
 #define LLDB_HAVE_EL_RFUNC_T 0
 
-/* #undef LLDB_DISABLE_POSIX */
-
-#define LLDB_LIBDIR_SUFFIX ""
+#define HAVE_SYS_TYPES_H 1
 
 #define HAVE_SYS_EVENT_H 1
 
@@ -32,4 +27,24 @@
 
 /* #undef HAVE_LIBCOMPRESSION */
 
+#define LLDB_ENABLE_POSIX 1
+
+#define LLDB_ENABLE_TERMIOS 1
+
+#define LLDB_ENABLE_LZMA 0
+
+#define LLDB_ENABLE_CURSES 0
+
+#define LLDB_ENABLE_LIBEDIT 0
+
+#define LLDB_ENABLE_LIBXML2 0
+
+#define LLDB_ENABLE_LUA 0
+
+#define LLDB_ENABLE_PYTHON 0
+
+#define LLDB_PYTHON_HOME ""
+
+#define LLDB_LIBDIR_SUFFIX ""
+
 #endif // #ifndef LLDB_HOST_CONFIG_H
diff --git a/gnu/usr.bin/clang/include/lldb/Interpreter/Makefile b/gnu/usr.bin/clang/include/lldb/Interpreter/Makefile
new file mode 100644
index 00000000000..7ba3396bcf1
--- /dev/null
+++ b/gnu/usr.bin/clang/include/lldb/Interpreter/Makefile
@@ -0,0 +1,27 @@
+# $OpenBSD: Makefile,v 1.1 2020/08/03 14:45:23 patrick Exp $
+
+.include <bsd.own.mk>
+
+LLDB_SRCS=	${.CURDIR}/../../../../../llvm/lldb
+
+DEFS=	InterpreterProperties.inc InterpreterPropertiesEnum.inc
+
+all: ${DEFS}
+
+install:
+	@# Nothing here so far ...
+
+clean cleandir:
+	rm -f ${DEFS}
+
+InterpreterProperties.inc: ${LLDB_SRCS}/source/Interpreter/InterpreterProperties.td
+	${.OBJDIR}/../../../lldb-tblgen/lldb-tblgen -gen-lldb-property-defs \
+		-I${LLDB_SRCS}/source/Interpreter \
+		-o ${.TARGET} ${.ALLSRC}
+
+InterpreterPropertiesEnum.inc: ${LLDB_SRCS}/source/Interpreter/InterpreterProperties.td
+	${.OBJDIR}/../../../lldb-tblgen/lldb-tblgen -gen-lldb-property-enum-defs \
+		-I${LLDB_SRCS}/source/Interpreter \
+		-o ${.TARGET} ${.ALLSRC}
+
+.include <bsd.obj.mk>
diff --git a/gnu/usr.bin/clang/include/lldb/Plugins/Makefile b/gnu/usr.bin/clang/include/lldb/Plugins/Makefile
new file mode 100644
index 00000000000..ae7e2126241
--- /dev/null
+++ b/gnu/usr.bin/clang/include/lldb/Plugins/Makefile
@@ -0,0 +1,86 @@
+# $OpenBSD: Makefile,v 1.1 2020/08/03 14:45:23 patrick Exp $
+
+.include <bsd.own.mk>
+
+LLDB_SRCS=	${.CURDIR}/../../../../../llvm/lldb
+
+DEFS=	DynamicLoaderDarwinKernelProperties.inc
+DEFS+=	DynamicLoaderDarwinKernelPropertiesEnum.inc
+DEFS+=	JITLoaderGDBProperties.inc
+DEFS+=	JITLoaderGDBPropertiesEnum.inc
+DEFS+=	ProcessGDBRemoteProperties.inc
+DEFS+=	ProcessGDBRemotePropertiesEnum.inc
+DEFS+=	StructuredDataDarwinLogProperties.inc
+DEFS+=	StructuredDataDarwinLogPropertiesEnum.inc
+DEFS+=	SymbolFileDWARFProperties.inc
+DEFS+=	SymbolFileDWARFPropertiesEnum.inc
+
+all: ${DEFS}
+
+install:
+	@# Nothing here so far ...
+
+clean cleandir:
+	rm -f ${DEFS}
+
+DynamicLoaderDarwinKernelProperties.inc: \
+	${LLDB_SRCS}/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernelProperties.td
+	${.OBJDIR}/../../../lldb-tblgen/lldb-tblgen -gen-lldb-property-defs \
+		-I${LLDB_SRCS}/source/Plugins/DynamicLoader/Darwin-Kernel \
+		-o ${.TARGET} ${.ALLSRC}
+
+DynamicLoaderDarwinKernelPropertiesEnum.inc: \
+	${LLDB_SRCS}/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernelProperties.td
+	${.OBJDIR}/../../../lldb-tblgen/lldb-tblgen -gen-lldb-property-enum-defs \
+		-I${LLDB_SRCS}/source/Plugins/DynamicLoader/Darwin-Kernel \
+		-o ${.TARGET} ${.ALLSRC}
+
+JITLoaderGDBProperties.inc: \
+	${LLDB_SRCS}/source/Plugins/JITLoader/GDB/JITLoaderGDBProperties.td
+	${.OBJDIR}/../../../lldb-tblgen/lldb-tblgen -gen-lldb-property-defs \
+		-I${LLDB_SRCS}/source/Plugins/JITLoader/GDB \
+		-o ${.TARGET} ${.ALLSRC}
+
+JITLoaderGDBPropertiesEnum.inc: \
+	${LLDB_SRCS}/source/Plugins/JITLoader/GDB/JITLoaderGDBProperties.td
+	${.OBJDIR}/../../../lldb-tblgen/lldb-tblgen -gen-lldb-property-enum-defs \
+		-I${LLDB_SRCS}/source/Plugins/JITLoader/GDB \
+		-o ${.TARGET} ${.ALLSRC}
+
+ProcessGDBRemoteProperties.inc: \
+	${LLDB_SRCS}/source/Plugins/Process/gdb-remote/ProcessGDBRemoteProperties.td
+	${.OBJDIR}/../../../lldb-tblgen/lldb-tblgen -gen-lldb-property-defs \
+		-I${LLDB_SRCS}/source/Plugins/Process/gdb-remote \
+		-o ${.TARGET} ${.ALLSRC}
+
+ProcessGDBRemotePropertiesEnum.inc: \
+	${LLDB_SRCS}/source/Plugins/Process/gdb-remote/ProcessGDBRemoteProperties.td
+	${.OBJDIR}/../../../lldb-tblgen/lldb-tblgen -gen-lldb-property-enum-defs \
+		-I${LLDB_SRCS}/source/Plugins/Process/gdb-remote \
+		-o ${.TARGET} ${.ALLSRC}
+
+StructuredDataDarwinLogProperties.inc: \
+	${LLDB_SRCS}/source/Plugins/StructuredData/DarwinLog/StructuredDataDarwinLogProperties.td
+	${.OBJDIR}/../../../lldb-tblgen/lldb-tblgen -gen-lldb-property-defs \
+		-I${LLDB_SRCS}/source/Plugins/StructuredData/DarwinLog \
+		-o ${.TARGET} ${.ALLSRC}
+
+StructuredDataDarwinLogPropertiesEnum.inc: \
+	${LLDB_SRCS}/source/Plugins/StructuredData/DarwinLog/StructuredDataDarwinLogProperties.td
+	${.OBJDIR}/../../../lldb-tblgen/lldb-tblgen -gen-lldb-property-enum-defs \
+		-I${LLDB_SRCS}/source/Plugins/StructuredData/DarwinLog \
+		-o ${.TARGET} ${.ALLSRC}
+
+SymbolFileDWARFProperties.inc: \
+	${LLDB_SRCS}/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFProperties.td
+	${.OBJDIR}/../../../lldb-tblgen/lldb-tblgen -gen-lldb-property-defs \
+		-I${LLDB_SRCS}/source/Plugins/SymbolFile/DWARF \
+		-o ${.TARGET} ${.ALLSRC}
+
+SymbolFileDWARFPropertiesEnum.inc: \
+	${LLDB_SRCS}/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFProperties.td
+	${.OBJDIR}/../../../lldb-tblgen/lldb-tblgen -gen-lldb-property-enum-defs \
+		-I${LLDB_SRCS}/source/Plugins/SymbolFile/DWARF \
+		-o ${.TARGET} ${.ALLSRC}
+
+.include <bsd.obj.mk>
diff --git a/gnu/usr.bin/clang/include/lldb/Target/Makefile b/gnu/usr.bin/clang/include/lldb/Target/Makefile
new file mode 100644
index 00000000000..8951471da5a
--- /dev/null
+++ b/gnu/usr.bin/clang/include/lldb/Target/Makefile
@@ -0,0 +1,27 @@
+# $OpenBSD: Makefile,v 1.1 2020/08/03 14:45:23 patrick Exp $
+
+.include <bsd.own.mk>
+
+LLDB_SRCS=	${.CURDIR}/../../../../../llvm/lldb
+
+DEFS=	TargetProperties.inc TargetPropertiesEnum.inc
+
+all: ${DEFS}
+
+install:
+	@# Nothing here so far ...
+
+clean cleandir:
+	rm -f ${DEFS}
+
+TargetProperties.inc: ${LLDB_SRCS}/source/Target/TargetProperties.td
+	${.OBJDIR}/../../../lldb-tblgen/lldb-tblgen -gen-lldb-property-defs \
+		-I${LLDB_SRCS}/source/Target \
+		-o ${.TARGET} ${.ALLSRC}
+
+TargetPropertiesEnum.inc: ${LLDB_SRCS}/source/Target/TargetProperties.td
+	${.OBJDIR}/../../../lldb-tblgen/lldb-tblgen -gen-lldb-property-enum-defs \
+		-I${LLDB_SRCS}/source/Target \
+		-o ${.TARGET} ${.ALLSRC}
+
+.include <bsd.obj.mk>
diff --git a/gnu/usr.bin/clang/include/llvm/AArch64/Makefile b/gnu/usr.bin/clang/include/llvm/AArch64/Makefile
index 400c639b424..05667a8b9be 100644
--- a/gnu/usr.bin/clang/include/llvm/AArch64/Makefile
+++ b/gnu/usr.bin/clang/include/llvm/AArch64/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.4 2018/04/06 14:44:04 patrick Exp $
+# $OpenBSD: Makefile,v 1.5 2020/08/03 14:45:23 patrick Exp $
 
 .include <bsd.own.mk>
 
-LLVM_SRCS=	${.CURDIR}/../../../../../llvm
+LLVM_SRCS=	${.CURDIR}/../../../../../llvm/llvm
 
 HDRS=	AArch64GenAsmMatcher.inc AArch64GenAsmWriter.inc \
 	AArch64GenAsmWriter1.inc \
@@ -12,7 +12,7 @@ HDRS=	AArch64GenAsmMatcher.inc AArch64GenAsmWriter.inc \
 	AArch64GenSubtargetInfo.inc \
 	AArch64GenMCCodeEmitter.inc AArch64GenMCPseudoLowering.inc \
 	AArch64GenSystemOperands.inc AArch64GenRegisterBank.inc \
-	AArch64GenGlobalISel.inc
+	AArch64GenGlobalISel.inc AArch64GenGICombiner.inc
 
 all: ${HDRS}
 
@@ -97,4 +97,10 @@ AArch64GenGlobalISel.inc: ${LLVM_SRCS}/lib/Target/AArch64/AArch64.td
 		-I${LLVM_SRCS}/include -I${LLVM_SRCS}/lib/Target/AArch64 \
 		-o ${.TARGET} ${.ALLSRC}
 
+AArch64GenGICombiner.inc: ${LLVM_SRCS}/lib/Target/AArch64/AArch64.td
+	${.OBJDIR}/../../../llvm-tblgen/llvm-tblgen -gen-global-isel-combiner \
+		-combiners="AArch64PreLegalizerCombinerHelper" \
+		-I${LLVM_SRCS}/include -I${LLVM_SRCS}/lib/Target/AArch64 \
+		-o ${.TARGET} ${.ALLSRC}
+
 .include <bsd.obj.mk>
diff --git a/gnu/usr.bin/clang/include/llvm/AMDGPU/Makefile b/gnu/usr.bin/clang/include/llvm/AMDGPU/Makefile
index abbdc0ab4d9..1b617770990 100644
--- a/gnu/usr.bin/clang/include/llvm/AMDGPU/Makefile
+++ b/gnu/usr.bin/clang/include/llvm/AMDGPU/Makefile
@@ -1,13 +1,12 @@
-# $OpenBSD: Makefile,v 1.1 2019/01/29 00:18:23 jsg Exp $
+# $OpenBSD: Makefile,v 1.2 2020/08/03 14:45:23 patrick Exp $
 
 .include <bsd.own.mk>
 
-LLVM_SRCS=	${.CURDIR}/../../../../../llvm
+LLVM_SRCS=	${.CURDIR}/../../../../../llvm/llvm
 
 HDRS=	AMDGPUGenAsmMatcher.inc AMDGPUGenAsmWriter.inc \
 	AMDGPUGenCallingConv.inc AMDGPUGenDAGISel.inc \
 	AMDGPUGenDisassemblerTables.inc AMDGPUGenInstrInfo.inc \
-	AMDGPUGenIntrinsicEnums.inc AMDGPUGenIntrinsicImpl.inc \
 	AMDGPUGenMCCodeEmitter.inc AMDGPUGenMCPseudoLowering.inc \
 	AMDGPUGenRegisterBank.inc AMDGPUGenRegisterInfo.inc \
 	AMDGPUGenSearchableTables.inc AMDGPUGenSubtargetInfo.inc
@@ -51,14 +50,6 @@ AMDGPUGenInstrInfo.inc: ${LLVM_SRCS}/lib/Target/AMDGPU/AMDGPU.td
 	${.OBJDIR}/../../../llvm-tblgen/llvm-tblgen -gen-instr-info \
 		-I${LLVM_SRCS}/include -I${LLVM_SRCS}/lib/Target/AMDGPU \
 		-o ${.TARGET} ${.ALLSRC}
-AMDGPUGenIntrinsicEnums.inc: ${LLVM_SRCS}/lib/Target/AMDGPU/AMDGPU.td
-	${.OBJDIR}/../../../llvm-tblgen/llvm-tblgen -gen-tgt-intrinsic-enums \
-		-I${LLVM_SRCS}/include -I${LLVM_SRCS}/lib/Target/AMDGPU \
-		-o ${.TARGET} ${.ALLSRC}
-AMDGPUGenIntrinsicImpl.inc: ${LLVM_SRCS}/lib/Target/AMDGPU/AMDGPU.td
-	${.OBJDIR}/../../../llvm-tblgen/llvm-tblgen -gen-tgt-intrinsic-impl \
-		-I${LLVM_SRCS}/include -I${LLVM_SRCS}/lib/Target/AMDGPU \
-		-o ${.TARGET} ${.ALLSRC}
 AMDGPUGenMCCodeEmitter.inc: ${LLVM_SRCS}/lib/Target/AMDGPU/AMDGPU.td
 	${.OBJDIR}/../../../llvm-tblgen/llvm-tblgen -gen-emitter \
 		-I${LLVM_SRCS}/include -I${LLVM_SRCS}/lib/Target/AMDGPU \
diff --git a/gnu/usr.bin/clang/include/llvm/ARM/Makefile b/gnu/usr.bin/clang/include/llvm/ARM/Makefile
index 133dcd213d5..9493624e920 100644
--- a/gnu/usr.bin/clang/include/llvm/ARM/Makefile
+++ b/gnu/usr.bin/clang/include/llvm/ARM/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.3 2018/04/06 14:44:04 patrick Exp $
+# $OpenBSD: Makefile,v 1.4 2020/08/03 14:45:23 patrick Exp $
 
 .include <bsd.own.mk>
 
-LLVM_SRCS=	${.CURDIR}/../../../../../llvm
+LLVM_SRCS=	${.CURDIR}/../../../../../llvm/llvm
 
 HDRS=	ARMGenAsmMatcher.inc ARMGenAsmWriter.inc \
 	ARMGenCallingConv.inc ARMGenDAGISel.inc ARMGenDisassemblerTables.inc \
diff --git a/gnu/usr.bin/clang/include/llvm/Config/abi-breaking.h b/gnu/usr.bin/clang/include/llvm/Config/abi-breaking.h
index d7f82e1d0d2..fd32bf38157 100644
--- a/gnu/usr.bin/clang/include/llvm/Config/abi-breaking.h
+++ b/gnu/usr.bin/clang/include/llvm/Config/abi-breaking.h
@@ -1,9 +1,9 @@
 /*===------- llvm/Config/abi-breaking.h - llvm configuration -------*- 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                    */
 /*                                                                            */
 /*===----------------------------------------------------------------------===*/
 
@@ -34,15 +34,27 @@
 #elif defined(_WIN32) || defined(__CYGWIN__) // Win32 w/o #pragma detect_mismatch
 // FIXME: Implement checks without weak.
 #elif defined(__cplusplus)
+#if !(defined(_AIX) && defined(__GNUC__) && !defined(__clang__))
+#define LLVM_HIDDEN_VISIBILITY __attribute__ ((visibility("hidden")))
+#else
+// GCC on AIX does not support visibility attributes. Symbols are not
+// exported by default on AIX.
+#define LLVM_HIDDEN_VISIBILITY
+#endif
 namespace llvm {
 #if LLVM_ENABLE_ABI_BREAKING_CHECKS
 extern int EnableABIBreakingChecks;
-__attribute__((weak, visibility ("hidden"))) int *VerifyEnableABIBreakingChecks = &EnableABIBreakingChecks;
+LLVM_HIDDEN_VISIBILITY
+__attribute__((weak)) int *VerifyEnableABIBreakingChecks =
+    &EnableABIBreakingChecks;
 #else
 extern int DisableABIBreakingChecks;
-__attribute__((weak, visibility ("hidden"))) int *VerifyDisableABIBreakingChecks = &DisableABIBreakingChecks;
+LLVM_HIDDEN_VISIBILITY
+__attribute__((weak)) int *VerifyDisableABIBreakingChecks =
+    &DisableABIBreakingChecks;
 #endif
 }
+#undef LLVM_HIDDEN_VISIBILITY
 #endif // _MSC_VER
 
 #endif // LLVM_DISABLE_ABI_BREAKING_CHECKS_ENFORCING
diff --git a/gnu/usr.bin/clang/include/llvm/Config/config.h b/gnu/usr.bin/clang/include/llvm/Config/config.h
index 68ae2ed1bd5..244103f052a 100644
--- a/gnu/usr.bin/clang/include/llvm/Config/config.h
+++ b/gnu/usr.bin/clang/include/llvm/Config/config.h
@@ -129,9 +129,6 @@
 /* Define if mallinfo() is available on this platform. */
 /* #undef HAVE_MALLINFO */
 
-/* Define to 1 if you have the <malloc.h> header file. */
-#define HAVE_MALLOC_H 1
-
 /* Define to 1 if you have the <malloc/malloc.h> header file. */
 /* #undef HAVE_MALLOC_MALLOC_H */
 
@@ -159,9 +156,6 @@
 /* Have pthread_rwlock_init */
 #define HAVE_PTHREAD_RWLOCK_INIT 1
 
-/* Define to 1 if you have the `realpath' function. */
-#define HAVE_REALPATH 1
-
 /* Define to 1 if you have the `sbrk' function. */
 #define HAVE_SBRK 1
 
@@ -329,10 +323,10 @@
 #define PACKAGE_NAME "LLVM"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "LLVM 8.0.1"
+#define PACKAGE_STRING "LLVM 10.0.0"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "8.0.1"
+#define PACKAGE_VERSION "10.0.0"
 
 /* Define to the vendor of this package. */
 /* #undef PACKAGE_VENDOR */
@@ -340,16 +334,25 @@
 /* Define as the return type of signal handlers (`int' or `void'). */
 #define RETSIGTYPE void
 
+/* Define if std::is_trivially_copyable is supported */
+#define HAVE_STD_IS_TRIVIALLY_COPYABLE 1
+
 /* Define to a function implementing stricmp */
 /* #undef stricmp */
 
 /* Define to a function implementing strdup */
 /* #undef strdup */
 
+/* Define if we have z3 and want to build it */
+#define LLVM_WITH_Z3 0
+
 /* Whether GlobalISel rule coverage is being collected */
 #define LLVM_GISEL_COV_ENABLED 0
 
 /* Define to the default GlobalISel coverage file prefix */
 /* #undef LLVM_GISEL_COV_PREFIX */
 
+/* Whether Timers signpost passes in Xcode Instruments */
+#define LLVM_SUPPORT_XCODE_SIGNPOSTS 0
+
 #endif
diff --git a/gnu/usr.bin/clang/include/llvm/Config/llvm-config.h.in b/gnu/usr.bin/clang/include/llvm/Config/llvm-config.h.in
index 6710d0c30aa..e585f8e16aa 100644
--- a/gnu/usr.bin/clang/include/llvm/Config/llvm-config.h.in
+++ b/gnu/usr.bin/clang/include/llvm/Config/llvm-config.h.in
@@ -29,9 +29,6 @@
 /* Define if LLVM_ENABLE_DUMP is enabled */
 /* #undef LLVM_ENABLE_DUMP */
 
-/* Define if we link Polly to the tools */
-/* #undef LINK_POLLY_INTO_TOOLS */
-
 /* Define if threads enabled */
 #define LLVM_ENABLE_THREADS 1
 
@@ -51,16 +48,16 @@
 #define LLVM_USE_PERF 0
 
 /* Major version of the LLVM API */
-#define LLVM_VERSION_MAJOR 8
+#define LLVM_VERSION_MAJOR 10
 
 /* Minor version of the LLVM API */
 #define LLVM_VERSION_MINOR 0
 
 /* Patch version of the LLVM API */
-#define LLVM_VERSION_PATCH 1
+#define LLVM_VERSION_PATCH 0
 
 /* LLVM version string */
-#define LLVM_VERSION_STRING "8.0.1"
+#define LLVM_VERSION_STRING "10.0.0"
 
 /* Whether LLVM records statistics for use with GetStatistics(),
  * PrintStatistics() or PrintStatisticsJSON()
diff --git a/gnu/usr.bin/clang/include/llvm/IR/Makefile b/gnu/usr.bin/clang/include/llvm/IR/Makefile
index d0adf6418d4..4c157047aea 100644
--- a/gnu/usr.bin/clang/include/llvm/IR/Makefile
+++ b/gnu/usr.bin/clang/include/llvm/IR/Makefile
@@ -1,10 +1,18 @@
-# $OpenBSD: Makefile,v 1.6 2019/03/05 09:44:39 jsg Exp $
+# $OpenBSD: Makefile,v 1.7 2020/08/03 14:45:23 patrick Exp $
 
 .include <bsd.own.mk>
 
-LLVM_SRCS=	${.CURDIR}/../../../../../llvm
+LLVM_SRCS=	${.CURDIR}/../../../../../llvm/llvm
 
-DEFS=	Attributes.inc IntrinsicEnums.inc IntrinsicImpl.inc
+DEFS=	Attributes.inc AttributesCompatFunc.inc \
+	IntrinsicEnums.inc IntrinsicImpl.inc \
+	IntrinsicsAArch64.h IntrinsicsAMDGPU.h \
+	IntrinsicsARM.h IntrinsicsBPF.h \
+	IntrinsicsHexagon.h IntrinsicsMips.h \
+	IntrinsicsNVPTX.h IntrinsicsPowerPC.h \
+	IntrinsicsR600.h IntrinsicsRISCV.h \
+	IntrinsicsS390.h IntrinsicsWebAssembly.h \
+	IntrinsicsX86.h IntrinsicsXCore.h
 
 INCDIR=	/usr/include/llvm/IR
 
@@ -19,6 +27,12 @@ Attributes.inc: ${LLVM_SRCS}/include/llvm/IR/Attributes.td
 		-I${LLVM_SRCS}/include \
 		-o ${.TARGET} ${.ALLSRC}
 
+AttributesCompatFunc.inc: ${LLVM_SRCS}/lib/IR/AttributesCompatFunc.td
+	${.OBJDIR}/../../../llvm-tblgen/llvm-tblgen -gen-attrs \
+		-I${LLVM_SRCS}/include/llvm/IR -I${LLVM_SRCS}/lib/Target \
+		-I${LLVM_SRCS}/include \
+		-o ${.TARGET} ${.ALLSRC}
+
 IntrinsicEnums.inc: ${LLVM_SRCS}/include/llvm/IR/Intrinsics.td
 	${.OBJDIR}/../../../llvm-tblgen/llvm-tblgen -gen-intrinsic-enums \
 		-I${LLVM_SRCS}/include/llvm/IR -I${LLVM_SRCS}/lib/Target \
@@ -31,6 +45,90 @@ IntrinsicImpl.inc: ${LLVM_SRCS}/include/llvm/IR/Intrinsics.td
 		-I${LLVM_SRCS}/include \
 		-o ${.TARGET} ${.ALLSRC}
 
+IntrinsicsAArch64.h: ${LLVM_SRCS}/include/llvm/IR/Intrinsics.td
+	${.OBJDIR}/../../../llvm-tblgen/llvm-tblgen -gen-intrinsic-enums -intrinsic-prefix=aarch64 \
+		-I${LLVM_SRCS}/include/llvm/IR -I${LLVM_SRCS}/lib/Target \
+		-I${LLVM_SRCS}/include \
+		-o ${.TARGET} ${.ALLSRC}
+
+IntrinsicsAMDGPU.h: ${LLVM_SRCS}/include/llvm/IR/Intrinsics.td
+	${.OBJDIR}/../../../llvm-tblgen/llvm-tblgen -gen-intrinsic-enums -intrinsic-prefix=amdgcn \
+		-I${LLVM_SRCS}/include/llvm/IR -I${LLVM_SRCS}/lib/Target \
+		-I${LLVM_SRCS}/include \
+		-o ${.TARGET} ${.ALLSRC}
+
+IntrinsicsARM.h: ${LLVM_SRCS}/include/llvm/IR/Intrinsics.td
+	${.OBJDIR}/../../../llvm-tblgen/llvm-tblgen -gen-intrinsic-enums -intrinsic-prefix=arm \
+		-I${LLVM_SRCS}/include/llvm/IR -I${LLVM_SRCS}/lib/Target \
+		-I${LLVM_SRCS}/include \
+		-o ${.TARGET} ${.ALLSRC}
+
+IntrinsicsBPF.h: ${LLVM_SRCS}/include/llvm/IR/Intrinsics.td
+	${.OBJDIR}/../../../llvm-tblgen/llvm-tblgen -gen-intrinsic-enums -intrinsic-prefix=bpf \
+		-I${LLVM_SRCS}/include/llvm/IR -I${LLVM_SRCS}/lib/Target \
+		-I${LLVM_SRCS}/include \
+		-o ${.TARGET} ${.ALLSRC}
+
+IntrinsicsHexagon.h: ${LLVM_SRCS}/include/llvm/IR/Intrinsics.td
+	${.OBJDIR}/../../../llvm-tblgen/llvm-tblgen -gen-intrinsic-enums -intrinsic-prefix=hexagon \
+		-I${LLVM_SRCS}/include/llvm/IR -I${LLVM_SRCS}/lib/Target \
+		-I${LLVM_SRCS}/include \
+		-o ${.TARGET} ${.ALLSRC}
+
+IntrinsicsMips.h: ${LLVM_SRCS}/include/llvm/IR/Intrinsics.td
+	${.OBJDIR}/../../../llvm-tblgen/llvm-tblgen -gen-intrinsic-enums -intrinsic-prefix=mips \
+		-I${LLVM_SRCS}/include/llvm/IR -I${LLVM_SRCS}/lib/Target \
+		-I${LLVM_SRCS}/include \
+		-o ${.TARGET} ${.ALLSRC}
+
+IntrinsicsNVPTX.h: ${LLVM_SRCS}/include/llvm/IR/Intrinsics.td
+	${.OBJDIR}/../../../llvm-tblgen/llvm-tblgen -gen-intrinsic-enums -intrinsic-prefix=nvvm \
+		-I${LLVM_SRCS}/include/llvm/IR -I${LLVM_SRCS}/lib/Target \
+		-I${LLVM_SRCS}/include \
+		-o ${.TARGET} ${.ALLSRC}
+
+IntrinsicsPowerPC.h: ${LLVM_SRCS}/include/llvm/IR/Intrinsics.td
+	${.OBJDIR}/../../../llvm-tblgen/llvm-tblgen -gen-intrinsic-enums -intrinsic-prefix=ppc \
+		-I${LLVM_SRCS}/include/llvm/IR -I${LLVM_SRCS}/lib/Target \
+		-I${LLVM_SRCS}/include \
+		-o ${.TARGET} ${.ALLSRC}
+
+IntrinsicsR600.h: ${LLVM_SRCS}/include/llvm/IR/Intrinsics.td
+	${.OBJDIR}/../../../llvm-tblgen/llvm-tblgen -gen-intrinsic-enums -intrinsic-prefix=r600 \
+		-I${LLVM_SRCS}/include/llvm/IR -I${LLVM_SRCS}/lib/Target \
+		-I${LLVM_SRCS}/include \
+		-o ${.TARGET} ${.ALLSRC}
+
+IntrinsicsRISCV.h: ${LLVM_SRCS}/include/llvm/IR/Intrinsics.td
+	${.OBJDIR}/../../../llvm-tblgen/llvm-tblgen -gen-intrinsic-enums -intrinsic-prefix=riscv \
+		-I${LLVM_SRCS}/include/llvm/IR -I${LLVM_SRCS}/lib/Target \
+		-I${LLVM_SRCS}/include \
+		-o ${.TARGET} ${.ALLSRC}
+
+IntrinsicsS390.h: ${LLVM_SRCS}/include/llvm/IR/Intrinsics.td
+	${.OBJDIR}/../../../llvm-tblgen/llvm-tblgen -gen-intrinsic-enums -intrinsic-prefix=s390 \
+		-I${LLVM_SRCS}/include/llvm/IR -I${LLVM_SRCS}/lib/Target \
+		-I${LLVM_SRCS}/include \
+		-o ${.TARGET} ${.ALLSRC}
+
+IntrinsicsWebAssembly.h: ${LLVM_SRCS}/include/llvm/IR/Intrinsics.td
+	${.OBJDIR}/../../../llvm-tblgen/llvm-tblgen -gen-intrinsic-enums -intrinsic-prefix=wasm \
+		-I${LLVM_SRCS}/include/llvm/IR -I${LLVM_SRCS}/lib/Target \
+		-I${LLVM_SRCS}/include \
+		-o ${.TARGET} ${.ALLSRC}
+
+IntrinsicsX86.h: ${LLVM_SRCS}/include/llvm/IR/Intrinsics.td
+	${.OBJDIR}/../../../llvm-tblgen/llvm-tblgen -gen-intrinsic-enums -intrinsic-prefix=x86 \
+		-I${LLVM_SRCS}/include/llvm/IR -I${LLVM_SRCS}/lib/Target \
+		-I${LLVM_SRCS}/include \
+		-o ${.TARGET} ${.ALLSRC}
+
+IntrinsicsXCore.h: ${LLVM_SRCS}/include/llvm/IR/Intrinsics.td
+	${.OBJDIR}/../../../llvm-tblgen/llvm-tblgen -gen-intrinsic-enums -intrinsic-prefix=xcore \
+		-I${LLVM_SRCS}/include/llvm/IR -I${LLVM_SRCS}/lib/Target \
+		-I${LLVM_SRCS}/include \
+		-o ${.TARGET} ${.ALLSRC}
+
 install includes: ${DEFS}
 	${INSTALL} -d -m 755 ${DESTDIR}${INCDIR}
 	@cd ${.OBJDIR}; for i in $(DEFS); do \
diff --git a/gnu/usr.bin/clang/include/llvm/Mips/Makefile b/gnu/usr.bin/clang/include/llvm/Mips/Makefile
index 461f36ce7b5..28bee589250 100644
--- a/gnu/usr.bin/clang/include/llvm/Mips/Makefile
+++ b/gnu/usr.bin/clang/include/llvm/Mips/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.3 2019/01/27 16:59:41 patrick Exp $
+# $OpenBSD: Makefile,v 1.4 2020/08/03 14:45:23 patrick Exp $
 
 .include <bsd.own.mk>
 
-LLVM_SRCS=	${.CURDIR}/../../../../../llvm
+LLVM_SRCS=	${.CURDIR}/../../../../../llvm/llvm
 
 HDRS=	MipsGenAsmMatcher.inc MipsGenAsmWriter.inc \
 	MipsGenCallingConv.inc MipsGenDAGISel.inc \
diff --git a/gnu/usr.bin/clang/include/llvm/PowerPC/Makefile b/gnu/usr.bin/clang/include/llvm/PowerPC/Makefile
index 52f17fe4325..76b8848dc67 100644
--- a/gnu/usr.bin/clang/include/llvm/PowerPC/Makefile
+++ b/gnu/usr.bin/clang/include/llvm/PowerPC/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.2 2017/07/09 15:28:34 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2020/08/03 14:45:23 patrick Exp $
 
 .include <bsd.own.mk>
 
-LLVM_SRCS=	${.CURDIR}/../../../../../llvm
+LLVM_SRCS=	${.CURDIR}/../../../../../llvm/llvm
 
 HDRS=	PPCGenAsmMatcher.inc PPCGenAsmWriter.inc \
 	PPCGenCallingConv.inc \
diff --git a/gnu/usr.bin/clang/include/llvm/Sparc/Makefile b/gnu/usr.bin/clang/include/llvm/Sparc/Makefile
index 8806f2d6fe4..ddf4b7eb196 100644
--- a/gnu/usr.bin/clang/include/llvm/Sparc/Makefile
+++ b/gnu/usr.bin/clang/include/llvm/Sparc/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.3 2017/07/09 15:28:34 espie Exp $
+# $OpenBSD: Makefile,v 1.4 2020/08/03 14:45:23 patrick Exp $
 
 .include <bsd.own.mk>
 
-LLVM_SRCS=	${.CURDIR}/../../../../../llvm
+LLVM_SRCS=	${.CURDIR}/../../../../../llvm/llvm
 
 HDRS=	SparcGenAsmMatcher.inc SparcGenAsmWriter.inc \
 	SparcGenCodeEmitter.inc SparcGenCallingConv.inc \
diff --git a/gnu/usr.bin/clang/include/llvm/Support/Extension.def b/gnu/usr.bin/clang/include/llvm/Support/Extension.def
new file mode 100644
index 00000000000..8b137891791
--- /dev/null
+++ b/gnu/usr.bin/clang/include/llvm/Support/Extension.def
@@ -0,0 +1 @@
+
diff --git a/gnu/usr.bin/clang/include/llvm/Transforms/InstCombine/Makefile b/gnu/usr.bin/clang/include/llvm/Transforms/InstCombine/Makefile
index c749793b4e3..80ef7b1d574 100644
--- a/gnu/usr.bin/clang/include/llvm/Transforms/InstCombine/Makefile
+++ b/gnu/usr.bin/clang/include/llvm/Transforms/InstCombine/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.1 2019/01/27 16:59:41 patrick Exp $
+# $OpenBSD: Makefile,v 1.2 2020/08/03 14:45:23 patrick Exp $
 
 .include <bsd.own.mk>
 
-LLVM_SRCS=	${.CURDIR}/../../../../../../llvm
+LLVM_SRCS=	${.CURDIR}/../../../../../../llvm/llvm
 
 DEFS=	InstCombineTables.inc
 
diff --git a/gnu/usr.bin/clang/include/llvm/X86/Makefile b/gnu/usr.bin/clang/include/llvm/X86/Makefile
index 376c2f1780b..6e231a4ec79 100644
--- a/gnu/usr.bin/clang/include/llvm/X86/Makefile
+++ b/gnu/usr.bin/clang/include/llvm/X86/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.6 2019/06/23 22:07:38 patrick Exp $
+# $OpenBSD: Makefile,v 1.7 2020/08/03 14:45:23 patrick Exp $
 
 .include <bsd.own.mk>
 
-LLVM_SRCS=	${.CURDIR}/../../../../../llvm
+LLVM_SRCS=	${.CURDIR}/../../../../../llvm/llvm
 
 HDRS=	X86GenAsmMatcher.inc X86GenAsmWriter.inc X86GenAsmWriter1.inc \
 	X86GenCallingConv.inc X86GenDAGISel.inc X86GenDisassemblerTables.inc \
diff --git a/gnu/usr.bin/clang/libLLVM/Makefile b/gnu/usr.bin/clang/libLLVM/Makefile
index 53f53e521e1..79a30b34703 100644
--- a/gnu/usr.bin/clang/libLLVM/Makefile
+++ b/gnu/usr.bin/clang/libLLVM/Makefile
@@ -3,7 +3,6 @@
 .if "${LLVM_ARCH}" != ""
 
 .include "../libLLVMAMDGPUAsmParser/Makefile"
-.include "../libLLVMAMDGPUAsmPrinter/Makefile"
 .include "../libLLVMAMDGPUCodeGen/Makefile"
 .include "../libLLVMAMDGPUDesc/Makefile"
 .include "../libLLVMAMDGPUDisassembler/Makefile"
@@ -15,6 +14,8 @@
 .include "../libLLVMBinaryFormat/Makefile"
 .include "../libLLVMBitReader/Makefile"
 .include "../libLLVMBitWriter/Makefile"
+.include "../libLLVMBitstreamReader/Makefile"
+.include "../libLLVMCFGuard/Makefile"
 .include "../libLLVMCodeGen/Makefile"
 .include "../libLLVMCore/Makefile"
 .include "../libLLVMCoroutines/Makefile"
@@ -25,6 +26,7 @@
 .include "../libLLVMDebugInfoPDB/Makefile"
 .include "../libLLVMDemangle/Makefile"
 .include "../libLLVMExecutionEngine/Makefile"
+.include "../libLLVMFrontendOpenMP/Makefile"
 .include "../libLLVMGlobalISel/Makefile"
 .include "../libLLVMIRReader/Makefile"
 .include "../libLLVMInstCombine/Makefile"
@@ -40,15 +42,16 @@
 .include "../libLLVMOption/Makefile"
 .include "../libLLVMPasses/Makefile"
 .include "../libLLVMProfileData/Makefile"
+.include "../libLLVMRemarks/Makefile"
 .include "../libLLVMScalarOpts/Makefile"
 .include "../libLLVMSelectionDAG/Makefile"
 .include "../libLLVMSupport/Makefile.shared"
 .include "../libLLVMTableGen/Makefile.shared"
 .include "../libLLVMTarget/Makefile"
+.include "../libLLVMTextAPI/Makefile"
 .include "../libLLVMTransformUtils/Makefile"
 .include "../libLLVMVectorize/Makefile"
 .include "../libLLVM${LLVM_ARCH}AsmParser/Makefile"
-.include "../libLLVM${LLVM_ARCH}AsmPrinter/Makefile"
 .include "../libLLVM${LLVM_ARCH}CodeGen/Makefile"
 .include "../libLLVM${LLVM_ARCH}Desc/Makefile"
 .include "../libLLVM${LLVM_ARCH}Disassembler/Makefile"
diff --git a/gnu/usr.bin/clang/libLLVM/shlib_version b/gnu/usr.bin/clang/libLLVM/shlib_version
index b52599a164f..012c14171d3 100644
--- a/gnu/usr.bin/clang/libLLVM/shlib_version
+++ b/gnu/usr.bin/clang/libLLVM/shlib_version
@@ -1,2 +1,2 @@
-major=2
+major=3
 minor=0
diff --git a/gnu/usr.bin/clang/libLLVMAArch64AsmParser/Makefile b/gnu/usr.bin/clang/libLLVMAArch64AsmParser/Makefile
index 2c6bbe7730b..d66ac905757 100644
--- a/gnu/usr.bin/clang/libLLVMAArch64AsmParser/Makefile
+++ b/gnu/usr.bin/clang/libLLVMAArch64AsmParser/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:39 jsg Exp $
+# $OpenBSD: Makefile,v 1.4 2020/08/03 14:45:23 patrick Exp $
 
 LIB=	LLVMAArch64AsmParser
 NOPROFILE=
@@ -8,4 +8,4 @@ CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/AArch64 \
 
 SRCS+=	AArch64AsmParser.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Target/AArch64/AsmParser
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Target/AArch64/AsmParser
diff --git a/gnu/usr.bin/clang/libLLVMAArch64AsmPrinter/Makefile b/gnu/usr.bin/clang/libLLVMAArch64AsmPrinter/Makefile
deleted file mode 100644
index 3d5ac2d92c7..00000000000
--- a/gnu/usr.bin/clang/libLLVMAArch64AsmPrinter/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:39 jsg Exp $
-
-LIB=	LLVMAArch64AsmPrinter
-NOPROFILE=
-
-CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/AArch64 \
-		-I${LLVM_SRCS}/lib/Target/AArch64
-
-SRCS+=	AArch64InstPrinter.cpp
-
-.PATH:	${.CURDIR}/../../../llvm/lib/Target/AArch64/InstPrinter
diff --git a/gnu/usr.bin/clang/libLLVMAArch64CodeGen/Makefile b/gnu/usr.bin/clang/libLLVMAArch64CodeGen/Makefile
index 93edeb4ff14..74d4180a460 100644
--- a/gnu/usr.bin/clang/libLLVMAArch64CodeGen/Makefile
+++ b/gnu/usr.bin/clang/libLLVMAArch64CodeGen/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2019/06/23 22:07:39 patrick Exp $
+# $OpenBSD: Makefile,v 1.10 2020/08/03 14:45:24 patrick Exp $
 
 LIB=	LLVMAArch64CodeGen
 NOPROFILE=
@@ -10,6 +10,7 @@ SRCS+=	AArch64A57FPLoadBalancing.cpp \
 	AArch64AdvSIMDScalarPass.cpp \
 	AArch64AsmPrinter.cpp \
 	AArch64BranchTargets.cpp \
+	AArch64CallingConvention.cpp \
 	AArch64CallLowering.cpp \
 	AArch64CleanupLocalDynamicTLSPass.cpp \
 	AArch64CollectLOH.cpp \
@@ -18,6 +19,7 @@ SRCS+=	AArch64A57FPLoadBalancing.cpp \
 	AArch64ConditionOptimizer.cpp \
 	AArch64ConditionalCompares.cpp \
 	AArch64DeadRegisterDefinitionsPass.cpp \
+	AArch64ExpandImm.cpp \
 	AArch64ExpandPseudoInsts.cpp \
 	AArch64FalkorHWPFFix.cpp \
 	AArch64FastISel.cpp \
@@ -41,10 +43,12 @@ SRCS+=	AArch64A57FPLoadBalancing.cpp \
 	AArch64SIMDInstrOpt.cpp \
 	AArch64SelectionDAGInfo.cpp \
 	AArch64SpeculationHardening.cpp \
+	AArch64StackTagging.cpp \
+	AArch64StackTaggingPreRA.cpp \
 	AArch64StorePairSuppress.cpp \
 	AArch64Subtarget.cpp \
 	AArch64TargetMachine.cpp \
 	AArch64TargetObjectFile.cpp \
 	AArch64TargetTransformInfo.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Target/AArch64
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Target/AArch64
diff --git a/gnu/usr.bin/clang/libLLVMAArch64Desc/Makefile b/gnu/usr.bin/clang/libLLVMAArch64Desc/Makefile
index 6140c69314b..dac8b648a5d 100644
--- a/gnu/usr.bin/clang/libLLVMAArch64Desc/Makefile
+++ b/gnu/usr.bin/clang/libLLVMAArch64Desc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2019/03/05 09:44:39 jsg Exp $
+# $OpenBSD: Makefile,v 1.5 2020/08/03 14:45:24 patrick Exp $
 
 LIB=	LLVMAArch64Desc
 NOPROFILE=
@@ -9,6 +9,7 @@ CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/AArch64 \
 SRCS+=	AArch64AsmBackend.cpp \
 	AArch64ELFObjectWriter.cpp \
 	AArch64ELFStreamer.cpp \
+	AArch64InstPrinter.cpp \
 	AArch64MachObjectWriter.cpp \
 	AArch64MCAsmInfo.cpp \
 	AArch64MCCodeEmitter.cpp \
@@ -18,4 +19,4 @@ SRCS+=	AArch64AsmBackend.cpp \
 	AArch64WinCOFFObjectWriter.cpp \
 	AArch64WinCOFFStreamer.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Target/AArch64/MCTargetDesc
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Target/AArch64/MCTargetDesc
diff --git a/gnu/usr.bin/clang/libLLVMAArch64Disassembler/Makefile b/gnu/usr.bin/clang/libLLVMAArch64Disassembler/Makefile
index 1e6c7f0c6d0..b63d3c45abc 100644
--- a/gnu/usr.bin/clang/libLLVMAArch64Disassembler/Makefile
+++ b/gnu/usr.bin/clang/libLLVMAArch64Disassembler/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:39 jsg Exp $
+# $OpenBSD: Makefile,v 1.4 2020/08/03 14:45:24 patrick Exp $
 
 LIB=	LLVMAArch64Disassembler
 NOPROFILE=
@@ -9,4 +9,4 @@ CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/AArch64 \
 SRCS+=	AArch64Disassembler.cpp \
 	AArch64ExternalSymbolizer.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Target/AArch64/Disassembler
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Target/AArch64/Disassembler
diff --git a/gnu/usr.bin/clang/libLLVMAArch64Info/Makefile b/gnu/usr.bin/clang/libLLVMAArch64Info/Makefile
index c3637c76100..5708ba6db6b 100644
--- a/gnu/usr.bin/clang/libLLVMAArch64Info/Makefile
+++ b/gnu/usr.bin/clang/libLLVMAArch64Info/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:39 jsg Exp $
+# $OpenBSD: Makefile,v 1.4 2020/08/03 14:45:24 patrick Exp $
 
 LIB=	LLVMAArch64Info
 NOPROFILE=
@@ -8,4 +8,4 @@ CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/AArch64 \
 
 SRCS+=	AArch64TargetInfo.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Target/AArch64/TargetInfo
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Target/AArch64/TargetInfo
diff --git a/gnu/usr.bin/clang/libLLVMAArch64Utils/Makefile b/gnu/usr.bin/clang/libLLVMAArch64Utils/Makefile
index 57ec2961965..0c543d9395a 100644
--- a/gnu/usr.bin/clang/libLLVMAArch64Utils/Makefile
+++ b/gnu/usr.bin/clang/libLLVMAArch64Utils/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:39 jsg Exp $
+# $OpenBSD: Makefile,v 1.4 2020/08/03 14:45:24 patrick Exp $
 
 LIB=	LLVMAArch64Utils
 NOPROFILE=
@@ -8,4 +8,4 @@ CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/AArch64 \
 
 SRCS+=	AArch64BaseInfo.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Target/AArch64/Utils
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Target/AArch64/Utils
diff --git a/gnu/usr.bin/clang/libLLVMAMDGPUAsmParser/Makefile b/gnu/usr.bin/clang/libLLVMAMDGPUAsmParser/Makefile
index 9f3b7c9d410..aeabdfcea13 100644
--- a/gnu/usr.bin/clang/libLLVMAMDGPUAsmParser/Makefile
+++ b/gnu/usr.bin/clang/libLLVMAMDGPUAsmParser/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2019/03/05 09:44:39 jsg Exp $
+# $OpenBSD: Makefile,v 1.3 2020/08/03 14:45:24 patrick Exp $
 
 LIB=	LLVMAMDGPUAsmParser
 NOPROFILE=
@@ -8,4 +8,4 @@ CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/AMDGPU \
 
 SRCS+=	AMDGPUAsmParser.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Target/AMDGPU/AsmParser
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Target/AMDGPU/AsmParser
diff --git a/gnu/usr.bin/clang/libLLVMAMDGPUAsmPrinter/Makefile b/gnu/usr.bin/clang/libLLVMAMDGPUAsmPrinter/Makefile
deleted file mode 100644
index f2e1caba258..00000000000
--- a/gnu/usr.bin/clang/libLLVMAMDGPUAsmPrinter/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $OpenBSD: Makefile,v 1.2 2019/03/05 09:44:39 jsg Exp $
-
-LIB=	LLVMAMDGPUAsmPrinter
-NOPROFILE=
-
-CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/AMDGPU \
-		-I${LLVM_SRCS}/lib/Target/AMDGPU
-
-SRCS+=	AMDGPUInstPrinter.cpp
-
-.PATH:	${.CURDIR}/../../../llvm/lib/Target/AMDGPU/InstPrinter
diff --git a/gnu/usr.bin/clang/libLLVMAMDGPUCodeGen/Makefile b/gnu/usr.bin/clang/libLLVMAMDGPUCodeGen/Makefile
index 3e8eccea65e..ee3f25cdd55 100644
--- a/gnu/usr.bin/clang/libLLVMAMDGPUCodeGen/Makefile
+++ b/gnu/usr.bin/clang/libLLVMAMDGPUCodeGen/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2019/06/23 22:07:39 patrick Exp $
+# $OpenBSD: Makefile,v 1.4 2020/08/03 14:45:24 patrick Exp $
 
 LIB=	LLVMAMDGPUCodeGen
 NOPROFILE=
@@ -20,9 +20,9 @@ SRCS+=	AMDGPUAliasAnalysis.cpp \
 	AMDGPUHSAMetadataStreamer.cpp \
 	AMDGPUInstrInfo.cpp \
 	AMDGPUInstructionSelector.cpp \
-	AMDGPUIntrinsicInfo.cpp \
 	AMDGPUISelDAGToDAG.cpp \
 	AMDGPUISelLowering.cpp \
+	AMDGPUGlobalISelUtils.cpp \
 	AMDGPULegalizerInfo.cpp \
 	AMDGPULibCalls.cpp \
 	AMDGPULibFunc.cpp \
@@ -36,7 +36,7 @@ SRCS+=	AMDGPUAliasAnalysis.cpp \
 	AMDGPUMCInstLower.cpp \
 	AMDGPUOpenCLEnqueuedBlockLowering.cpp \
 	AMDGPUPromoteAlloca.cpp \
-	AMDGPURegAsmNames.inc.cpp \
+	AMDGPUPropagateAttributes.cpp \
 	AMDGPURegisterBankInfo.cpp \
 	AMDGPURegisterInfo.cpp \
 	AMDGPURewriteOutArguments.cpp \
@@ -49,9 +49,12 @@ SRCS+=	AMDGPUAliasAnalysis.cpp \
 	AMDGPUInline.cpp \
 	AMDGPUPerfHintAnalysis.cpp \
 	AMDILCFGStructurizer.cpp \
+	AMDGPUPrintfRuntimeBinding.cpp \
 	GCNDPPCombine.cpp \
 	GCNHazardRecognizer.cpp \
 	GCNILPSched.cpp \
+	GCNRegBankReassign.cpp \
+	GCNNSAReassign.cpp \
 	GCNIterativeScheduler.cpp \
 	GCNMinRegStrategy.cpp \
 	GCNRegPressure.cpp \
@@ -72,10 +75,9 @@ SRCS+=	AMDGPUAliasAnalysis.cpp \
 	R600RegisterInfo.cpp \
 	SIAddIMGInit.cpp \
 	SIAnnotateControlFlow.cpp \
-	SIDebuggerInsertNops.cpp \
 	SIFixSGPRCopies.cpp \
 	SIFixVGPRCopies.cpp \
-	SIFixWWMLiveness.cpp \
+	SIPreAllocateWWMRegs.cpp \
 	SIFixupVectorISel.cpp \
 	SIFoldOperands.cpp \
 	SIFormMemoryClauses.cpp \
@@ -87,6 +89,7 @@ SRCS+=	AMDGPUAliasAnalysis.cpp \
 	SILoadStoreOptimizer.cpp \
 	SILowerControlFlow.cpp \
 	SILowerI1Copies.cpp \
+	SILowerSGPRSpills.cpp \
 	SIMachineFunctionInfo.cpp \
 	SIMachineScheduler.cpp \
 	SIMemoryLegalizer.cpp \
@@ -98,4 +101,4 @@ SRCS+=	AMDGPUAliasAnalysis.cpp \
 	SIShrinkInstructions.cpp \
 	SIWholeQuadMode.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Target/AMDGPU
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Target/AMDGPU
diff --git a/gnu/usr.bin/clang/libLLVMAMDGPUDesc/Makefile b/gnu/usr.bin/clang/libLLVMAMDGPUDesc/Makefile
index deb76635db6..4a3c4bf6666 100644
--- a/gnu/usr.bin/clang/libLLVMAMDGPUDesc/Makefile
+++ b/gnu/usr.bin/clang/libLLVMAMDGPUDesc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2019/03/05 09:44:39 jsg Exp $
+# $OpenBSD: Makefile,v 1.3 2020/08/03 14:45:24 patrick Exp $
 
 LIB=	LLVMAMDGPUDesc
 NOPROFILE=
@@ -9,6 +9,7 @@ CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/AMDGPU \
 SRCS+=	AMDGPUAsmBackend.cpp \
 	AMDGPUELFObjectWriter.cpp \
 	AMDGPUELFStreamer.cpp \
+	AMDGPUInstPrinter.cpp \
 	AMDGPUMCAsmInfo.cpp \
 	AMDGPUMCCodeEmitter.cpp \
 	AMDGPUMCTargetDesc.cpp \
@@ -17,4 +18,4 @@ SRCS+=	AMDGPUAsmBackend.cpp \
 	R600MCTargetDesc.cpp \
 	SIMCCodeEmitter.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Target/AMDGPU/MCTargetDesc
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Target/AMDGPU/MCTargetDesc
diff --git a/gnu/usr.bin/clang/libLLVMAMDGPUDisassembler/Makefile b/gnu/usr.bin/clang/libLLVMAMDGPUDisassembler/Makefile
index ab2f322a16e..4c60fa62fc4 100644
--- a/gnu/usr.bin/clang/libLLVMAMDGPUDisassembler/Makefile
+++ b/gnu/usr.bin/clang/libLLVMAMDGPUDisassembler/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2019/03/05 09:44:39 jsg Exp $
+# $OpenBSD: Makefile,v 1.3 2020/08/03 14:45:24 patrick Exp $
 
 LIB=	LLVMAMDGPUDisassembler
 NOPROFILE=
@@ -8,4 +8,4 @@ CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/AMDGPU \
 
 SRCS+=	AMDGPUDisassembler.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Target/AMDGPU/Disassembler
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Target/AMDGPU/Disassembler
diff --git a/gnu/usr.bin/clang/libLLVMAMDGPUInfo/Makefile b/gnu/usr.bin/clang/libLLVMAMDGPUInfo/Makefile
index 7607996255e..f8936cf60c8 100644
--- a/gnu/usr.bin/clang/libLLVMAMDGPUInfo/Makefile
+++ b/gnu/usr.bin/clang/libLLVMAMDGPUInfo/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2019/03/05 09:44:39 jsg Exp $
+# $OpenBSD: Makefile,v 1.3 2020/08/03 14:45:24 patrick Exp $
 
 LIB=	LLVMAMDGPUInfo
 NOPROFILE=
@@ -8,4 +8,4 @@ CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/AMDGPU \
 
 SRCS+=	AMDGPUTargetInfo.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Target/AMDGPU/TargetInfo
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Target/AMDGPU/TargetInfo
diff --git a/gnu/usr.bin/clang/libLLVMAMDGPUUtils/Makefile b/gnu/usr.bin/clang/libLLVMAMDGPUUtils/Makefile
index b4c90d13098..57ec84d9bd4 100644
--- a/gnu/usr.bin/clang/libLLVMAMDGPUUtils/Makefile
+++ b/gnu/usr.bin/clang/libLLVMAMDGPUUtils/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2019/06/23 22:07:39 patrick Exp $
+# $OpenBSD: Makefile,v 1.4 2020/08/03 14:45:24 patrick Exp $
 
 LIB=	LLVMAMDGPUUtils
 NOPROFILE=
@@ -8,6 +8,7 @@ CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/AMDGPU \
 
 SRCS+=	AMDGPUBaseInfo.cpp \
 	AMDKernelCodeTUtils.cpp \
-	AMDGPUAsmUtils.cpp
+	AMDGPUAsmUtils.cpp \
+	AMDGPUPALMetadata.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Target/AMDGPU/Utils
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Target/AMDGPU/Utils
diff --git a/gnu/usr.bin/clang/libLLVMARMAsmParser/Makefile b/gnu/usr.bin/clang/libLLVMARMAsmParser/Makefile
index e677010573f..94a489329c5 100644
--- a/gnu/usr.bin/clang/libLLVMARMAsmParser/Makefile
+++ b/gnu/usr.bin/clang/libLLVMARMAsmParser/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:39 jsg Exp $
+# $OpenBSD: Makefile,v 1.4 2020/08/03 14:45:24 patrick Exp $
 
 LIB=	LLVMARMAsmParser
 NOPROFILE=
@@ -7,4 +7,4 @@ CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/ARM -I${LLVM_SRCS}/lib/Target/ARM
 
 SRCS+=	ARMAsmParser.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Target/ARM/AsmParser
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Target/ARM/AsmParser
diff --git a/gnu/usr.bin/clang/libLLVMARMAsmPrinter/Makefile b/gnu/usr.bin/clang/libLLVMARMAsmPrinter/Makefile
deleted file mode 100644
index 4e78686147a..00000000000
--- a/gnu/usr.bin/clang/libLLVMARMAsmPrinter/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:39 jsg Exp $
-
-LIB=	LLVMARMAsmPrinter
-NOPROFILE=
-
-CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/ARM -I${LLVM_SRCS}/lib/Target/ARM
-
-SRCS+=	ARMInstPrinter.cpp
-
-.PATH:	${.CURDIR}/../../../llvm/lib/Target/ARM/InstPrinter
diff --git a/gnu/usr.bin/clang/libLLVMARMCodeGen/Makefile b/gnu/usr.bin/clang/libLLVMARMCodeGen/Makefile
index 929233adb54..659c1c91235 100644
--- a/gnu/usr.bin/clang/libLLVMARMCodeGen/Makefile
+++ b/gnu/usr.bin/clang/libLLVMARMCodeGen/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2019/03/05 09:44:39 jsg Exp $
+# $OpenBSD: Makefile,v 1.8 2020/08/03 14:45:24 patrick Exp $
 
 LIB=	LLVMARMCodeGen
 NOPROFILE=
@@ -9,9 +9,9 @@ SRCS+=	A15SDOptimizer.cpp \
 	ARMAsmPrinter.cpp \
 	ARMBaseInstrInfo.cpp \
 	ARMBaseRegisterInfo.cpp \
+	ARMBasicBlockInfo.cpp \
+	ARMCallingConv.cpp \
 	ARMCallLowering.cpp \
-	ARMCodeGenPrepare.cpp \
-	ARMComputeBlockSize.cpp \
 	ARMConstantIslandPass.cpp \
 	ARMConstantPoolValue.cpp \
 	ARMExpandPseudoInsts.cpp \
@@ -24,6 +24,7 @@ SRCS+=	A15SDOptimizer.cpp \
 	ARMInstructionSelector.cpp \
 	ARMLegalizerInfo.cpp \
 	ARMLoadStoreOptimizer.cpp \
+	ARMLowOverheadLoops.cpp \
 	ARMMCInstLower.cpp \
 	ARMMachineFunctionInfo.cpp \
 	ARMMacroFusion.cpp \
@@ -37,6 +38,9 @@ SRCS+=	A15SDOptimizer.cpp \
 	ARMTargetObjectFile.cpp \
 	ARMTargetTransformInfo.cpp \
 	MLxExpansionPass.cpp \
+	MVEGatherScatterLowering.cpp \
+	MVETailPredication.cpp \
+	MVEVPTBlockPass.cpp \
 	Thumb1FrameLowering.cpp \
 	Thumb1InstrInfo.cpp \
 	ThumbRegisterInfo.cpp \
@@ -44,4 +48,4 @@ SRCS+=	A15SDOptimizer.cpp \
 	Thumb2InstrInfo.cpp \
 	Thumb2SizeReduction.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Target/ARM
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Target/ARM
diff --git a/gnu/usr.bin/clang/libLLVMARMDesc/Makefile b/gnu/usr.bin/clang/libLLVMARMDesc/Makefile
index 33d1330bb12..f062e36a955 100644
--- a/gnu/usr.bin/clang/libLLVMARMDesc/Makefile
+++ b/gnu/usr.bin/clang/libLLVMARMDesc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:39 jsg Exp $
+# $OpenBSD: Makefile,v 1.4 2020/08/03 14:45:24 patrick Exp $
 
 LIB=	LLVMARMDesc
 NOPROFILE=
@@ -8,6 +8,7 @@ CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/ARM -I${LLVM_SRCS}/lib/Target/ARM
 SRCS+=	ARMAsmBackend.cpp \
 	ARMELFObjectWriter.cpp \
 	ARMELFStreamer.cpp \
+	ARMInstPrinter.cpp \
 	ARMMachObjectWriter.cpp \
 	ARMMachORelocationInfo.cpp \
 	ARMMCAsmInfo.cpp \
@@ -19,4 +20,4 @@ SRCS+=	ARMAsmBackend.cpp \
 	ARMWinCOFFObjectWriter.cpp \
 	ARMWinCOFFStreamer.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Target/ARM/MCTargetDesc
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Target/ARM/MCTargetDesc
diff --git a/gnu/usr.bin/clang/libLLVMARMDisassembler/Makefile b/gnu/usr.bin/clang/libLLVMARMDisassembler/Makefile
index 309962f9283..457b018b4a5 100644
--- a/gnu/usr.bin/clang/libLLVMARMDisassembler/Makefile
+++ b/gnu/usr.bin/clang/libLLVMARMDisassembler/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:39 jsg Exp $
+# $OpenBSD: Makefile,v 1.4 2020/08/03 14:45:24 patrick Exp $
 
 LIB=	LLVMARMDisassembler
 NOPROFILE=
@@ -7,4 +7,4 @@ CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/ARM -I${LLVM_SRCS}/lib/Target/ARM
 
 SRCS+=	ARMDisassembler.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Target/ARM/Disassembler
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Target/ARM/Disassembler
diff --git a/gnu/usr.bin/clang/libLLVMARMInfo/Makefile b/gnu/usr.bin/clang/libLLVMARMInfo/Makefile
index c82e3bd13ad..faa668f074a 100644
--- a/gnu/usr.bin/clang/libLLVMARMInfo/Makefile
+++ b/gnu/usr.bin/clang/libLLVMARMInfo/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:39 jsg Exp $
+# $OpenBSD: Makefile,v 1.4 2020/08/03 14:45:24 patrick Exp $
 
 LIB=	LLVMARMInfo
 NOPROFILE=
@@ -7,4 +7,4 @@ CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/ARM -I${LLVM_SRCS}/lib/Target/ARM
 
 SRCS+=	ARMTargetInfo.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Target/ARM/TargetInfo
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Target/ARM/TargetInfo
diff --git a/gnu/usr.bin/clang/libLLVMARMUtils/Makefile b/gnu/usr.bin/clang/libLLVMARMUtils/Makefile
index 4dc5803124e..065371c08fa 100644
--- a/gnu/usr.bin/clang/libLLVMARMUtils/Makefile
+++ b/gnu/usr.bin/clang/libLLVMARMUtils/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2019/03/05 09:44:40 jsg Exp $
+# $OpenBSD: Makefile,v 1.3 2020/08/03 14:45:24 patrick Exp $
 
 LIB=	LLVMARMUtils
 NOPROFILE=
@@ -7,4 +7,4 @@ CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/ARM -I${LLVM_SRCS}/lib/Target/ARM
 
 SRCS+=	ARMBaseInfo.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Target/ARM/Utils
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Target/ARM/Utils
diff --git a/gnu/usr.bin/clang/libLLVMAnalysis/Makefile b/gnu/usr.bin/clang/libLLVMAnalysis/Makefile
index 360a9e971bc..a7cd8232ce8 100644
--- a/gnu/usr.bin/clang/libLLVMAnalysis/Makefile
+++ b/gnu/usr.bin/clang/libLLVMAnalysis/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2019/06/23 22:07:39 patrick Exp $
+# $OpenBSD: Makefile,v 1.11 2020/08/03 14:45:25 patrick Exp $
 
 LIB=	LLVMAnalysis
 NOPROFILE=
@@ -28,11 +28,14 @@ SRCS+=	AliasAnalysis.cpp \
 	CostModel.cpp \
 	CodeMetrics.cpp \
 	ConstantFolding.cpp \
+	DDG.cpp \
 	Delinearization.cpp \
 	DemandedBits.cpp \
 	DependenceAnalysis.cpp \
+	DependenceGraphBuilder.cpp \
 	DivergenceAnalysis.cpp \
 	DomPrinter.cpp \
+	DomTreeUpdater.cpp \
 	DominanceFrontier.cpp \
 	EHPersonalities.cpp \
 	GlobalsModRef.cpp \
@@ -46,7 +49,6 @@ SRCS+=	AliasAnalysis.cpp \
 	InstructionSimplify.cpp \
 	Interval.cpp \
 	IntervalPartition.cpp \
-	IteratedDominanceFrontier.cpp \
 	LazyBlockFrequencyInfo.cpp \
 	LazyBranchProbabilityInfo.cpp \
 	LazyCallGraph.cpp \
@@ -56,6 +58,7 @@ SRCS+=	AliasAnalysis.cpp \
 	Loads.cpp \
 	LoopAccessAnalysis.cpp \
 	LoopAnalysisManager.cpp \
+	LoopCacheAnalysis.cpp \
 	LoopInfo.cpp \
 	LoopPass.cpp \
 	LoopUnrollAnalyzer.cpp \
@@ -99,11 +102,12 @@ SRCS+=	AliasAnalysis.cpp \
 	ValueLattice.cpp \
 	ValueLatticeUtils.cpp \
 	ValueTracking.cpp \
-	VectorUtils.cpp
+	VectorUtils.cpp \
+	VFABIDemangling.cpp
 
 AnalysisAnalysis.cpp:
 	ln -s ${LLVM_SRCS}/lib/Analysis/Analysis.cpp $@
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Analysis
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Analysis
 
 CLEANFILES+= AnalysisAnalysis.cpp
diff --git a/gnu/usr.bin/clang/libLLVMAsmParser/Makefile b/gnu/usr.bin/clang/libLLVMAsmParser/Makefile
index 84f7d9fc3f7..c986f55cfbb 100644
--- a/gnu/usr.bin/clang/libLLVMAsmParser/Makefile
+++ b/gnu/usr.bin/clang/libLLVMAsmParser/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:40 jsg Exp $
+# $OpenBSD: Makefile,v 1.4 2020/08/03 14:45:25 patrick Exp $
 
 LIB=	LLVMAsmParser
 NOPROFILE=
@@ -9,4 +9,4 @@ SRCS+=	LLLexer.cpp \
 	LLParser.cpp \
 	Parser.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/AsmParser
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/AsmParser
diff --git a/gnu/usr.bin/clang/libLLVMAsmPrinter/Makefile b/gnu/usr.bin/clang/libLLVMAsmPrinter/Makefile
index 92e142479e3..5807c17ad75 100644
--- a/gnu/usr.bin/clang/libLLVMAsmPrinter/Makefile
+++ b/gnu/usr.bin/clang/libLLVMAsmPrinter/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2019/06/23 22:07:39 patrick Exp $
+# $OpenBSD: Makefile,v 1.7 2020/08/03 14:45:25 patrick Exp $
 
 LIB=	LLVMAsmPrinter
 NOPROFILE=
@@ -29,4 +29,4 @@ SRCS+=	ARMException.cpp \
 	WinCFGuard.cpp \
 	WinException.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/CodeGen/AsmPrinter
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/CodeGen/AsmPrinter
diff --git a/gnu/usr.bin/clang/libLLVMBinaryFormat/Makefile b/gnu/usr.bin/clang/libLLVMBinaryFormat/Makefile
index 89989827275..91addaf3508 100644
--- a/gnu/usr.bin/clang/libLLVMBinaryFormat/Makefile
+++ b/gnu/usr.bin/clang/libLLVMBinaryFormat/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2019/06/23 22:07:39 patrick Exp $
+# $OpenBSD: Makefile,v 1.5 2020/08/03 14:45:25 patrick Exp $
 
 LIB=	LLVMBinaryFormat
 NOPROFILE=
@@ -6,11 +6,19 @@ NOPROFILE=
 CPPFLAGS+=	-I${LLVM_SRCS}/include/llvm/BinaryFormat
 
 SRCS+=	AMDGPUMetadataVerifier.cpp \
+	BinaryFormatMinidump.cpp \
 	Dwarf.cpp \
 	Magic.cpp \
+	MsgPackDocument.cpp \
+	MsgPackDocumentYAML.cpp \
 	MsgPackReader.cpp \
-	MsgPackTypes.cpp \
 	MsgPackWriter.cpp \
-	Wasm.cpp
+	Wasm.cpp \
+	XCOFF.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/BinaryFormat
+BinaryFormatMinidump.cpp:
+	ln -s ${LLVM_SRCS}/lib/BinaryFormat/Minidump.cpp $@
+
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/BinaryFormat
+
+CLEANFILES+= BinaryFormatMinidump.cpp
diff --git a/gnu/usr.bin/clang/libLLVMBitReader/Makefile b/gnu/usr.bin/clang/libLLVMBitReader/Makefile
index fa7edd4d4d8..a9de86eaf33 100644
--- a/gnu/usr.bin/clang/libLLVMBitReader/Makefile
+++ b/gnu/usr.bin/clang/libLLVMBitReader/Makefile
@@ -1,14 +1,14 @@
-# $OpenBSD: Makefile,v 1.4 2019/03/05 09:44:40 jsg Exp $
+# $OpenBSD: Makefile,v 1.5 2020/08/03 14:45:25 patrick Exp $
 
 LIB=	LLVMBitReader
 NOPROFILE=
 
 CPPFLAGS+=	-I${LLVM_SRCS}/include/llvm/Bitcode
 
-SRCS+=	BitReader.cpp \
+SRCS+=	BitcodeAnalyzer.cpp\
+	BitReader.cpp \
 	BitcodeReader.cpp \
-	BitstreamReader.cpp \
 	MetadataLoader.cpp \
 	ValueList.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Bitcode/Reader
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Bitcode/Reader
diff --git a/gnu/usr.bin/clang/libLLVMBitWriter/Makefile b/gnu/usr.bin/clang/libLLVMBitWriter/Makefile
index 7e4b9ea948c..d19e9b33aff 100644
--- a/gnu/usr.bin/clang/libLLVMBitWriter/Makefile
+++ b/gnu/usr.bin/clang/libLLVMBitWriter/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:40 jsg Exp $
+# $OpenBSD: Makefile,v 1.4 2020/08/03 14:45:25 patrick Exp $
 
 LIB=	LLVMBitWriter
 NOPROFILE=
@@ -8,4 +8,4 @@ SRCS+=	BitWriter.cpp \
 	BitcodeWriterPass.cpp \
 	ValueEnumerator.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Bitcode/Writer
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Bitcode/Writer
diff --git a/gnu/usr.bin/clang/libLLVMBitstreamReader/Makefile b/gnu/usr.bin/clang/libLLVMBitstreamReader/Makefile
new file mode 100644
index 00000000000..9575838601a
--- /dev/null
+++ b/gnu/usr.bin/clang/libLLVMBitstreamReader/Makefile
@@ -0,0 +1,11 @@
+# $OpenBSD: Makefile,v 1.1 2020/08/03 14:45:25 patrick Exp $
+
+LIB=	LLVMBitstreamReader
+NOPROFILE=
+
+CPPFLAGS+=	-I${LLVM_SRCS}/include/llvm/Bitcode
+CPPFLAGS+=	-I${LLVM_SRCS}/include/llvm/Bitstream
+
+SRCS+=	BitstreamReader.cpp
+
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Bitstream/Reader
diff --git a/gnu/usr.bin/clang/libLLVMCFGuard/Makefile b/gnu/usr.bin/clang/libLLVMCFGuard/Makefile
new file mode 100644
index 00000000000..7dd1ebe968f
--- /dev/null
+++ b/gnu/usr.bin/clang/libLLVMCFGuard/Makefile
@@ -0,0 +1,10 @@
+# $OpenBSD: Makefile,v 1.1 2020/08/03 14:45:25 patrick Exp $
+
+LIB=	LLVMCFGuard
+NOPROFILE=
+
+CPPFLAGS+=	-I${LLVM_SRCS}/include/llvm/Transforms
+
+SRCS+=	CFGuard.cpp
+
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Transforms/CFGuard
diff --git a/gnu/usr.bin/clang/libLLVMCodeGen/Makefile b/gnu/usr.bin/clang/libLLVMCodeGen/Makefile
index 2e790d382e0..2dfda537104 100644
--- a/gnu/usr.bin/clang/libLLVMCodeGen/Makefile
+++ b/gnu/usr.bin/clang/libLLVMCodeGen/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2019/06/23 22:07:39 patrick Exp $
+# $OpenBSD: Makefile,v 1.13 2020/08/03 14:45:25 patrick Exp $
 
 LIB=	LLVMCodeGen
 NOPROFILE=
@@ -17,6 +17,7 @@ SRCS+=	AggressiveAntiDepBreaker.cpp \
 	CFIInstrInserter.cpp \
 	CalcSpillWeights.cpp \
 	CallingConvLower.cpp \
+	CFGuardLongjmp.cpp \
 	CodeGen.cpp \
 	CodeGenPrepare.cpp \
 	CriticalAntiDepBreaker.cpp \
@@ -27,11 +28,11 @@ SRCS+=	AggressiveAntiDepBreaker.cpp \
 	EarlyIfConversion.cpp \
 	EdgeBundles.cpp \
 	ExecutionDomainFix.cpp \
-	ExpandISelPseudos.cpp \
 	ExpandMemCmp.cpp \
 	ExpandPostRAPseudos.cpp \
 	ExpandReductions.cpp \
 	FEntryInserter.cpp \
+	FinalizeISel.cpp \
 	FaultMaps.cpp \
 	FuncletLayout.cpp \
 	GCMetadata.cpp \
@@ -39,6 +40,7 @@ SRCS+=	AggressiveAntiDepBreaker.cpp \
 	GCRootLowering.cpp \
 	GCStrategy.cpp \
 	GlobalMerge.cpp \
+	HardwareLoops.cpp \
 	IfConversion.cpp \
 	ImplicitNullChecks.cpp \
 	IndirectBrExpandPass.cpp \
@@ -85,6 +87,7 @@ SRCS+=	AggressiveAntiDepBreaker.cpp \
 	MachineInstrBundle.cpp \
 	MachineLICM.cpp \
 	MachineLoopInfo.cpp \
+	MachineLoopUtils.cpp \
 	MachineModuleInfo.cpp \
 	MachineModuleInfoImpls.cpp \
 	MachineOperand.cpp \
@@ -97,12 +100,17 @@ SRCS+=	AggressiveAntiDepBreaker.cpp \
 	MachineSSAUpdater.cpp \
 	MachineScheduler.cpp \
 	MachineSink.cpp \
+	MachineSizeOpts.cpp \
 	MachineTraceMetrics.cpp \
 	MachineVerifier.cpp \
+	ModuloSchedule.cpp \
 	MacroFusion.cpp \
 	MIRCanonicalizerPass.cpp \
+	MIRNamerPass.cpp \
 	MIRPrinter.cpp \
 	MIRPrintingPass.cpp \
+	MIRVRegNamerUtils.cpp \
+	NonRelocatableStringpool.cpp \
 	OptimizePHIs.cpp \
 	PHIElimination.cpp \
 	PHIEliminationUtils.cpp \
@@ -147,10 +155,12 @@ SRCS+=	AggressiveAntiDepBreaker.cpp \
 	SpillPlacement.cpp \
 	SplitKit.cpp \
 	StackColoring.cpp \
-	StackProtector.cpp \
-	StackSlotColoring.cpp \
 	StackMapLivenessAnalysis.cpp \
 	StackMaps.cpp \
+	StackProtector.cpp \
+	StackSlotColoring.cpp \
+	SwiftErrorValueTracking.cpp \
+	SwitchLoweringUtils.cpp \
 	TailDuplication.cpp \
 	TailDuplicator.cpp \
 	TargetFrameLoweringImpl.cpp \
@@ -162,6 +172,7 @@ SRCS+=	AggressiveAntiDepBreaker.cpp \
 	TargetRegisterInfo.cpp \
 	TargetSchedule.cpp \
 	TargetSubtargetInfo.cpp \
+	TypePromotion.cpp \
 	TwoAddressInstructionPass.cpp \
 	UnreachableBlockElim.cpp \
 	ValueTypes.cpp \
@@ -176,6 +187,6 @@ CodeGenAnalysis.cpp:
 CodeGenLowLevelType.cpp:
 	ln -s ${LLVM_SRCS}/lib/CodeGen/LowLevelType.cpp $@
 
-.PATH:	${.CURDIR}/../../../llvm/lib/CodeGen
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/CodeGen
 
 CLEANFILES+= CodeGenAnalysis.cpp CodeGenLowLevelType.cpp
diff --git a/gnu/usr.bin/clang/libLLVMCore/Makefile b/gnu/usr.bin/clang/libLLVMCore/Makefile
index 0dcd5b8ef86..8101897b2ac 100644
--- a/gnu/usr.bin/clang/libLLVMCore/Makefile
+++ b/gnu/usr.bin/clang/libLLVMCore/Makefile
@@ -1,11 +1,13 @@
-# $OpenBSD: Makefile,v 1.9 2019/06/23 22:07:39 patrick Exp $
+# $OpenBSD: Makefile,v 1.10 2020/08/03 14:45:25 patrick Exp $
 
 LIB=	LLVMCore
 NOPROFILE=
 
-CPPFLAGS+=	-I${LLVM_SRCS}/include/llvm/IR
+CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/IR \
+		-I${LLVM_SRCS}/include/llvm/IR
 
-SRCS+=	AsmWriter.cpp \
+SRCS+=	AbstractCallSite.cpp \
+	AsmWriter.cpp \
 	Attributes.cpp \
 	AutoUpgrade.cpp \
 	BasicBlock.cpp \
@@ -22,8 +24,8 @@ SRCS+=	AsmWriter.cpp \
 	DiagnosticHandler.cpp \
 	DiagnosticInfo.cpp \
 	DiagnosticPrinter.cpp \
-	DomTreeUpdater.cpp \
 	Dominators.cpp \
+	FPEnv.cpp \
 	Function.cpp \
 	GVMaterializer.cpp \
 	Globals.cpp \
@@ -49,6 +51,7 @@ SRCS+=	AsmWriter.cpp \
 	PassRegistry.cpp \
 	PassTimingInfo.cpp \
 	ProfileSummary.cpp \
+	RemarkStreamer.cpp \
 	SafepointIRVerifier.cpp \
 	Statepoint.cpp \
 	Type.cpp \
@@ -62,14 +65,6 @@ SRCS+=	AsmWriter.cpp \
 CoreCore.cpp:
 	ln -s ${LLVM_SRCS}/lib/IR/Core.cpp $@
 
-.PATH:	${.CURDIR}/../../../llvm/lib/IR
-
-Attributes.o: AttributesCompatFunc.inc
-
-AttributesCompatFunc.inc: AttributesCompatFunc.td
-	${.OBJDIR}/../llvm-tblgen/llvm-tblgen -gen-attrs \
-		-I${LLVM_SRCS}/include/llvm/IR -I${LLVM_SRCS}/lib/Target \
-		-I${LLVM_SRCS}/include \
-		-o ${.TARGET} ${.ALLSRC}
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/IR
 
 CLEANFILES+= CoreCore.cpp
diff --git a/gnu/usr.bin/clang/libLLVMCoroutines/Makefile b/gnu/usr.bin/clang/libLLVMCoroutines/Makefile
index ba8e17fcfb3..5f5f2cf0100 100644
--- a/gnu/usr.bin/clang/libLLVMCoroutines/Makefile
+++ b/gnu/usr.bin/clang/libLLVMCoroutines/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:40 jsg Exp $
+# $OpenBSD: Makefile,v 1.4 2020/08/03 14:45:25 patrick Exp $
 
 LIB=	LLVMCoroutines
 NOPROFILE=
@@ -13,4 +13,4 @@ SRCS+=	Coroutines.cpp \
 	CoroFrame.cpp \
 	CoroSplit.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Transforms/Coroutines
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Transforms/Coroutines
diff --git a/gnu/usr.bin/clang/libLLVMCoverage/Makefile b/gnu/usr.bin/clang/libLLVMCoverage/Makefile
index 17a7f476ce4..0849df025e1 100644
--- a/gnu/usr.bin/clang/libLLVMCoverage/Makefile
+++ b/gnu/usr.bin/clang/libLLVMCoverage/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:40 jsg Exp $
+# $OpenBSD: Makefile,v 1.4 2020/08/03 14:45:25 patrick Exp $
 
 LIB=	LLVMCoverage
 NOPROFILE=
@@ -9,4 +9,4 @@ SRCS+=	CoverageMapping.cpp \
 	CoverageMappingReader.cpp \
 	CoverageMappingWriter.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/ProfileData/Coverage
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/ProfileData/Coverage
diff --git a/gnu/usr.bin/clang/libLLVMDebugInfoCodeView/Makefile b/gnu/usr.bin/clang/libLLVMDebugInfoCodeView/Makefile
index 58ec3ab2c5e..5ef26c7b62e 100644
--- a/gnu/usr.bin/clang/libLLVMDebugInfoCodeView/Makefile
+++ b/gnu/usr.bin/clang/libLLVMDebugInfoCodeView/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2019/06/23 22:07:40 patrick Exp $
+# $OpenBSD: Makefile,v 1.10 2020/08/03 14:45:25 patrick Exp $
 
 LIB=	LLVMDebugInfoCodeView
 NOPROFILE=
@@ -49,6 +49,6 @@ SRCS+=	AppendingTypeTableBuilder.cpp \
 DebugInfoCodeViewEnumTables.cpp:
 	ln -s ${LLVM_SRCS}/lib/DebugInfo/CodeView/EnumTables.cpp $@
 
-.PATH:	${.CURDIR}/../../../llvm/lib/DebugInfo/CodeView
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/DebugInfo/CodeView
 
 CLEANFILES+= DebugInfoCodeViewEnumTables.cpp
diff --git a/gnu/usr.bin/clang/libLLVMDebugInfoDWARF/Makefile b/gnu/usr.bin/clang/libLLVMDebugInfoDWARF/Makefile
index d47804a4784..ea36bdfa997 100644
--- a/gnu/usr.bin/clang/libLLVMDebugInfoDWARF/Makefile
+++ b/gnu/usr.bin/clang/libLLVMDebugInfoDWARF/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2019/03/05 09:44:40 jsg Exp $
+# $OpenBSD: Makefile,v 1.7 2020/08/03 14:45:25 patrick Exp $
 
 LIB=	LLVMDebugInfoDWARF
 NOPROFILE=
@@ -33,4 +33,4 @@ SRCS+=	DWARFAbbreviationDeclaration.cpp \
 	DWARFUnit.cpp \
 	DWARFVerifier.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/DebugInfo/DWARF
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/DebugInfo/DWARF
diff --git a/gnu/usr.bin/clang/libLLVMDebugInfoMSF/Makefile b/gnu/usr.bin/clang/libLLVMDebugInfoMSF/Makefile
index fc4f1bcadf5..04909b0ab34 100644
--- a/gnu/usr.bin/clang/libLLVMDebugInfoMSF/Makefile
+++ b/gnu/usr.bin/clang/libLLVMDebugInfoMSF/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2019/03/05 09:44:40 jsg Exp $
+# $OpenBSD: Makefile,v 1.5 2020/08/03 14:45:25 patrick Exp $
 
 LIB=	LLVMDebugInfoMSF
 NOPROFILE=
@@ -10,4 +10,4 @@ SRCS+=	MappedBlockStream.cpp \
 	MSFCommon.cpp \
 	MSFError.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/DebugInfo/MSF
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/DebugInfo/MSF
diff --git a/gnu/usr.bin/clang/libLLVMDebugInfoPDB/Makefile b/gnu/usr.bin/clang/libLLVMDebugInfoPDB/Makefile
index cd8714ab93f..e1e77019870 100644
--- a/gnu/usr.bin/clang/libLLVMDebugInfoPDB/Makefile
+++ b/gnu/usr.bin/clang/libLLVMDebugInfoPDB/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2019/06/23 22:07:40 patrick Exp $
+# $OpenBSD: Makefile,v 1.5 2020/08/03 14:45:25 patrick Exp $
 
 LIB=	LLVMDebugInfoPDB
 NOPROFILE=
@@ -19,10 +19,12 @@ SRCS+=	DbiModuleDescriptor.cpp \
 	IPDBSourceFile.cpp \
 	InfoStream.cpp \
 	InfoStreamBuilder.cpp \
+	InjectedSourceStream.cpp \
 	ModuleDebugStream.cpp \
 	NamedStreamMap.cpp \
 	NativeCompilandSymbol.cpp \
 	NativeEnumGlobals.cpp \
+	NativeEnumInjectedSources.cpp \
 	NativeEnumModules.cpp \
 	NativeEnumTypes.cpp \
 	NativeExeSymbol.cpp \
@@ -90,7 +92,7 @@ SRCS+=	DbiModuleDescriptor.cpp \
 DebugInfoPDBEnumTables.cpp:
 	ln -s ${LLVM_SRCS}/lib/DebugInfo/PDB/Native/EnumTables.cpp $@
 
-.PATH:	${.CURDIR}/../../../llvm/lib/DebugInfo/PDB
-.PATH:	${.CURDIR}/../../../llvm/lib/DebugInfo/PDB/Native
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/DebugInfo/PDB
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/DebugInfo/PDB/Native
 
 CLEANFILES+= DebugInfoPDBEnumTables.cpp
diff --git a/gnu/usr.bin/clang/libLLVMDemangle/Makefile b/gnu/usr.bin/clang/libLLVMDemangle/Makefile
index 0bc4827e55c..c4535650a91 100644
--- a/gnu/usr.bin/clang/libLLVMDemangle/Makefile
+++ b/gnu/usr.bin/clang/libLLVMDemangle/Makefile
@@ -1,12 +1,13 @@
-# $OpenBSD: Makefile,v 1.4 2019/06/23 22:07:40 patrick Exp $
+# $OpenBSD: Makefile,v 1.5 2020/08/03 14:45:25 patrick Exp $
 
 LIB=	LLVMDemangle
 NOPROFILE=
 
 CPPFLAGS+=	-I${LLVM_SRCS}/include/llvm/Demangle
 
-SRCS+=	ItaniumDemangle.cpp \
+SRCS+=	Demangle.cpp \
+	ItaniumDemangle.cpp \
 	MicrosoftDemangle.cpp \
 	MicrosoftDemangleNodes.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Demangle
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Demangle
diff --git a/gnu/usr.bin/clang/libLLVMExecutionEngine/Makefile b/gnu/usr.bin/clang/libLLVMExecutionEngine/Makefile
index 2546566dcb8..08f19d08c6a 100644
--- a/gnu/usr.bin/clang/libLLVMExecutionEngine/Makefile
+++ b/gnu/usr.bin/clang/libLLVMExecutionEngine/Makefile
@@ -1,28 +1,42 @@
-# $OpenBSD: Makefile,v 1.4 2019/03/05 09:44:40 jsg Exp $
+# $OpenBSD: Makefile,v 1.5 2020/08/03 14:45:25 patrick Exp $
 
 LIB=	LLVMExecutionEngine
 NOPROFILE=
 
 CPPFLAGS+=	-I${LLVM_SRCS}/include/llvm/ExecutionEngine
 
-SRCS+=	Execution.cpp \
+SRCS+=	CompileUtils.cpp \
+	DebugUtils.cpp \
+	Execution.cpp \
 	ExecutionEngine.cpp \
-	ExecutionEngineCore.cpp \
+	EHFrameSupport.cpp \
 	ExecutionEngineBindings.cpp \
+	ExecutionEngineCore.cpp \
 	ExecutionUtils.cpp \
 	ExternalFunctions.cpp \
 	GDBRegistrationListener.cpp \
+	IRCompileLayer.cpp \
 	IndirectionUtils.cpp \
 	Interpreter.cpp \
+	JITLink.cpp \
+	JITLinkGeneric.cpp \
+	JITLinkMemoryManager.cpp \
 	JITSymbol.cpp \
+	JITTargetMachineBuilder.cpp \
+	Layer.cpp \
 	Legacy.cpp \
 	MCJIT.cpp \
+	MachO.cpp \
+	MachOLinkGraphBuilder.cpp \
+	MachO_arm64.cpp \
+	MachO_x86_64.cpp \
 	NullResolver.cpp \
+	ObjectLinkingLayer.cpp \
 	OrcABISupport.cpp \
 	OrcCBindings.cpp \
 	OrcError.cpp \
 	OrcMCJITReplacement.cpp \
-	RPCUtils.cpp \
+	RPCError.cpp \
 	RTDyldMemoryManager.cpp \
 	RuntimeDyld.cpp \
 	RuntimeDyldCOFF.cpp \
@@ -31,16 +45,21 @@ SRCS+=	Execution.cpp \
 	RuntimeDyldELFMips.cpp \
 	RuntimeDyldMachO.cpp \
 	SectionMemoryManager.cpp \
-	TargetSelect.cpp
+	SpeculateAnalyses.cpp \
+	Speculation.cpp \
+	TargetSelect.cpp \
+	ThreadSafeModule.cpp
 
 ExecutionEngineCore.cpp:
 	ln -s ${LLVM_SRCS}/lib/ExecutionEngine/Orc/Core.cpp $@
 
-.PATH:	${.CURDIR}/../../../llvm/lib/ExecutionEngine
-.PATH:	${.CURDIR}/../../../llvm/lib/ExecutionEngine/Interpreter
-.PATH:	${.CURDIR}/../../../llvm/lib/ExecutionEngine/MCJIT
-.PATH:	${.CURDIR}/../../../llvm/lib/ExecutionEngine/Orc
-.PATH:	${.CURDIR}/../../../llvm/lib/ExecutionEngine/RuntimeDyld
-.PATH:	${.CURDIR}/../../../llvm/lib/ExecutionEngine/RuntimeDyld/Targets
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/ExecutionEngine
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/ExecutionEngine/Interpreter
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/ExecutionEngine/JITLink
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/ExecutionEngine/MCJIT
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/ExecutionEngine/Orc
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/ExecutionEngine/OrcError
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/ExecutionEngine/RuntimeDyld
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/ExecutionEngine/RuntimeDyld/Targets
 
 CLEANFILES+= ExecutionEngineCore.cpp
diff --git a/gnu/usr.bin/clang/libLLVMFrontendOpenMP/Makefile b/gnu/usr.bin/clang/libLLVMFrontendOpenMP/Makefile
new file mode 100644
index 00000000000..42f51a06b43
--- /dev/null
+++ b/gnu/usr.bin/clang/libLLVMFrontendOpenMP/Makefile
@@ -0,0 +1,12 @@
+# $OpenBSD: Makefile,v 1.1 2020/08/03 14:45:25 patrick Exp $
+
+LIB=	LLVMFrontendOpenMP
+NOPROFILE=
+
+CPPFLAGS+=	-I${LLVM_SRCS}/include/llvm/Frontend
+CPPFLAGS+=	-I${LLVM_SRCS}/include/llvm/Frontend/OpenMP
+
+SRCS+=	OMPConstants.cpp \
+	OMPIRBuilder.cpp
+
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Frontend/OpenMP
diff --git a/gnu/usr.bin/clang/libLLVMGlobalISel/Makefile b/gnu/usr.bin/clang/libLLVMGlobalISel/Makefile
index 78f9c0358bd..9fefc25eea6 100644
--- a/gnu/usr.bin/clang/libLLVMGlobalISel/Makefile
+++ b/gnu/usr.bin/clang/libLLVMGlobalISel/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2019/06/23 22:07:40 patrick Exp $
+# $OpenBSD: Makefile,v 1.8 2020/08/03 14:45:26 patrick Exp $
 
 LIB=	LLVMGlobalISel
 NOPROFILE=
@@ -8,6 +8,7 @@ SRCS+=	CSEInfo.cpp \
 	CallLowering.cpp \
 	GlobalISel.cpp \
 	GISelChangeObserver.cpp \
+	GISelKnownBits.cpp \
 	Combiner.cpp \
 	CombinerHelper.cpp \
 	IRTranslator.cpp \
@@ -28,6 +29,6 @@ SRCS+=	CSEInfo.cpp \
 GlobalISelUtils.cpp:
 	ln -s ${LLVM_SRCS}/lib/CodeGen/GlobalISel/Utils.cpp $@
 
-.PATH:	${.CURDIR}/../../../llvm/lib/CodeGen/GlobalISel
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/CodeGen/GlobalISel
 
 CLEANFILES+= GlobalISelUtils.cpp
diff --git a/gnu/usr.bin/clang/libLLVMIRReader/Makefile b/gnu/usr.bin/clang/libLLVMIRReader/Makefile
index 26cdda2aaf6..86f1d434e2f 100644
--- a/gnu/usr.bin/clang/libLLVMIRReader/Makefile
+++ b/gnu/usr.bin/clang/libLLVMIRReader/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:40 jsg Exp $
+# $OpenBSD: Makefile,v 1.4 2020/08/03 14:45:26 patrick Exp $
 
 LIB=	LLVMIRReader
 NOPROFILE=
@@ -7,4 +7,4 @@ CPPFLAGS+=	-I${LLVM_SRCS}/include/llvm/IRReader
 
 SRCS+=	IRReader.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/IRReader
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/IRReader
diff --git a/gnu/usr.bin/clang/libLLVMInstCombine/Makefile b/gnu/usr.bin/clang/libLLVMInstCombine/Makefile
index c15a0524a5f..1fd3c8fd18f 100644
--- a/gnu/usr.bin/clang/libLLVMInstCombine/Makefile
+++ b/gnu/usr.bin/clang/libLLVMInstCombine/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2019/03/05 09:44:40 jsg Exp $
+# $OpenBSD: Makefile,v 1.5 2020/08/03 14:45:26 patrick Exp $
 
 LIB=	LLVMInstCombine
 NOPROFILE=
@@ -10,6 +10,7 @@ CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/Transforms/InstCombine
 SRCS+=	AggressiveInstCombine.cpp \
 	InstructionCombining.cpp \
 	InstCombineAddSub.cpp \
+	InstCombineAtomicRMW.cpp \
 	InstCombineAndOrXor.cpp \
 	InstCombineCalls.cpp \
 	InstCombineCasts.cpp \
@@ -23,5 +24,5 @@ SRCS+=	AggressiveInstCombine.cpp \
 	InstCombineVectorOps.cpp \
 	TruncInstCombine.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Transforms/InstCombine
-.PATH:	${.CURDIR}/../../../llvm/lib/Transforms/AggressiveInstCombine
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Transforms/InstCombine
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Transforms/AggressiveInstCombine
diff --git a/gnu/usr.bin/clang/libLLVMInstrumentation/Makefile b/gnu/usr.bin/clang/libLLVMInstrumentation/Makefile
index 8b6c2e011cc..7fa22b846de 100644
--- a/gnu/usr.bin/clang/libLLVMInstrumentation/Makefile
+++ b/gnu/usr.bin/clang/libLLVMInstrumentation/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2019/06/23 22:07:40 patrick Exp $
+# $OpenBSD: Makefile,v 1.9 2020/08/03 14:45:26 patrick Exp $
 
 LIB=	LLVMInstrumentation
 NOPROFILE=
@@ -10,16 +10,18 @@ SRCS+=	AddressSanitizer.cpp \
 	CGProfile.cpp \
 	ControlHeightReduction.cpp \
 	DataFlowSanitizer.cpp \
-	EfficiencySanitizer.cpp \
 	GCOVProfiling.cpp \
 	HWAddressSanitizer.cpp \
 	IndirectCallPromotion.cpp \
 	Instrumentation.cpp \
+	InstrOrderFile.cpp \
 	InstrProfiling.cpp \
 	MemorySanitizer.cpp \
 	PGOInstrumentation.cpp \
 	PGOMemOPSizeOpt.cpp \
+	PoisonChecking.cpp \
 	SanitizerCoverage.cpp \
-	ThreadSanitizer.cpp
+	ThreadSanitizer.cpp \
+	ValueProfileCollector.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Transforms/Instrumentation
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Transforms/Instrumentation
diff --git a/gnu/usr.bin/clang/libLLVMLTO/Makefile b/gnu/usr.bin/clang/libLLVMLTO/Makefile
index 3d4a1fd93d0..eac06c10328 100644
--- a/gnu/usr.bin/clang/libLLVMLTO/Makefile
+++ b/gnu/usr.bin/clang/libLLVMLTO/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2019/06/23 22:07:40 patrick Exp $
+# $OpenBSD: Makefile,v 1.7 2020/08/03 14:45:26 patrick Exp $
 
 LIB=	LLVMLTO
 NOPROFILE=
@@ -14,4 +14,4 @@ SRCS+=	Caching.cpp \
 	UpdateCompilerUsed.cpp \
 	ThinLTOCodeGenerator.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/LTO
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/LTO
diff --git a/gnu/usr.bin/clang/libLLVMLinker/Makefile b/gnu/usr.bin/clang/libLLVMLinker/Makefile
index b9d615bb7a3..9e43c8c6755 100644
--- a/gnu/usr.bin/clang/libLLVMLinker/Makefile
+++ b/gnu/usr.bin/clang/libLLVMLinker/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:40 jsg Exp $
+# $OpenBSD: Makefile,v 1.4 2020/08/03 14:45:26 patrick Exp $
 
 LIB=	LLVMLinker
 NOPROFILE=
@@ -8,4 +8,4 @@ CPPFLAGS+=	-I${LLVM_SRCS}/include/llvm/Linker
 SRCS+=	IRMover.cpp \
 	LinkModules.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Linker
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Linker
diff --git a/gnu/usr.bin/clang/libLLVMMC/Makefile b/gnu/usr.bin/clang/libLLVMMC/Makefile
index 7cbfe00986b..b958add3330 100644
--- a/gnu/usr.bin/clang/libLLVMMC/Makefile
+++ b/gnu/usr.bin/clang/libLLVMMC/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2019/03/05 09:44:40 jsg Exp $
+# $OpenBSD: Makefile,v 1.8 2020/08/03 14:45:26 patrick Exp $
 
 LIB=	LLVMMC
 NOPROFILE=
@@ -12,12 +12,13 @@ SRCS+=	ConstantPools.cpp \
 	MCAsmInfoCOFF.cpp \
 	MCAsmInfoDarwin.cpp \
 	MCAsmInfoELF.cpp \
+	MCAsmInfoWasm.cpp \
+	MCAsmInfoXCOFF.cpp \
 	MCAsmMacro.cpp \
 	MCAsmStreamer.cpp \
 	MCAssembler.cpp \
 	MCCodeEmitter.cpp \
 	MCCodeView.cpp \
-	MCCodePadder.cpp \
 	MCContext.cpp \
 	MCDwarf.cpp \
 	MCELFObjectTargetWriter.cpp \
@@ -43,6 +44,7 @@ SRCS+=	ConstantPools.cpp \
 	MCSectionELF.cpp \
 	MCSectionMachO.cpp \
 	MCSectionWasm.cpp \
+	MCSectionXCOFF.cpp \
 	MCStreamer.cpp \
 	MCSubtargetInfo.cpp \
 	MCSymbol.cpp \
@@ -53,10 +55,13 @@ SRCS+=	ConstantPools.cpp \
 	MCWin64EH.cpp \
 	MCWinCOFFStreamer.cpp \
 	MCWinEH.cpp \
+	MCXCOFFObjectTargetWriter.cpp \
+	MCXCOFFStreamer.cpp \
 	MachObjectWriter.cpp \
 	StringTableBuilder.cpp \
 	SubtargetFeature.cpp \
 	WasmObjectWriter.cpp \
-	WinCOFFObjectWriter.cpp
+	WinCOFFObjectWriter.cpp \
+	XCOFFObjectWriter.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/MC
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/MC
diff --git a/gnu/usr.bin/clang/libLLVMMCDisassembler/Makefile b/gnu/usr.bin/clang/libLLVMMCDisassembler/Makefile
index 1287a41ee69..bb37f01b15b 100644
--- a/gnu/usr.bin/clang/libLLVMMCDisassembler/Makefile
+++ b/gnu/usr.bin/clang/libLLVMMCDisassembler/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2019/03/05 09:44:41 jsg Exp $
+# $OpenBSD: Makefile,v 1.5 2020/08/03 14:45:26 patrick Exp $
 
 LIB=	LLVMMCDisassembler
 NOPROFILE=
@@ -9,4 +9,4 @@ SRCS+=	Disassembler.cpp \
 	MCRelocationInfo.cpp \
 	MCSymbolizer.cpp \
 
-.PATH:	${.CURDIR}/../../../llvm/lib/MC/MCDisassembler
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/MC/MCDisassembler
diff --git a/gnu/usr.bin/clang/libLLVMMCParser/Makefile b/gnu/usr.bin/clang/libLLVMMCParser/Makefile
index 727facbe415..e0c995b31c7 100644
--- a/gnu/usr.bin/clang/libLLVMMCParser/Makefile
+++ b/gnu/usr.bin/clang/libLLVMMCParser/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2019/06/23 22:07:40 patrick Exp $
+# $OpenBSD: Makefile,v 1.5 2020/08/03 14:45:26 patrick Exp $
 
 LIB=	LLVMMCParser
 NOPROFILE=
@@ -16,4 +16,4 @@ SRCS+=	AsmLexer.cpp \
 	MCTargetAsmParser.cpp \
 	WasmAsmParser.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/MC/MCParser
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/MC/MCParser
diff --git a/gnu/usr.bin/clang/libLLVMMIRParser/Makefile b/gnu/usr.bin/clang/libLLVMMIRParser/Makefile
index f3ddfdfec17..cab12cf2bb6 100644
--- a/gnu/usr.bin/clang/libLLVMMIRParser/Makefile
+++ b/gnu/usr.bin/clang/libLLVMMIRParser/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:41 jsg Exp $
+# $OpenBSD: Makefile,v 1.4 2020/08/03 14:45:26 patrick Exp $
 
 LIB=	LLVMMIRParser
 NOPROFILE=
@@ -7,4 +7,4 @@ SRCS+=	MILexer.cpp \
 	MIParser.cpp \
 	MIRParser.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/CodeGen/MIRParser
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/CodeGen/MIRParser
diff --git a/gnu/usr.bin/clang/libLLVMMipsAsmParser/Makefile b/gnu/usr.bin/clang/libLLVMMipsAsmParser/Makefile
index 288d9b81749..0cc45c135be 100644
--- a/gnu/usr.bin/clang/libLLVMMipsAsmParser/Makefile
+++ b/gnu/usr.bin/clang/libLLVMMipsAsmParser/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:41 jsg Exp $
+# $OpenBSD: Makefile,v 1.4 2020/08/03 14:45:26 patrick Exp $
 
 LIB=	LLVMMipsAsmParser
 NOPROFILE=
@@ -8,4 +8,4 @@ CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/Mips \
 
 SRCS+=	MipsAsmParser.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Target/Mips/AsmParser
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Target/Mips/AsmParser
diff --git a/gnu/usr.bin/clang/libLLVMMipsAsmPrinter/Makefile b/gnu/usr.bin/clang/libLLVMMipsAsmPrinter/Makefile
deleted file mode 100644
index 344bfd18f50..00000000000
--- a/gnu/usr.bin/clang/libLLVMMipsAsmPrinter/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:41 jsg Exp $
-
-LIB=	LLVMMipsAsmPrinter
-NOPROFILE=
-
-CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/Mips -I${LLVM_SRCS}/lib/Target/Mips
-
-SRCS+=	MipsInstPrinter.cpp
-
-.PATH:	${.CURDIR}/../../../llvm/lib/Target/Mips/InstPrinter
diff --git a/gnu/usr.bin/clang/libLLVMMipsCodeGen/Makefile b/gnu/usr.bin/clang/libLLVMMipsCodeGen/Makefile
index a6bcdc73498..85d7aaffe9a 100644
--- a/gnu/usr.bin/clang/libLLVMMipsCodeGen/Makefile
+++ b/gnu/usr.bin/clang/libLLVMMipsCodeGen/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2019/10/25 00:40:56 mortimer Exp $
+# $OpenBSD: Makefile,v 1.8 2020/08/03 14:45:26 patrick Exp $
 
 LIB=	LLVMMipsCodeGen
 NOPROFILE=
@@ -46,4 +46,4 @@ SRCS+=	MicroMipsSizeReduction.cpp \
 	MipsTargetMachine.cpp \
 	MipsTargetObjectFile.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Target/Mips
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Target/Mips
diff --git a/gnu/usr.bin/clang/libLLVMMipsDesc/Makefile b/gnu/usr.bin/clang/libLLVMMipsDesc/Makefile
index d1ebae8670e..052afe7b648 100644
--- a/gnu/usr.bin/clang/libLLVMMipsDesc/Makefile
+++ b/gnu/usr.bin/clang/libLLVMMipsDesc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:41 jsg Exp $
+# $OpenBSD: Makefile,v 1.4 2020/08/03 14:45:26 patrick Exp $
 
 LIB=	LLVMMipsDesc
 NOPROFILE=
@@ -10,6 +10,7 @@ SRCS+=	MipsABIInfo.cpp \
 	MipsAsmBackend.cpp \
 	MipsELFObjectWriter.cpp \
 	MipsELFStreamer.cpp \
+	MipsInstPrinter.cpp \
 	MipsMCAsmInfo.cpp \
 	MipsMCCodeEmitter.cpp \
 	MipsMCExpr.cpp \
@@ -18,4 +19,4 @@ SRCS+=	MipsABIInfo.cpp \
 	MipsOptionRecord.cpp \
 	MipsTargetStreamer.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Target/Mips/MCTargetDesc
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Target/Mips/MCTargetDesc
diff --git a/gnu/usr.bin/clang/libLLVMMipsDisassembler/Makefile b/gnu/usr.bin/clang/libLLVMMipsDisassembler/Makefile
index e431e0de10b..abed9966658 100644
--- a/gnu/usr.bin/clang/libLLVMMipsDisassembler/Makefile
+++ b/gnu/usr.bin/clang/libLLVMMipsDisassembler/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:41 jsg Exp $
+# $OpenBSD: Makefile,v 1.4 2020/08/03 14:45:26 patrick Exp $
 
 LIB=	LLVMMipsDisassembler
 NOPROFILE=
@@ -7,4 +7,4 @@ CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/Mips -I${LLVM_SRCS}/lib/Target/Mips
 
 SRCS+=	MipsDisassembler.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Target/Mips/Disassembler
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Target/Mips/Disassembler
diff --git a/gnu/usr.bin/clang/libLLVMMipsInfo/Makefile b/gnu/usr.bin/clang/libLLVMMipsInfo/Makefile
index ffb1d892d08..a02fee70dac 100644
--- a/gnu/usr.bin/clang/libLLVMMipsInfo/Makefile
+++ b/gnu/usr.bin/clang/libLLVMMipsInfo/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:41 jsg Exp $
+# $OpenBSD: Makefile,v 1.4 2020/08/03 14:45:26 patrick Exp $
 
 LIB=	LLVMMipsInfo
 NOPROFILE=
@@ -7,4 +7,4 @@ CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/Mips -I${LLVM_SRCS}/lib/Target/Mips
 
 SRCS+=	MipsTargetInfo.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Target/Mips/TargetInfo
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Target/Mips/TargetInfo
diff --git a/gnu/usr.bin/clang/libLLVMObjCARCOpts/Makefile b/gnu/usr.bin/clang/libLLVMObjCARCOpts/Makefile
index 51b5dd66a0f..94f0ae545df 100644
--- a/gnu/usr.bin/clang/libLLVMObjCARCOpts/Makefile
+++ b/gnu/usr.bin/clang/libLLVMObjCARCOpts/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:41 jsg Exp $
+# $OpenBSD: Makefile,v 1.4 2020/08/03 14:45:26 patrick Exp $
 
 LIB=	LLVMObjCARCOpts
 NOPROFILE=
@@ -15,4 +15,4 @@ SRCS+=	ObjCARC.cpp \
 	ProvenanceAnalysisEvaluator.cpp \
 	PtrState.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Transforms/ObjCARC
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Transforms/ObjCARC
diff --git a/gnu/usr.bin/clang/libLLVMObject/Makefile b/gnu/usr.bin/clang/libLLVMObject/Makefile
index b84439eb38b..94c513612b6 100644
--- a/gnu/usr.bin/clang/libLLVMObject/Makefile
+++ b/gnu/usr.bin/clang/libLLVMObject/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2019/03/05 09:44:41 jsg Exp $
+# $OpenBSD: Makefile,v 1.8 2020/08/03 14:45:26 patrick Exp $
 
 LIB=	LLVMObject
 NOPROFILE=
@@ -13,6 +13,7 @@ SRCS+=	Archive.cpp \
 	ELF.cpp \
 	ELFObjectFile.cpp \
 	ObjectError.cpp \
+	ObjectMinidump.cpp \
 	IRObjectFile.cpp \
 	IRSymtab.cpp \
 	MachOObjectFile.cpp \
@@ -21,14 +22,22 @@ SRCS+=	Archive.cpp \
 	Object.cpp \
 	ObjectFile.cpp \
 	RecordStreamer.cpp \
+	RelocationResolver.cpp \
 	SymbolicFile.cpp \
 	SymbolSize.cpp \
+	TapiFile.cpp \
+	TapiUniversal.cpp \
 	WasmObjectFile.cpp \
-	WindowsResource.cpp
+	WindowsMachineFlag.cpp \
+	WindowsResource.cpp \
+	XCOFFObjectFile.cpp
 
 ObjectError.cpp:
 	ln -s ${LLVM_SRCS}/lib/Object/Error.cpp $@
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Object
+ObjectMinidump.cpp:
+	ln -s ${LLVM_SRCS}/lib/Object/Minidump.cpp $@
 
-CLEANFILES+= ObjectError.cpp
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Object
+
+CLEANFILES+= ObjectError.cpp ObjectMinidump.cpp
diff --git a/gnu/usr.bin/clang/libLLVMOption/Makefile b/gnu/usr.bin/clang/libLLVMOption/Makefile
index 36ee1f5ad54..8a2a3c5f878 100644
--- a/gnu/usr.bin/clang/libLLVMOption/Makefile
+++ b/gnu/usr.bin/clang/libLLVMOption/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:41 jsg Exp $
+# $OpenBSD: Makefile,v 1.4 2020/08/03 14:45:26 patrick Exp $
 
 LIB=	LLVMOption
 NOPROFILE=
@@ -10,4 +10,4 @@ SRCS+=	Arg.cpp \
 	Option.cpp \
 	OptTable.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Option
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Option
diff --git a/gnu/usr.bin/clang/libLLVMPasses/Makefile b/gnu/usr.bin/clang/libLLVMPasses/Makefile
index 948cca4f917..aa0a5c6fca8 100644
--- a/gnu/usr.bin/clang/libLLVMPasses/Makefile
+++ b/gnu/usr.bin/clang/libLLVMPasses/Makefile
@@ -1,10 +1,12 @@
-# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:41 jsg Exp $
+# $OpenBSD: Makefile,v 1.4 2020/08/03 14:45:26 patrick Exp $
 
 LIB=	LLVMPasses
 NOPROFILE=
 
 CPPFLAGS+=	-I${LLVM_SRCS}/include/llvm/Passes
 
-SRCS+=	PassBuilder.cpp
+SRCS+=	PassBuilder.cpp \
+	PassPlugin.cpp \
+	StandardInstrumentations.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Passes
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Passes
diff --git a/gnu/usr.bin/clang/libLLVMPowerPCAsmParser/Makefile b/gnu/usr.bin/clang/libLLVMPowerPCAsmParser/Makefile
index fd32106d1de..b6098bdca55 100644
--- a/gnu/usr.bin/clang/libLLVMPowerPCAsmParser/Makefile
+++ b/gnu/usr.bin/clang/libLLVMPowerPCAsmParser/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:41 jsg Exp $
+# $OpenBSD: Makefile,v 1.4 2020/08/03 14:45:27 patrick Exp $
 
 LIB=	LLVMPowerPCAsmParser
 NOPROFILE=
@@ -8,4 +8,4 @@ CPPFLAGS+=      -I${.OBJDIR}/../include/llvm/PowerPC \
 
 SRCS+=	PPCAsmParser.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Target/PowerPC/AsmParser
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Target/PowerPC/AsmParser
diff --git a/gnu/usr.bin/clang/libLLVMPowerPCAsmPrinter/Makefile b/gnu/usr.bin/clang/libLLVMPowerPCAsmPrinter/Makefile
deleted file mode 100644
index ec3cc9ab722..00000000000
--- a/gnu/usr.bin/clang/libLLVMPowerPCAsmPrinter/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:41 jsg Exp $
-
-LIB=	LLVMPowerPCAsmPrinter
-NOPROFILE=
-
-CPPFLAGS+=      -I${.OBJDIR}/../include/llvm/PowerPC \
-		-I${LLVM_SRCS}/lib/Target/PowerPC
-
-SRCS+=	PPCInstPrinter.cpp
-
-.PATH:	${.CURDIR}/../../../llvm/lib/Target/PowerPC/InstPrinter
diff --git a/gnu/usr.bin/clang/libLLVMPowerPCCodeGen/Makefile b/gnu/usr.bin/clang/libLLVMPowerPCCodeGen/Makefile
index 050d227549b..dd89f2615c5 100644
--- a/gnu/usr.bin/clang/libLLVMPowerPCCodeGen/Makefile
+++ b/gnu/usr.bin/clang/libLLVMPowerPCCodeGen/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2019/03/05 09:44:41 jsg Exp $
+# $OpenBSD: Makefile,v 1.7 2020/08/03 14:45:27 patrick Exp $
 
 LIB=	LLVMPowerPCCodeGen
 NOPROFILE=
@@ -12,6 +12,7 @@ SRCS+=	PPCBoolRetToInt.cpp \
 	PPCBranchSelector.cpp \
 	PPCCCState.cpp \
 	PPCCTRLoops.cpp \
+	PPCCallingConv.cpp \
 	PPCExpandISEL.cpp \
 	PPCHazardRecognizers.cpp \
 	PPCInstrInfo.cpp \
@@ -20,9 +21,11 @@ SRCS+=	PPCBoolRetToInt.cpp \
 	PPCEarlyReturn.cpp \
 	PPCFastISel.cpp \
 	PPCFrameLowering.cpp \
-	PPCLoopPreIncPrep.cpp \
+	PPCLoopInstrFormPrep.cpp \
+	PPCLowerMASSVEntries.cpp \
 	PPCMCInstLower.cpp \
 	PPCMachineFunctionInfo.cpp \
+	PPCMachineScheduler.cpp \
 	PPCMIPeephole.cpp \
 	PPCPreEmitPeephole.cpp \
 	PPCQPXLoadSplat.cpp \
@@ -38,4 +41,4 @@ SRCS+=	PPCBoolRetToInt.cpp \
 	PPCVSXFMAMutate.cpp \
 	PPCVSXSwapRemoval.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Target/PowerPC
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Target/PowerPC
diff --git a/gnu/usr.bin/clang/libLLVMPowerPCDesc/Makefile b/gnu/usr.bin/clang/libLLVMPowerPCDesc/Makefile
index 4a3204b3f0e..8227db19164 100644
--- a/gnu/usr.bin/clang/libLLVMPowerPCDesc/Makefile
+++ b/gnu/usr.bin/clang/libLLVMPowerPCDesc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:41 jsg Exp $
+# $OpenBSD: Makefile,v 1.4 2020/08/03 14:45:27 patrick Exp $
 
 LIB=	LLVMPowerPCDesc
 NOPROFILE=
@@ -7,12 +7,14 @@ CPPFLAGS+=      -I${.OBJDIR}/../include/llvm/PowerPC \
 		-I${LLVM_SRCS}/lib/Target/PowerPC
 
 SRCS+=	PPCAsmBackend.cpp \
+	PPCInstPrinter.cpp \
 	PPCMCTargetDesc.cpp \
 	PPCMCAsmInfo.cpp \
 	PPCMCCodeEmitter.cpp \
 	PPCMCExpr.cpp \
 	PPCPredicates.cpp \
 	PPCMachObjectWriter.cpp \
-	PPCELFObjectWriter.cpp
+	PPCELFObjectWriter.cpp \
+	PPCXCOFFObjectWriter.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Target/PowerPC/MCTargetDesc
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Target/PowerPC/MCTargetDesc
diff --git a/gnu/usr.bin/clang/libLLVMPowerPCDisassembler/Makefile b/gnu/usr.bin/clang/libLLVMPowerPCDisassembler/Makefile
index 59ec8e91124..f4519feb11f 100644
--- a/gnu/usr.bin/clang/libLLVMPowerPCDisassembler/Makefile
+++ b/gnu/usr.bin/clang/libLLVMPowerPCDisassembler/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:41 jsg Exp $
+# $OpenBSD: Makefile,v 1.4 2020/08/03 14:45:27 patrick Exp $
 
 LIB=	LLVMPowerPCDisassembler
 NOPROFILE=
@@ -8,4 +8,4 @@ CPPFLAGS+=      -I${.OBJDIR}/../include/llvm/PowerPC \
 
 SRCS+=	PPCDisassembler.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Target/PowerPC/Disassembler
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Target/PowerPC/Disassembler
diff --git a/gnu/usr.bin/clang/libLLVMPowerPCInfo/Makefile b/gnu/usr.bin/clang/libLLVMPowerPCInfo/Makefile
index 87aa585cad0..4b3ab383902 100644
--- a/gnu/usr.bin/clang/libLLVMPowerPCInfo/Makefile
+++ b/gnu/usr.bin/clang/libLLVMPowerPCInfo/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:41 jsg Exp $
+# $OpenBSD: Makefile,v 1.4 2020/08/03 14:45:27 patrick Exp $
 
 LIB=	LLVMPowerPCInfo
 NOPROFILE=
@@ -8,4 +8,4 @@ CPPFLAGS+=      -I${.OBJDIR}/../include/llvm/PowerPC \
 
 SRCS+=	PowerPCTargetInfo.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Target/PowerPC/TargetInfo
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Target/PowerPC/TargetInfo
diff --git a/gnu/usr.bin/clang/libLLVMProfileData/Makefile b/gnu/usr.bin/clang/libLLVMProfileData/Makefile
index c61269c11bd..6b541d98337 100644
--- a/gnu/usr.bin/clang/libLLVMProfileData/Makefile
+++ b/gnu/usr.bin/clang/libLLVMProfileData/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2019/03/05 09:44:41 jsg Exp $
+# $OpenBSD: Makefile,v 1.5 2020/08/03 14:45:27 patrick Exp $
 
 LIB=	LLVMProfileData
 NOPROFILE=
@@ -13,4 +13,4 @@ SRCS+=	InstrProf.cpp \
 	SampleProfReader.cpp \
 	SampleProfWriter.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/ProfileData
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/ProfileData
diff --git a/gnu/usr.bin/clang/libLLVMRemarks/Makefile b/gnu/usr.bin/clang/libLLVMRemarks/Makefile
new file mode 100644
index 00000000000..e0aa58f97f2
--- /dev/null
+++ b/gnu/usr.bin/clang/libLLVMRemarks/Makefile
@@ -0,0 +1,17 @@
+# $OpenBSD: Makefile,v 1.1 2020/08/03 14:45:27 patrick Exp $
+
+LIB=	LLVMRemarks
+NOPROFILE=
+
+SRCS+=	BitstreamRemarkParser.cpp \
+	BitstreamRemarkSerializer.cpp \
+	Remark.cpp \
+	RemarkFormat.cpp \
+	RemarkLinker.cpp \
+	RemarkParser.cpp \
+	RemarkSerializer.cpp \
+	RemarkStringTable.cpp \
+	YAMLRemarkParser.cpp \
+	YAMLRemarkSerializer.cpp
+
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Remarks
diff --git a/gnu/usr.bin/clang/libLLVMScalarOpts/Makefile b/gnu/usr.bin/clang/libLLVMScalarOpts/Makefile
index 047afd8c527..61bde3cbb49 100644
--- a/gnu/usr.bin/clang/libLLVMScalarOpts/Makefile
+++ b/gnu/usr.bin/clang/libLLVMScalarOpts/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2019/06/23 22:07:41 patrick Exp $
+# $OpenBSD: Makefile,v 1.12 2020/08/03 14:45:27 patrick Exp $
 
 LIB=	LLVMScalarOpts
 NOPROFILE=
@@ -34,6 +34,7 @@ SRCS+=	ADCE.cpp \
 	LoopDataPrefetch.cpp \
 	LoopDeletion.cpp \
 	LoopDistribute.cpp \
+	LoopFuse.cpp \
 	LoopIdiomRecognize.cpp \
 	LoopInstSimplify.cpp \
 	LoopInterchange.cpp \
@@ -50,8 +51,11 @@ SRCS+=	ADCE.cpp \
 	LoopUnswitch.cpp \
 	LoopVersioningLICM.cpp \
 	LowerAtomic.cpp \
+	LowerConstantIntrinsics.cpp \
 	LowerExpectIntrinsic.cpp \
 	LowerGuardIntrinsic.cpp \
+	LowerMatrixIntrinsics.cpp \
+	LowerWidenableCondition.cpp \
 	MakeGuardsExplicit.cpp \
 	MemCpyOptimizer.cpp \
 	MergeICmps.cpp \
@@ -81,6 +85,6 @@ SRCS+=	ADCE.cpp \
 ScalarSCCP.cpp:
 	ln -s ${LLVM_SRCS}/lib/Transforms/Scalar/SCCP.cpp $@
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Transforms/Scalar
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Transforms/Scalar
 
 CLEANFILES+= ScalarSCCP.cpp
diff --git a/gnu/usr.bin/clang/libLLVMSelectionDAG/Makefile b/gnu/usr.bin/clang/libLLVMSelectionDAG/Makefile
index 244efd92c1c..fb471e6cf83 100644
--- a/gnu/usr.bin/clang/libLLVMSelectionDAG/Makefile
+++ b/gnu/usr.bin/clang/libLLVMSelectionDAG/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2019/03/05 09:44:41 jsg Exp $
+# $OpenBSD: Makefile,v 1.6 2020/08/03 14:45:27 patrick Exp $
 
 LIB=	LLVMSelectionDAG
 NOPROFILE=
@@ -29,4 +29,4 @@ SRCS+=	DAGCombiner.cpp \
 	ScheduleDAGVLIW.cpp \
 	TargetLowering.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/CodeGen/SelectionDAG
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/CodeGen/SelectionDAG
diff --git a/gnu/usr.bin/clang/libLLVMSparcAsmParser/Makefile b/gnu/usr.bin/clang/libLLVMSparcAsmParser/Makefile
index 9a5b9d29847..6050915890b 100644
--- a/gnu/usr.bin/clang/libLLVMSparcAsmParser/Makefile
+++ b/gnu/usr.bin/clang/libLLVMSparcAsmParser/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:41 jsg Exp $
+# $OpenBSD: Makefile,v 1.4 2020/08/03 14:45:27 patrick Exp $
 
 LIB=	LLVMSparcAsmParser
 NOPROFILE=
@@ -8,4 +8,4 @@ CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/Sparc \
 
 SRCS+=	SparcAsmParser.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Target/Sparc/AsmParser
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Target/Sparc/AsmParser
diff --git a/gnu/usr.bin/clang/libLLVMSparcAsmPrinter/Makefile b/gnu/usr.bin/clang/libLLVMSparcAsmPrinter/Makefile
deleted file mode 100644
index b43688b9f5f..00000000000
--- a/gnu/usr.bin/clang/libLLVMSparcAsmPrinter/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:42 jsg Exp $
-
-LIB=	LLVMSparcAsmPrinter
-NOPROFILE=
-
-CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/Sparc \
-		-I${LLVM_SRCS}/lib/Target/Sparc
-
-SRCS+=	SparcInstPrinter.cpp
-
-.PATH:	${.CURDIR}/../../../llvm/lib/Target/Sparc/InstPrinter
diff --git a/gnu/usr.bin/clang/libLLVMSparcCodeGen/Makefile b/gnu/usr.bin/clang/libLLVMSparcCodeGen/Makefile
index fd0fec1a0a7..3bc2a97ff63 100644
--- a/gnu/usr.bin/clang/libLLVMSparcCodeGen/Makefile
+++ b/gnu/usr.bin/clang/libLLVMSparcCodeGen/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2019/03/05 09:44:42 jsg Exp $
+# $OpenBSD: Makefile,v 1.5 2020/08/03 14:45:27 patrick Exp $
 
 LIB=	LLVMSparcCodeGen
 NOPROFILE=
@@ -20,4 +20,4 @@ SRCS+=	DelaySlotFiller.cpp \
 	SparcMCInstLower.cpp \
 	SparcTargetObjectFile.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Target/Sparc
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Target/Sparc
diff --git a/gnu/usr.bin/clang/libLLVMSparcDesc/Makefile b/gnu/usr.bin/clang/libLLVMSparcDesc/Makefile
index 788b218aea1..4624304a1ff 100644
--- a/gnu/usr.bin/clang/libLLVMSparcDesc/Makefile
+++ b/gnu/usr.bin/clang/libLLVMSparcDesc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:42 jsg Exp $
+# $OpenBSD: Makefile,v 1.4 2020/08/03 14:45:27 patrick Exp $
 
 LIB=	LLVMSparcDesc
 NOPROFILE=
@@ -8,10 +8,11 @@ CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/Sparc \
 
 SRCS+=	SparcAsmBackend.cpp \
 	SparcELFObjectWriter.cpp \
+	SparcInstPrinter.cpp \
 	SparcMCAsmInfo.cpp \
 	SparcMCCodeEmitter.cpp \
 	SparcMCTargetDesc.cpp \
 	SparcMCExpr.cpp \
 	SparcTargetStreamer.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Target/Sparc/MCTargetDesc
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Target/Sparc/MCTargetDesc
diff --git a/gnu/usr.bin/clang/libLLVMSparcDisassembler/Makefile b/gnu/usr.bin/clang/libLLVMSparcDisassembler/Makefile
index a5aa5f97248..6dd0de83311 100644
--- a/gnu/usr.bin/clang/libLLVMSparcDisassembler/Makefile
+++ b/gnu/usr.bin/clang/libLLVMSparcDisassembler/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:42 jsg Exp $
+# $OpenBSD: Makefile,v 1.4 2020/08/03 14:45:27 patrick Exp $
 
 LIB=	LLVMSparcDisassembler
 NOPROFILE=
@@ -8,4 +8,4 @@ CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/Sparc \
 
 SRCS+=	SparcDisassembler.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Target/Sparc/Disassembler
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Target/Sparc/Disassembler
diff --git a/gnu/usr.bin/clang/libLLVMSparcInfo/Makefile b/gnu/usr.bin/clang/libLLVMSparcInfo/Makefile
index eda4f914fcf..f3be6e5904c 100644
--- a/gnu/usr.bin/clang/libLLVMSparcInfo/Makefile
+++ b/gnu/usr.bin/clang/libLLVMSparcInfo/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:42 jsg Exp $
+# $OpenBSD: Makefile,v 1.4 2020/08/03 14:45:27 patrick Exp $
 
 LIB=	LLVMSparcInfo
 NOPROFILE=
@@ -8,4 +8,4 @@ CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/Sparc \
 
 SRCS+=	SparcTargetInfo.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Target/Sparc/TargetInfo
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Target/Sparc/TargetInfo
diff --git a/gnu/usr.bin/clang/libLLVMSupport/Makefile b/gnu/usr.bin/clang/libLLVMSupport/Makefile
index 52ad9f617ed..1da7d3aa744 100644
--- a/gnu/usr.bin/clang/libLLVMSupport/Makefile
+++ b/gnu/usr.bin/clang/libLLVMSupport/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2019/06/23 22:07:41 patrick Exp $
+# $OpenBSD: Makefile,v 1.11 2020/08/03 14:45:27 patrick Exp $
 
 LIB=	LLVMSupport
 NOPIC=
@@ -8,6 +8,7 @@ CPPFLAGS+=	-I${LLVM_SRCS}/include/llvm/Support
 
 .include <bsd.own.mk>
 SRCS=	AArch64TargetParser.cpp \
+	ABIBreak.cpp \
 	AMDGPUMetadata.cpp \
 	APFloat.cpp \
 	APInt.cpp \
@@ -26,6 +27,7 @@ SRCS=	AArch64TargetParser.cpp \
 	BuryPointer.cpp \
 	circular_raw_ostream.cpp \
 	COM.cpp \
+	CRC.cpp \
 	CachePruning.cpp \
 	Chrono.cpp \
 	CodeGenCoverage.cpp \
@@ -43,6 +45,7 @@ SRCS=	AArch64TargetParser.cpp \
 	SupportError.cpp \
 	ErrorHandling.cpp \
 	FileCheck.cpp \
+	FileCollector.cpp \
 	FileUtilities.cpp \
 	FileOutputBuffer.cpp \
 	FoldingSet.cpp \
@@ -56,7 +59,6 @@ SRCS=	AArch64TargetParser.cpp \
 	IntervalMap.cpp \
 	ItaniumManglingCanonicalizer.cpp \
 	JSON.cpp \
-	JamCRC.cpp \
 	KnownBits.cpp \
 	LEB128.cpp \
 	LineIterator.cpp \
@@ -68,7 +70,7 @@ SRCS=	AArch64TargetParser.cpp \
 	MemoryBuffer.cpp \
 	MD5.cpp \
 	NativeFormatting.cpp \
-	Options.cpp \
+	Optional.cpp \
 	Parallel.cpp \
 	PluginLoader.cpp \
 	PrettyStackTrace.cpp \
@@ -77,6 +79,7 @@ SRCS=	AArch64TargetParser.cpp \
 	ScaledNumber.cpp \
 	ScopedPrinter.cpp \
 	SHA1.cpp \
+	Signposts.cpp \
 	SmallPtrSet.cpp \
 	SmallVector.cpp \
 	SourceMgr.cpp \
@@ -92,6 +95,7 @@ SRCS=	AArch64TargetParser.cpp \
 	TarWriter.cpp \
 	TargetParser.cpp \
 	ThreadPool.cpp \
+	TimeProfiler.cpp \
 	Timer.cpp \
 	ToolOutputFile.cpp \
 	TrigramIndex.cpp \
@@ -112,7 +116,6 @@ SRCS=	AArch64TargetParser.cpp \
 	Errno.cpp \
 	Host.cpp \
 	Memory.cpp \
-	Mutex.cpp \
 	Path.cpp \
 	Process.cpp \
 	Program.cpp \
@@ -127,6 +130,7 @@ SRCS=	AArch64TargetParser.cpp \
 	VirtualFileSystem.cpp \
 	Watchdog.cpp \
 	WithColor.cpp \
+	Z3Solver.cpp \
 	xxhash.cpp
 
 SupportError.cpp:
@@ -135,7 +139,7 @@ SupportError.cpp:
 SupportLowLevelType.cpp:
 	ln -s ${LLVM_SRCS}/lib/Support/LowLevelType.cpp $@
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Support
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Support
 
 install:
 	@# Nothing here so far ...
diff --git a/gnu/usr.bin/clang/libLLVMSupport/Makefile.shared b/gnu/usr.bin/clang/libLLVMSupport/Makefile.shared
index c418ead9b23..491a65bff82 100644
--- a/gnu/usr.bin/clang/libLLVMSupport/Makefile.shared
+++ b/gnu/usr.bin/clang/libLLVMSupport/Makefile.shared
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.shared,v 1.2 2019/06/23 22:07:41 patrick Exp $
+# $OpenBSD: Makefile.shared,v 1.3 2020/08/03 14:45:27 patrick Exp $
 
 LIB=	LLVMSupport
 
@@ -8,6 +8,7 @@ CPPFLAGS+=	-I${LLVM_SRCS}/include/llvm/Support
 
 
 SRCS+=	AArch64TargetParser.cpp \
+	ABIBreak.cpp \
 	AMDGPUMetadata.cpp \
 	APFloat.cpp \
 	APInt.cpp \
@@ -26,6 +27,7 @@ SRCS+=	AArch64TargetParser.cpp \
 	BuryPointer.cpp \
 	circular_raw_ostream.cpp \
 	COM.cpp \
+	CRC.cpp \
 	CachePruning.cpp \
 	Chrono.cpp \
 	CodeGenCoverage.cpp \
@@ -43,6 +45,7 @@ SRCS+=	AArch64TargetParser.cpp \
 	SupportError.cpp \
 	ErrorHandling.cpp \
 	FileCheck.cpp \
+	FileCollector.cpp \
 	FileUtilities.cpp \
 	FileOutputBuffer.cpp \
 	FoldingSet.cpp \
@@ -56,7 +59,6 @@ SRCS+=	AArch64TargetParser.cpp \
 	IntervalMap.cpp \
 	ItaniumManglingCanonicalizer.cpp \
 	JSON.cpp \
-	JamCRC.cpp \
 	KnownBits.cpp \
 	LEB128.cpp \
 	LineIterator.cpp \
@@ -68,7 +70,7 @@ SRCS+=	AArch64TargetParser.cpp \
 	MemoryBuffer.cpp \
 	MD5.cpp \
 	NativeFormatting.cpp \
-	Options.cpp \
+	Optional.cpp \
 	Parallel.cpp \
 	PluginLoader.cpp \
 	PrettyStackTrace.cpp \
@@ -77,6 +79,7 @@ SRCS+=	AArch64TargetParser.cpp \
 	ScaledNumber.cpp \
 	ScopedPrinter.cpp \
 	SHA1.cpp \
+	Signposts.cpp \
 	SmallPtrSet.cpp \
 	SmallVector.cpp \
 	SourceMgr.cpp \
@@ -92,6 +95,7 @@ SRCS+=	AArch64TargetParser.cpp \
 	TarWriter.cpp \
 	TargetParser.cpp \
 	ThreadPool.cpp \
+	TimeProfiler.cpp \
 	Timer.cpp \
 	ToolOutputFile.cpp \
 	TrigramIndex.cpp \
@@ -112,7 +116,6 @@ SRCS+=	AArch64TargetParser.cpp \
 	Errno.cpp \
 	Host.cpp \
 	Memory.cpp \
-	Mutex.cpp \
 	Path.cpp \
 	Process.cpp \
 	Program.cpp \
@@ -127,6 +130,7 @@ SRCS+=	AArch64TargetParser.cpp \
 	VirtualFileSystem.cpp \
 	Watchdog.cpp \
 	WithColor.cpp \
+	Z3Solver.cpp \
 	xxhash.cpp
 
 SupportError.cpp:
@@ -135,6 +139,6 @@ SupportError.cpp:
 SupportLowLevelType.cpp:
 	ln -s ${LLVM_SRCS}/lib/Support/LowLevelType.cpp $@
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Support
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Support
 
 CLEANFILES+= SupportError.cpp SupportLowLevelType.cpp
diff --git a/gnu/usr.bin/clang/libLLVMTableGen/Makefile b/gnu/usr.bin/clang/libLLVMTableGen/Makefile
index 33861cf79bd..e26ccbf1e77 100644
--- a/gnu/usr.bin/clang/libLLVMTableGen/Makefile
+++ b/gnu/usr.bin/clang/libLLVMTableGen/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2019/02/26 23:39:51 jsg Exp $
+# $OpenBSD: Makefile,v 1.5 2020/08/03 14:45:27 patrick Exp $
 
 LIB=	LLVMTableGen
 NOPIC=
@@ -20,7 +20,7 @@ SRCS=	TableGenError.cpp \
 TableGenError.cpp:
 	ln -s ${LLVM_SRCS}/lib/TableGen/Error.cpp $@
 
-.PATH:	${.CURDIR}/../../../llvm/lib/TableGen
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/TableGen
 
 install:
 	@# Nothing here so far ...
diff --git a/gnu/usr.bin/clang/libLLVMTableGen/Makefile.shared b/gnu/usr.bin/clang/libLLVMTableGen/Makefile.shared
index bdd62e90e2f..13cf5ff45f1 100644
--- a/gnu/usr.bin/clang/libLLVMTableGen/Makefile.shared
+++ b/gnu/usr.bin/clang/libLLVMTableGen/Makefile.shared
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.shared,v 1.1 2019/03/05 09:44:42 jsg Exp $
+# $OpenBSD: Makefile.shared,v 1.2 2020/08/03 14:45:27 patrick Exp $
 
 LIB=	LLVMTableGen
 
@@ -20,6 +20,6 @@ SRCS+=	TableGenError.cpp \
 TableGenError.cpp:
 	ln -s ${LLVM_SRCS}/lib/TableGen/Error.cpp $@
 
-.PATH:	${.CURDIR}/../../../llvm/lib/TableGen
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/TableGen
 
 CLEANFILES+= TableGenError.cpp
diff --git a/gnu/usr.bin/clang/libLLVMTarget/Makefile b/gnu/usr.bin/clang/libLLVMTarget/Makefile
index bbfb77f93cb..e49991c805c 100644
--- a/gnu/usr.bin/clang/libLLVMTarget/Makefile
+++ b/gnu/usr.bin/clang/libLLVMTarget/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2019/03/05 09:44:42 jsg Exp $
+# $OpenBSD: Makefile,v 1.5 2020/08/03 14:45:27 patrick Exp $
 
 LIB=	LLVMTarget
 NOPROFILE=
@@ -11,4 +11,4 @@ SRCS+=	Target.cpp \
 	TargetMachine.cpp \
 	TargetMachineC.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Target
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Target
diff --git a/gnu/usr.bin/clang/libLLVMTextAPI/Makefile b/gnu/usr.bin/clang/libLLVMTextAPI/Makefile
new file mode 100644
index 00000000000..af98648f14e
--- /dev/null
+++ b/gnu/usr.bin/clang/libLLVMTextAPI/Makefile
@@ -0,0 +1,25 @@
+# $OpenBSD: Makefile,v 1.1 2020/08/03 14:45:28 patrick Exp $
+
+LIB=	LLVMTextAPI
+NOPROFILE=
+
+SRCS+=	ELFStub.cpp \
+	TBEHandler.cpp \
+	Architecture.cpp \
+	ArchitectureSet.cpp \
+	InterfaceFile.cpp \
+	PackedVersion.cpp \
+	Platform.cpp \
+	Symbol.cpp \
+	TextAPITarget.cpp \
+	TextStub.cpp \
+	TextStubCommon.cpp
+
+TextAPITarget.cpp:
+	ln -s ${LLVM_SRCS}/lib/TextAPI/MachO/Target.cpp $@
+
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/TextAPI
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/TextAPI/ELF
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/TextAPI/MachO
+
+CLEANFILES+= TextAPITarget.cpp
diff --git a/gnu/usr.bin/clang/libLLVMTransformUtils/Makefile b/gnu/usr.bin/clang/libLLVMTransformUtils/Makefile
index 8e8b054aaff..fa445b5963e 100644
--- a/gnu/usr.bin/clang/libLLVMTransformUtils/Makefile
+++ b/gnu/usr.bin/clang/libLLVMTransformUtils/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2019/06/23 22:07:41 patrick Exp $
+# $OpenBSD: Makefile,v 1.12 2020/08/03 14:45:28 patrick Exp $
 
 LIB=	LLVMTransformUtils
 NOPROFILE=
@@ -17,7 +17,9 @@ SRCS+=	ASanStackFrameLayout.cpp \
 	CloneFunction.cpp \
 	CloneModule.cpp \
 	CodeExtractor.cpp \
+	CodeMoverUtils.cpp \
 	CtorUtils.cpp \
+	Debugify.cpp \
 	DemoteRegToStack.cpp \
 	EntryExitInstrumenter.cpp \
 	EscapeEnumerator.cpp \
@@ -28,6 +30,7 @@ SRCS+=	ASanStackFrameLayout.cpp \
 	GlobalStatus.cpp \
 	TransformUtilsGuardUtils.cpp \
 	ImportedFunctionsInliningStatistics.cpp \
+	InjectTLIMappings.cpp \
 	InlineFunction.cpp \
 	InstructionNamer.cpp \
 	IntegerDivision.cpp \
@@ -47,6 +50,7 @@ SRCS+=	ASanStackFrameLayout.cpp \
 	LowerSwitch.cpp \
 	Mem2Reg.cpp \
 	MetaRenamer.cpp \
+	MisExpect.cpp \
 	ModuleUtils.cpp \
 	NameAnonGlobals.cpp \
 	PredicateInfo.cpp \
@@ -57,6 +61,7 @@ SRCS+=	ASanStackFrameLayout.cpp \
 	SimplifyCFG.cpp \
 	SimplifyIndVar.cpp \
 	SimplifyLibCalls.cpp \
+	SizeOpts.cpp \
 	SplitModule.cpp \
 	StripNonLineTableDebugInfo.cpp \
 	SymbolRewriter.cpp \
@@ -71,6 +76,6 @@ TransformUtilsGuardUtils.cpp:
 TransformUtilsUtils.cpp:
 	ln -s ${LLVM_SRCS}/lib/Transforms/Utils/Utils.cpp $@
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Transforms/Utils
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Transforms/Utils
 
 CLEANFILES+= TransformUtilsUtils.cpp
diff --git a/gnu/usr.bin/clang/libLLVMVectorize/Makefile b/gnu/usr.bin/clang/libLLVMVectorize/Makefile
index 44dfdbdcab6..59be0d6174f 100644
--- a/gnu/usr.bin/clang/libLLVMVectorize/Makefile
+++ b/gnu/usr.bin/clang/libLLVMVectorize/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2019/06/23 22:07:41 patrick Exp $
+# $OpenBSD: Makefile,v 1.9 2020/08/03 14:45:28 patrick Exp $
 
 LIB=	LLVMVectorize
 NOPROFILE=
@@ -11,9 +11,10 @@ SRCS+=	LoadStoreVectorizer.cpp \
 	SLPVectorizer.cpp \
 	VPlan.cpp \
 	VPlanHCFGBuilder.cpp \
-	VPlanHCFGTransforms.cpp \
+	VPlanPredicator.cpp \
 	VPlanSLP.cpp \
+	VPlanTransforms.cpp \
 	VPlanVerifier.cpp \
 	Vectorize.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Transforms/Vectorize
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Transforms/Vectorize
diff --git a/gnu/usr.bin/clang/libLLVMX86AsmParser/Makefile b/gnu/usr.bin/clang/libLLVMX86AsmParser/Makefile
index f9ad34c1561..b9bedebbd30 100644
--- a/gnu/usr.bin/clang/libLLVMX86AsmParser/Makefile
+++ b/gnu/usr.bin/clang/libLLVMX86AsmParser/Makefile
@@ -1,11 +1,10 @@
-# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:42 jsg Exp $
+# $OpenBSD: Makefile,v 1.4 2020/08/03 14:45:28 patrick Exp $
 
 LIB=	LLVMX86AsmParser
 NOPROFILE=
 
 CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/X86 -I${LLVM_SRCS}/lib/Target/X86
 
-SRCS+=	X86AsmInstrumentation.cpp \
-	X86AsmParser.cpp
+SRCS+=	X86AsmParser.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Target/X86/AsmParser
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Target/X86/AsmParser
diff --git a/gnu/usr.bin/clang/libLLVMX86AsmPrinter/Makefile b/gnu/usr.bin/clang/libLLVMX86AsmPrinter/Makefile
deleted file mode 100644
index 7e7acb1ac06..00000000000
--- a/gnu/usr.bin/clang/libLLVMX86AsmPrinter/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $OpenBSD: Makefile,v 1.4 2019/03/05 09:44:42 jsg Exp $
-
-LIB=	LLVMX86AsmPrinter
-NOPROFILE=
-
-CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/X86 -I${LLVM_SRCS}/lib/Target/X86
-
-SRCS+=	X86ATTInstPrinter.cpp \
-	X86InstPrinterCommon.cpp \
-	X86IntelInstPrinter.cpp \
-	X86InstComments.cpp
-
-.PATH:	${.CURDIR}/../../../llvm/lib/Target/X86/InstPrinter
diff --git a/gnu/usr.bin/clang/libLLVMX86CodeGen/Makefile b/gnu/usr.bin/clang/libLLVMX86CodeGen/Makefile
index ec4d028120a..19c906b909f 100644
--- a/gnu/usr.bin/clang/libLLVMX86CodeGen/Makefile
+++ b/gnu/usr.bin/clang/libLLVMX86CodeGen/Makefile
@@ -1,13 +1,13 @@
-# $OpenBSD: Makefile,v 1.13 2019/06/23 22:07:41 patrick Exp $
+# $OpenBSD: Makefile,v 1.14 2020/08/03 14:45:28 patrick Exp $
 
 LIB=	LLVMX86CodeGen
 NOPROFILE=
 
 CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/X86 -I${LLVM_SRCS}/lib/Target/X86
 
-SRCS+=	ShadowCallStack.cpp\
-	X86AsmPrinter.cpp \
+SRCS+=	X86AsmPrinter.cpp \
 	X86AvoidStoreForwardingBlocks.cpp \
+	X86AvoidTrailingCall.cpp \
 	X86CallFrameOptimization.cpp \
 	X86CallLowering.cpp \
 	X86CallingConv.cpp \
@@ -55,4 +55,4 @@ SRCS+=	ShadowCallStack.cpp\
 	X86WinEHState.cpp \
 	X86OptimizeLEAs.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Target/X86
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Target/X86
diff --git a/gnu/usr.bin/clang/libLLVMX86Desc/Makefile b/gnu/usr.bin/clang/libLLVMX86Desc/Makefile
index 963199549a6..c5250b3a339 100644
--- a/gnu/usr.bin/clang/libLLVMX86Desc/Makefile
+++ b/gnu/usr.bin/clang/libLLVMX86Desc/Makefile
@@ -1,11 +1,15 @@
-# $OpenBSD: Makefile,v 1.5 2019/03/05 09:44:42 jsg Exp $
+# $OpenBSD: Makefile,v 1.6 2020/08/03 14:45:28 patrick Exp $
 
 LIB=	LLVMX86Desc
 NOPROFILE=
 
 CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/X86 -I${LLVM_SRCS}/lib/Target/X86
 
-SRCS+=	X86AsmBackend.cpp \
+SRCS+=	X86ATTInstPrinter.cpp \
+	X86IntelInstPrinter.cpp \
+	X86InstComments.cpp \
+	X86InstPrinterCommon.cpp \
+	X86AsmBackend.cpp \
 	X86MCTargetDesc.cpp \
 	X86MCAsmInfo.cpp \
 	X86MCCodeEmitter.cpp \
@@ -15,4 +19,4 @@ SRCS+=	X86AsmBackend.cpp \
 	X86WinCOFFStreamer.cpp \
 	X86WinCOFFTargetStreamer.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Target/X86/MCTargetDesc
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Target/X86/MCTargetDesc
diff --git a/gnu/usr.bin/clang/libLLVMX86Disassembler/Makefile b/gnu/usr.bin/clang/libLLVMX86Disassembler/Makefile
index 90e82767fe9..51684603fb8 100644
--- a/gnu/usr.bin/clang/libLLVMX86Disassembler/Makefile
+++ b/gnu/usr.bin/clang/libLLVMX86Disassembler/Makefile
@@ -1,11 +1,10 @@
-# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:42 jsg Exp $
+# $OpenBSD: Makefile,v 1.4 2020/08/03 14:45:28 patrick Exp $
 
 LIB=	LLVMX86Disassembler
 NOPROFILE=
 
 CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/X86 -I${LLVM_SRCS}/lib/Target/X86
 
-SRCS+=	X86Disassembler.cpp \
-	X86DisassemblerDecoder.cpp
+SRCS+=	X86Disassembler.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Target/X86/Disassembler
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Target/X86/Disassembler
diff --git a/gnu/usr.bin/clang/libLLVMX86Info/Makefile b/gnu/usr.bin/clang/libLLVMX86Info/Makefile
index d691206a30a..ac8f04f317c 100644
--- a/gnu/usr.bin/clang/libLLVMX86Info/Makefile
+++ b/gnu/usr.bin/clang/libLLVMX86Info/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:42 jsg Exp $
+# $OpenBSD: Makefile,v 1.4 2020/08/03 14:45:28 patrick Exp $
 
 LIB=	LLVMX86Info
 NOPROFILE=
@@ -7,4 +7,4 @@ CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/X86 -I${LLVM_SRCS}/lib/Target/X86
 
 SRCS+=	X86TargetInfo.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Target/X86/TargetInfo
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Target/X86/TargetInfo
diff --git a/gnu/usr.bin/clang/libLLVMX86Utils/Makefile b/gnu/usr.bin/clang/libLLVMX86Utils/Makefile
index 4b896dbd977..6ab5a93b4d8 100644
--- a/gnu/usr.bin/clang/libLLVMX86Utils/Makefile
+++ b/gnu/usr.bin/clang/libLLVMX86Utils/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:42 jsg Exp $
+# $OpenBSD: Makefile,v 1.4 2020/08/03 14:45:28 patrick Exp $
 
 LIB=	LLVMX86Utils
 NOPROFILE=
@@ -7,4 +7,4 @@ CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/X86 -I${LLVM_SRCS}/lib/Target/X86
 
 SRCS+=	X86ShuffleDecode.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Target/X86/Utils
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Target/X86/Utils
diff --git a/gnu/usr.bin/clang/libLLVMipo/Makefile b/gnu/usr.bin/clang/libLLVMipo/Makefile
index 3a96705571f..4f72c942db1 100644
--- a/gnu/usr.bin/clang/libLLVMipo/Makefile
+++ b/gnu/usr.bin/clang/libLLVMipo/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2019/06/23 22:07:41 patrick Exp $
+# $OpenBSD: Makefile,v 1.12 2020/08/03 14:45:28 patrick Exp $
 
 LIB=	LLVMipo
 NOPROFILE=
@@ -8,6 +8,7 @@ CPPFLAGS+=	-I${LLVM_SRCS}/include/llvm/Transforms/IPO
 
 SRCS+=	ArgumentPromotion.cpp \
 	AlwaysInliner.cpp \
+	Attributor.cpp \
 	BarrierNoopPass.cpp \
 	BlockExtractor.cpp \
 	CalledValuePropagation.cpp \
@@ -46,6 +47,6 @@ SRCS+=	ArgumentPromotion.cpp \
 ipoSCCP.cpp:
 	ln -s ${LLVM_SRCS}/lib/Transforms/IPO/SCCP.cpp $@
 
-.PATH:	${.CURDIR}/../../../llvm/lib/Transforms/IPO
+.PATH:	${.CURDIR}/../../../llvm/llvm/lib/Transforms/IPO
 
 CLEANFILES+= ipoSCCP.cpp
diff --git a/gnu/usr.bin/clang/libclangAST/Makefile b/gnu/usr.bin/clang/libclangAST/Makefile
index fed962c137f..3a05ca54a6f 100644
--- a/gnu/usr.bin/clang/libclangAST/Makefile
+++ b/gnu/usr.bin/clang/libclangAST/Makefile
@@ -1,13 +1,15 @@
-# $OpenBSD: Makefile,v 1.7 2019/06/23 22:07:41 patrick Exp $
+# $OpenBSD: Makefile,v 1.8 2020/08/03 14:45:28 patrick Exp $
 
 LIB=	clangAST
 NOPIC=
 NOPROFILE=
 
-CPPFLAGS+=	${CLANG_INCLUDES}
+CPPFLAGS+=	-I${.OBJDIR}/../include/clang/AST \
+		${CLANG_INCLUDES}
 
 .include <bsd.own.mk>
 SRCS=	APValue.cpp \
+	ASTConcept.cpp \
 	ASTConsumer.cpp \
 	ASTContext.cpp \
 	ASTDiagnostic.cpp \
@@ -37,6 +39,7 @@ SRCS=	APValue.cpp \
 	DeclTemplate.cpp \
 	Expr.cpp \
 	ExprClassification.cpp \
+	ExprConcepts.cpp \
 	ExprConstant.cpp \
 	ExprCXX.cpp \
 	ExprObjC.cpp \
@@ -46,6 +49,7 @@ SRCS=	APValue.cpp \
 	InheritViz.cpp \
 	ItaniumCXXABI.cpp \
 	ItaniumMangle.cpp \
+	JSONNodeDumper.cpp \
 	Mangle.cpp \
 	MicrosoftCXXABI.cpp \
 	MicrosoftMangle.cpp \
@@ -77,9 +81,31 @@ SRCS=	APValue.cpp \
 	TypeLoc.cpp \
 	TypePrinter.cpp \
 	VTableBuilder.cpp \
-	VTTBuilder.cpp
+	VTTBuilder.cpp \
+	Block.cpp \
+	ByteCodeEmitter.cpp \
+	ByteCodeExprGen.cpp \
+	ByteCodeGenError.cpp \
+	ByteCodeStmtGen.cpp \
+	Context.cpp \
+	Descriptor.cpp \
+	Disasm.cpp \
+	EvalEmitter.cpp \
+	Frame.cpp \
+	Function.cpp \
+	Interp.cpp \
+	InterpFrame.cpp \
+	InterpStack.cpp \
+	InterpState.cpp \
+	Pointer.cpp \
+	PrimType.cpp \
+	Program.cpp \
+	Record.cpp \
+	Source.cpp \
+	State.cpp \
 
-.PATH:	${.CURDIR}/../../../llvm/tools/clang/lib/AST
+.PATH:	${.CURDIR}/../../../llvm/clang/lib/AST
+.PATH:	${.CURDIR}/../../../llvm/clang/lib/AST/Interp
 
 install:
 	@# Nothing here so far ...
diff --git a/gnu/usr.bin/clang/libclangAnalysis/Makefile b/gnu/usr.bin/clang/libclangAnalysis/Makefile
index 6b09cea8956..203d0dcac72 100644
--- a/gnu/usr.bin/clang/libclangAnalysis/Makefile
+++ b/gnu/usr.bin/clang/libclangAnalysis/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2019/06/23 22:07:42 patrick Exp $
+# $OpenBSD: Makefile,v 1.6 2020/08/03 14:45:28 patrick Exp $
 
 LIB=	clangAnalysis
 NOPIC=
@@ -21,16 +21,18 @@ SRCS=	AnalysisDeclContext.cpp \
 	ExprMutationAnalyzer.cpp \
 	LiveVariables.cpp \
 	ObjCNoReturn.cpp \
+	PathDiagnostic.cpp \
 	PostOrderCFGView.cpp \
 	ProgramPoint.cpp \
 	ReachableCode.cpp \
+	RetainSummaryManager.cpp \
 	ThreadSafety.cpp \
 	ThreadSafetyCommon.cpp \
 	ThreadSafetyLogical.cpp \
 	ThreadSafetyTIL.cpp \
 	UninitializedValues.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/tools/clang/lib/Analysis
+.PATH:	${.CURDIR}/../../../llvm/clang/lib/Analysis
 
 install:
 	@# Nothing here so far ...
diff --git a/gnu/usr.bin/clang/libclangBasic/Makefile b/gnu/usr.bin/clang/libclangBasic/Makefile
index 478234025b4..9a272a0ef08 100644
--- a/gnu/usr.bin/clang/libclangBasic/Makefile
+++ b/gnu/usr.bin/clang/libclangBasic/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.7 2019/06/23 22:07:42 patrick Exp $
+# $OpenBSD: Makefile,v 1.8 2020/08/03 14:45:28 patrick Exp $
 
 LIB=	clangBasic
 NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	${CLANG_INCLUDES}
-CPPFLAGS+=	-I${LLVM_SRCS}/tools/clang/lib/Basic
+CPPFLAGS+=	-I${CLANG_SRCS}/lib/Basic
 
 .include <bsd.own.mk>
 SRCS=	Attributes.cpp \
@@ -21,7 +21,7 @@ SRCS=	Attributes.cpp \
 	FixedPoint.cpp \
 	IdentifierTable.cpp \
 	LangOptions.cpp \
-	MemoryBufferCache.cpp \
+	LangStandards.cpp \
 	Module.cpp \
 	ObjCRuntime.cpp \
 	OpenMPKinds.cpp \
@@ -31,6 +31,7 @@ SRCS=	Attributes.cpp \
 	Sanitizers.cpp \
 	SourceLocation.cpp \
 	SourceManager.cpp \
+	Stack.cpp \
 	TargetInfo.cpp \
 	Targets.cpp \
 	TokenKinds.cpp \
@@ -39,7 +40,7 @@ SRCS=	Attributes.cpp \
 	XRayInstr.cpp \
 	XRayLists.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/tools/clang/lib/Basic
+.PATH:	${.CURDIR}/../../../llvm/clang/lib/Basic
 
 install:
 	@# Nothing here so far ...
diff --git a/gnu/usr.bin/clang/libclangBasicTargets/Makefile b/gnu/usr.bin/clang/libclangBasicTargets/Makefile
index 28e42dc49b0..b9f171883ce 100644
--- a/gnu/usr.bin/clang/libclangBasicTargets/Makefile
+++ b/gnu/usr.bin/clang/libclangBasicTargets/Makefile
@@ -1,12 +1,12 @@
-# $OpenBSD: Makefile,v 1.3 2019/06/23 22:07:42 patrick Exp $
+# $OpenBSD: Makefile,v 1.4 2020/08/03 14:45:28 patrick Exp $
 
 LIB=	clangBasicTargets
 NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	${CLANG_INCLUDES}
-CPPFLAGS+=	-I${LLVM_SRCS}/tools/clang/lib/Basic
-CPPFLAGS+=	-I${LLVM_SRCS}/tools/clang/lib/Basic/Targets
+CPPFLAGS+=	-I${CLANG_SRCS}/lib/Basic
+CPPFLAGS+=	-I${CLANG_SRCS}/lib/Basic/Targets
 
 .include <bsd.own.mk>
 SRCS=	AArch64.cpp \
@@ -33,7 +33,7 @@ SRCS=	AArch64.cpp \
 	X86.cpp \
 	XCore.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/tools/clang/lib/Basic/Targets
+.PATH:	${.CURDIR}/../../../llvm/clang/lib/Basic/Targets
 
 install:
 	@# Nothing here so far ...
diff --git a/gnu/usr.bin/clang/libclangCodeGen/Makefile b/gnu/usr.bin/clang/libclangCodeGen/Makefile
index 2ee877f8093..157759fb05f 100644
--- a/gnu/usr.bin/clang/libclangCodeGen/Makefile
+++ b/gnu/usr.bin/clang/libclangCodeGen/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2019/01/27 16:59:42 patrick Exp $
+# $OpenBSD: Makefile,v 1.7 2020/08/03 14:45:28 patrick Exp $
 
 LIB=	clangCodeGen
 NOPIC=
@@ -58,12 +58,13 @@ SRCS=	BackendUtil.cpp \
 	MicrosoftCXXABI.cpp \
 	ModuleBuilder.cpp \
 	ObjectFilePCHContainerOperations.cpp \
+	PatternInit.cpp \
 	SanitizerMetadata.cpp \
 	SwiftCallingConv.cpp \
 	TargetInfo.cpp \
 	VarBypassDetector.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/tools/clang/lib/CodeGen
+.PATH:	${.CURDIR}/../../../llvm/clang/lib/CodeGen
 
 install:
 	@# Nothing here so far ...
diff --git a/gnu/usr.bin/clang/libclangDriver/Makefile b/gnu/usr.bin/clang/libclangDriver/Makefile
index 86dec33f497..1059e06486b 100644
--- a/gnu/usr.bin/clang/libclangDriver/Makefile
+++ b/gnu/usr.bin/clang/libclangDriver/Makefile
@@ -1,14 +1,15 @@
-# $OpenBSD: Makefile,v 1.7 2019/06/23 22:07:42 patrick Exp $
+# $OpenBSD: Makefile,v 1.8 2020/08/03 14:45:28 patrick Exp $
 
 LIB=	clangDriver
 NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	${CLANG_INCLUDES}
-CPPFLAGS+=	-I${LLVM_SRCS}/tools/clang/lib/Driver
+CPPFLAGS+=	-I${CLANG_SRCS}/lib/Driver
 
 .include <bsd.own.mk>
-SRCS=	AMDGPU.cpp \
+SRCS=	AIX.cpp \
+	AMDGPU.cpp \
 	AVR.cpp \
 	Action.cpp \
 	Ananas.cpp \
@@ -26,6 +27,7 @@ SRCS=	AMDGPU.cpp \
 	DragonFly.cpp \
 	Driver.cpp \
 	DriverOptions.cpp \
+	Flang.cpp \
 	FreeBSD.cpp \
 	Fuchsia.cpp \
 	Gnu.cpp \
@@ -33,6 +35,7 @@ SRCS=	AMDGPU.cpp \
 	Haiku.cpp \
 	Hexagon.cpp \
 	Hurd.cpp \
+	InterfaceStubs.cpp \
 	Job.cpp \
 	Linux.cpp \
 	MSP430.cpp \
@@ -45,6 +48,8 @@ SRCS=	AMDGPU.cpp \
 	NaCl.cpp \
 	NetBSD.cpp \
 	OpenBSD.cpp \
+	OptionUtils.cpp \
+	PPCLinux.cpp \
 	PS4CPU.cpp \
 	Phases.cpp \
 	RISCVToolchain.cpp \
@@ -58,8 +63,8 @@ SRCS=	AMDGPU.cpp \
 	XCore.cpp \
 	XRayArgs.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/tools/clang/lib/Driver
-.PATH:	${.CURDIR}/../../../llvm/tools/clang/lib/Driver/ToolChains
+.PATH:	${.CURDIR}/../../../llvm/clang/lib/Driver
+.PATH:	${.CURDIR}/../../../llvm/clang/lib/Driver/ToolChains
 
 install:
 	@# Nothing here so far ...
diff --git a/gnu/usr.bin/clang/libclangDriverArch/Makefile b/gnu/usr.bin/clang/libclangDriverArch/Makefile
index e3c27ab51a5..8a7ebc03e30 100644
--- a/gnu/usr.bin/clang/libclangDriverArch/Makefile
+++ b/gnu/usr.bin/clang/libclangDriverArch/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.1 2019/01/27 16:59:42 patrick Exp $
+# $OpenBSD: Makefile,v 1.2 2020/08/03 14:45:28 patrick Exp $
 
 LIB=	clangDriverArch
 NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	${CLANG_INCLUDES}
-CPPFLAGS+=	-I${LLVM_SRCS}/tools/clang/lib/Driver
+CPPFLAGS+=	-I${CLANG_SRCS}/lib/Driver
 
 .include <bsd.own.mk>
 SRCS=	AArch64.cpp \
@@ -17,7 +17,7 @@ SRCS=	AArch64.cpp \
 	SystemZ.cpp \
 	X86.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/tools/clang/lib/Driver/ToolChains/Arch
+.PATH:	${.CURDIR}/../../../llvm/clang/lib/Driver/ToolChains/Arch
 
 install:
 	@# Nothing here so far ...
diff --git a/gnu/usr.bin/clang/libclangEdit/Makefile b/gnu/usr.bin/clang/libclangEdit/Makefile
index ea336da0231..3d7bc5b4e64 100644
--- a/gnu/usr.bin/clang/libclangEdit/Makefile
+++ b/gnu/usr.bin/clang/libclangEdit/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2017/07/09 15:28:36 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2020/08/03 14:45:28 patrick Exp $
 
 LIB=	clangEdit
 NOPIC=
@@ -11,7 +11,7 @@ SRCS=	Commit.cpp \
 	EditedSource.cpp \
 	RewriteObjCFoundationAPI.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/tools/clang/lib/Edit
+.PATH:	${.CURDIR}/../../../llvm/clang/lib/Edit
 
 install:
 	@# Nothing here so far ...
diff --git a/gnu/usr.bin/clang/libclangFrontend/Makefile b/gnu/usr.bin/clang/libclangFrontend/Makefile
index df3e3c0b9de..2dd31f249e4 100644
--- a/gnu/usr.bin/clang/libclangFrontend/Makefile
+++ b/gnu/usr.bin/clang/libclangFrontend/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2019/06/23 22:07:42 patrick Exp $
+# $OpenBSD: Makefile,v 1.6 2020/08/03 14:45:29 patrick Exp $
 
 LIB=	clangFrontend
 NOPIC=
@@ -25,7 +25,7 @@ SRCS=	ASTConsumers.cpp \
 	HeaderIncludeGen.cpp \
 	InitHeaderSearch.cpp \
 	InitPreprocessor.cpp \
-	LangStandards.cpp \
+	InterfaceStubFunctionsConsumer.cpp \
 	LayoutOverrideSource.cpp \
 	LogDiagnosticPrinter.cpp \
 	ModuleDependencyCollector.cpp \
@@ -40,7 +40,7 @@ SRCS=	ASTConsumers.cpp \
 	TextDiagnosticPrinter.cpp \
 	VerifyDiagnosticConsumer.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/tools/clang/lib/Frontend
+.PATH:	${.CURDIR}/../../../llvm/clang/lib/Frontend
 
 install:
 	@# Nothing here so far ...
diff --git a/gnu/usr.bin/clang/libclangFrontendTool/Makefile b/gnu/usr.bin/clang/libclangFrontendTool/Makefile
index c5dcaa9fc13..7b35b901f26 100644
--- a/gnu/usr.bin/clang/libclangFrontendTool/Makefile
+++ b/gnu/usr.bin/clang/libclangFrontendTool/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2017/07/09 15:28:36 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2020/08/03 14:45:29 patrick Exp $
 
 LIB=	clangFrontendTool
 NOPIC=
@@ -9,7 +9,7 @@ CPPFLAGS+=	${CLANG_INCLUDES}
 .include <bsd.own.mk>
 SRCS=	ExecuteCompilerInvocation.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/tools/clang/lib/FrontendTool
+.PATH:	${.CURDIR}/../../../llvm/clang/lib/FrontendTool
 
 install:
 	@# Nothing here so far ...
diff --git a/gnu/usr.bin/clang/libclangLex/Makefile b/gnu/usr.bin/clang/libclangLex/Makefile
index a1149a31184..a491021b895 100644
--- a/gnu/usr.bin/clang/libclangLex/Makefile
+++ b/gnu/usr.bin/clang/libclangLex/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2019/06/23 22:07:42 patrick Exp $
+# $OpenBSD: Makefile,v 1.4 2020/08/03 14:45:29 patrick Exp $
 
 LIB=	clangLex
 NOPIC=
@@ -7,7 +7,8 @@ NOPROFILE=
 CPPFLAGS+=	${CLANG_INCLUDES}
 
 .include <bsd.own.mk>
-SRCS=	HeaderMap.cpp \
+SRCS=	DependencyDirectivesSourceMinimizer.cpp \
+	HeaderMap.cpp \
 	HeaderSearch.cpp \
 	Lexer.cpp \
 	LiteralSupport.cpp \
@@ -29,7 +30,7 @@ SRCS=	HeaderMap.cpp \
 	TokenConcatenation.cpp \
 	TokenLexer.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/tools/clang/lib/Lex
+.PATH:	${.CURDIR}/../../../llvm/clang/lib/Lex
 
 install:
 	@# Nothing here so far ...
diff --git a/gnu/usr.bin/clang/libclangParse/Makefile b/gnu/usr.bin/clang/libclangParse/Makefile
index e72f40d5bc3..602cd3f8af6 100644
--- a/gnu/usr.bin/clang/libclangParse/Makefile
+++ b/gnu/usr.bin/clang/libclangParse/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2017/07/09 15:28:36 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2020/08/03 14:45:29 patrick Exp $
 
 LIB=	clangParse
 NOPIC=
@@ -23,7 +23,7 @@ SRCS=	ParseAST.cpp \
 	ParseTentative.cpp \
 	Parser.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/tools/clang/lib/Parse
+.PATH:	${.CURDIR}/../../../llvm/clang/lib/Parse
 
 install:
 	@# Nothing here so far ...
diff --git a/gnu/usr.bin/clang/libclangRewrite/Makefile b/gnu/usr.bin/clang/libclangRewrite/Makefile
index 150e373ed7b..0569d5e031f 100644
--- a/gnu/usr.bin/clang/libclangRewrite/Makefile
+++ b/gnu/usr.bin/clang/libclangRewrite/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2017/07/09 15:28:36 espie Exp $
+# $OpenBSD: Makefile,v 1.4 2020/08/03 14:45:29 patrick Exp $
 
 LIB=	clangRewrite
 NOPIC=
@@ -13,7 +13,7 @@ SRCS=	DeltaTree.cpp \
 	Rewriter.cpp \
 	TokenRewriter.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/tools/clang/lib/Rewrite
+.PATH:	${.CURDIR}/../../../llvm/clang/lib/Rewrite
 
 install:
 	@# Nothing here so far ...
diff --git a/gnu/usr.bin/clang/libclangRewriteFrontend/Makefile b/gnu/usr.bin/clang/libclangRewriteFrontend/Makefile
index 91bc3f5dd4f..43867dbe3f2 100644
--- a/gnu/usr.bin/clang/libclangRewriteFrontend/Makefile
+++ b/gnu/usr.bin/clang/libclangRewriteFrontend/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2017/07/09 15:28:36 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2020/08/03 14:45:29 patrick Exp $
 
 LIB=	clangRewriteFrontend
 NOPIC=
@@ -16,7 +16,7 @@ SRCS=	FixItRewriter.cpp \
 	RewriteObjC.cpp \
 	RewriteTest.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/tools/clang/lib/Frontend/Rewrite
+.PATH:	${.CURDIR}/../../../llvm/clang/lib/Frontend/Rewrite
 
 install:
 	@# Nothing here so far ...
diff --git a/gnu/usr.bin/clang/libclangSema/Makefile b/gnu/usr.bin/clang/libclangSema/Makefile
index 7fa951f1358..d0e8f2b2a4b 100644
--- a/gnu/usr.bin/clang/libclangSema/Makefile
+++ b/gnu/usr.bin/clang/libclangSema/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.3 2019/01/27 16:59:42 patrick Exp $
+# $OpenBSD: Makefile,v 1.4 2020/08/03 14:45:29 patrick Exp $
 
 LIB=	clangSema
 NOPIC=
 NOPROFILE=
 
-CPPFLAGS+=	${CLANG_INCLUDES}
+CPPFLAGS+=	-I${.OBJDIR}/../include/clang/Sema \
+		${CLANG_INCLUDES}
 
 .include <bsd.own.mk>
 SRCS=	AnalysisBasedWarnings.cpp \
@@ -24,6 +25,7 @@ SRCS=	AnalysisBasedWarnings.cpp \
 	SemaCast.cpp \
 	SemaChecking.cpp \
 	SemaCodeComplete.cpp \
+	SemaConcept.cpp \
 	SemaConsumer.cpp \
 	SemaCoroutine.cpp \
 	SemaCUDA.cpp \
@@ -40,6 +42,7 @@ SRCS=	AnalysisBasedWarnings.cpp \
 	SemaInit.cpp \
 	SemaLambda.cpp \
 	SemaLookup.cpp \
+	SemaModule.cpp \
 	SemaObjCProperty.cpp \
 	SemaOpenMP.cpp \
 	SemaOverload.cpp \
@@ -55,7 +58,7 @@ SRCS=	AnalysisBasedWarnings.cpp \
 	SemaType.cpp \
 	TypeLocBuilder.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/tools/clang/lib/Sema
+.PATH:	${.CURDIR}/../../../llvm/clang/lib/Sema
 
 install:
 	@# Nothing here so far ...
diff --git a/gnu/usr.bin/clang/libclangSerialization/Makefile b/gnu/usr.bin/clang/libclangSerialization/Makefile
index 4162db20bee..c02639e72a4 100644
--- a/gnu/usr.bin/clang/libclangSerialization/Makefile
+++ b/gnu/usr.bin/clang/libclangSerialization/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2019/06/23 22:07:42 patrick Exp $
+# $OpenBSD: Makefile,v 1.4 2020/08/03 14:45:29 patrick Exp $
 
 LIB=	clangSerialization
 NOPIC=
@@ -16,12 +16,13 @@ SRCS=	ASTCommon.cpp \
 	ASTWriterStmt.cpp \
 	GeneratePCH.cpp \
 	GlobalModuleIndex.cpp \
-	Module.cpp \
+	InMemoryModuleCache.cpp \
+	ModuleFile.cpp \
 	ModuleFileExtension.cpp \
 	ModuleManager.cpp \
 	PCHContainerOperations.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/tools/clang/lib/Serialization
+.PATH:	${.CURDIR}/../../../llvm/clang/lib/Serialization
 
 install:
 	@# Nothing here so far ...
diff --git a/gnu/usr.bin/clang/liblldCommon/Makefile b/gnu/usr.bin/clang/liblldCommon/Makefile
index 3b329ace8cd..b7315d6d2c7 100644
--- a/gnu/usr.bin/clang/liblldCommon/Makefile
+++ b/gnu/usr.bin/clang/liblldCommon/Makefile
@@ -1,13 +1,15 @@
-# $OpenBSD: Makefile,v 1.1 2018/04/06 14:44:04 patrick Exp $
+# $OpenBSD: Makefile,v 1.2 2020/08/03 14:45:29 patrick Exp $
 
 LIB=	lldCommon
 NOPROFILE=
 
-CPPFLAGS+=	-I${LLVM_SRCS}/tools/lld/include
+CPPFLAGS+=	-I${LLD_SRCS}/include
 
 .include <bsd.own.mk>
 SRCS=	Args.cpp \
+	DWARF.cpp \
 	ErrorHandler.cpp \
+	Filesystem.cpp \
 	Memory.cpp \
 	Reproduce.cpp \
 	Strings.cpp \
@@ -15,7 +17,7 @@ SRCS=	Args.cpp \
 	Threads.cpp \
 	Version.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/tools/lld/Common
+.PATH:	${.CURDIR}/../../../llvm/lld/Common
 
 install:
 	@# Nothing here so far ...
diff --git a/gnu/usr.bin/clang/liblldCore/Makefile b/gnu/usr.bin/clang/liblldCore/Makefile
index 50beb291cc8..a776e472729 100644
--- a/gnu/usr.bin/clang/liblldCore/Makefile
+++ b/gnu/usr.bin/clang/liblldCore/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.5 2018/04/06 14:44:04 patrick Exp $
+# $OpenBSD: Makefile,v 1.6 2020/08/03 14:45:29 patrick Exp $
 
 LIB=	lldCore
 NOPROFILE=
 
-CPPFLAGS+=	-I${LLVM_SRCS}/tools/lld/include
+CPPFLAGS+=	-I${LLD_SRCS}/include
 
 .include <bsd.own.mk>
 SRCS=	DefinedAtom.cpp \
@@ -15,7 +15,7 @@ SRCS=	DefinedAtom.cpp \
 	SymbolTable.cpp \
 	Writer.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/tools/lld/lib/Core
+.PATH:	${.CURDIR}/../../../llvm/lld/lib/Core
 
 install:
 	@# Nothing here so far ...
diff --git a/gnu/usr.bin/clang/liblldELF/Makefile b/gnu/usr.bin/clang/liblldELF/Makefile
index e1e20d9a609..651df96614b 100644
--- a/gnu/usr.bin/clang/liblldELF/Makefile
+++ b/gnu/usr.bin/clang/liblldELF/Makefile
@@ -1,23 +1,24 @@
-# $OpenBSD: Makefile,v 1.7 2019/06/23 22:07:42 patrick Exp $
+# $OpenBSD: Makefile,v 1.8 2020/08/03 14:45:29 patrick Exp $
 
 LIB=	lldELF
 NOPROFILE=
 
-CPPFLAGS+=	-I${LLVM_SRCS}/tools/lld/include
-CPPFLAGS+=	-I${LLVM_SRCS}/tools/lld/ELF
+CPPFLAGS+=	-I${.OBJDIR}/../include/lld/ELF
+CPPFLAGS+=	-I${LLD_SRCS}/include
+CPPFLAGS+=	-I${LLD_SRCS}/ELF
 
 .include <bsd.own.mk>
 SRCS=	AArch64.cpp \
 	AArch64ErrataFix.cpp \
 	AMDGPU.cpp \
 	ARM.cpp \
+	ARMErrataFix.cpp \
 	AVR.cpp \
 	CallGraphSort.cpp \
 	DWARF.cpp \
 	Driver.cpp \
 	DriverUtils.cpp \
 	EhFrame.cpp \
-	Filesystem.cpp \
 	Hexagon.cpp \
 	ICF.cpp \
 	InputFiles.cpp \
@@ -46,15 +47,8 @@ SRCS=	AArch64.cpp \
 	X86.cpp \
 	X86_64.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/tools/lld/ELF
-.PATH:	${.CURDIR}/../../../llvm/tools/lld/ELF/Arch
-
-Driver.o: Options.inc
-
-Options.inc: Options.td
-	${.OBJDIR}/../llvm-tblgen/llvm-tblgen -gen-opt-parser-defs \
-		-I ${LLVM_SRCS}/include \
-		-o ${.TARGET} ${.ALLSRC}
+.PATH:	${.CURDIR}/../../../llvm/lld/ELF
+.PATH:	${.CURDIR}/../../../llvm/lld/ELF/Arch
 
 install:
 	@# Nothing here so far ...
diff --git a/gnu/usr.bin/clang/liblldbABI/Makefile b/gnu/usr.bin/clang/liblldbABI/Makefile
index d2f5812e1a6..2b19004cf60 100644
--- a/gnu/usr.bin/clang/liblldbABI/Makefile
+++ b/gnu/usr.bin/clang/liblldbABI/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2018/10/04 11:43:29 patrick Exp $
+# $OpenBSD: Makefile,v 1.2 2020/08/03 14:45:29 patrick Exp $
 
 LIB=	lldbABI
 NOPIC=
@@ -19,20 +19,22 @@ SRCS=	ABIMacOSX_arm.cpp \
 	ABISysV_ppc64.cpp \
 	ABISysV_s390x.cpp \
 	ABISysV_x86_64.cpp \
+	ABIWindows_x86_64.cpp \
 
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/ABI/MacOSX-arm
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/ABI/MacOSX-arm64
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/ABI/MacOSX-i386
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/ABI/SysV-arm
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/ABI/SysV-arm64
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/ABI/SysV-hexagon
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/ABI/SysV-i386
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/ABI/SysV-mips
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/ABI/SysV-mips64
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/ABI/SysV-ppc
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/ABI/SysV-ppc64
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/ABI/SysV-s390x
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/ABI/SysV-x86_64
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/ABI/MacOSX-arm
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/ABI/MacOSX-arm64
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/ABI/MacOSX-i386
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/ABI/SysV-arm
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/ABI/SysV-arm64
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/ABI/SysV-hexagon
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/ABI/SysV-i386
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/ABI/SysV-mips
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/ABI/SysV-mips64
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/ABI/SysV-ppc
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/ABI/SysV-ppc64
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/ABI/SysV-s390x
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/ABI/SysV-x86_64
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/ABI/Windows-x86_64
 
 install:
 	@# Nothing here so far ...
diff --git a/gnu/usr.bin/clang/liblldbAPI/Makefile b/gnu/usr.bin/clang/liblldbAPI/Makefile
index 423a494463e..e6e6292adb4 100644
--- a/gnu/usr.bin/clang/liblldbAPI/Makefile
+++ b/gnu/usr.bin/clang/liblldbAPI/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2019/06/23 22:07:42 patrick Exp $
+# $OpenBSD: Makefile,v 1.3 2020/08/03 14:45:29 patrick Exp $
 
 LIB=	lldbAPI
 NOPIC=
@@ -25,12 +25,12 @@ SRCS=	SBAddress.cpp \
 	SBEvent.cpp \
 	SBExecutionContext.cpp \
 	SBExpressionOptions.cpp \
+	SBFile.cpp \
 	SBFileSpec.cpp \
 	SBFileSpecList.cpp \
 	SBFrame.cpp \
 	SBFunction.cpp \
 	SBHostOS.cpp \
-	SBInitializerOptions.cpp \
 	SBInstruction.cpp \
 	SBInstructionList.cpp \
 	SBLanguageRuntime.cpp \
@@ -46,6 +46,7 @@ SRCS=	SBAddress.cpp \
 	SBProcessInfo.cpp \
 	SBQueue.cpp \
 	SBQueueItem.cpp \
+	SBReproducer.cpp \
 	SBSection.cpp \
 	SBSourceManager.cpp \
 	SBStream.cpp \
@@ -75,7 +76,7 @@ SRCS=	SBAddress.cpp \
 	SBWatchpoint.cpp \
 	SystemInitializerFull.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/API
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/API
 
 install:
 	@# Nothing here so far ...
diff --git a/gnu/usr.bin/clang/liblldbBreakpoint/Makefile b/gnu/usr.bin/clang/liblldbBreakpoint/Makefile
index 807e312002a..82b3e3d3ad0 100644
--- a/gnu/usr.bin/clang/liblldbBreakpoint/Makefile
+++ b/gnu/usr.bin/clang/liblldbBreakpoint/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2019/06/23 22:07:43 patrick Exp $
+# $OpenBSD: Makefile,v 1.3 2020/08/03 14:45:29 patrick Exp $
 
 LIB=	lldbBreakpoint
 NOPIC=
@@ -15,6 +15,7 @@ SRCS=	Breakpoint.cpp \
 	BreakpointLocationList.cpp \
 	BreakpointName.cpp \
 	BreakpointOptions.cpp \
+	BreakpointPrecondition.cpp \
 	BreakpointResolver.cpp \
 	BreakpointResolverAddress.cpp \
 	BreakpointResolverFileLine.cpp \
@@ -30,7 +31,7 @@ SRCS=	Breakpoint.cpp \
 	WatchpointList.cpp \
 	WatchpointOptions.cpp \
 
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Breakpoint
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Breakpoint
 
 install:
 	@# Nothing here so far ...
diff --git a/gnu/usr.bin/clang/liblldbCommands/Makefile b/gnu/usr.bin/clang/liblldbCommands/Makefile
index a31b016264f..c06813a3e05 100644
--- a/gnu/usr.bin/clang/liblldbCommands/Makefile
+++ b/gnu/usr.bin/clang/liblldbCommands/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2019/06/23 22:07:43 patrick Exp $
+# $OpenBSD: Makefile,v 1.4 2020/08/03 14:45:29 patrick Exp $
 
 LIB=	lldbCommands
 NOPIC=
@@ -10,7 +10,6 @@ SRCS=	CommandCompletions.cpp \
 	CommandObjectApropos.cpp \
 	CommandObjectBreakpoint.cpp \
 	CommandObjectBreakpointCommand.cpp \
-	CommandObjectBugreport.cpp \
 	CommandObjectCommands.cpp \
 	CommandObjectDisassemble.cpp \
 	CommandObjectExpression.cpp \
@@ -37,7 +36,7 @@ SRCS=	CommandCompletions.cpp \
 	CommandObjectWatchpointCommand.cpp \
 	CommandObjectLanguage.cpp \
 
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Commands
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Commands
 
 install:
 	@# Nothing here so far ...
@@ -46,3 +45,4 @@ install:
 
 CPPFLAGS+=	${LLDB_INCLUDES}
 CPPFLAGS+=	${CLANG_INCLUDES}
+CPPFLAGS+=	-I${.OBJDIR}/../include/lldb/Commands
diff --git a/gnu/usr.bin/clang/liblldbCore/Makefile b/gnu/usr.bin/clang/liblldbCore/Makefile
index 5449c726af1..b8634f8491e 100644
--- a/gnu/usr.bin/clang/liblldbCore/Makefile
+++ b/gnu/usr.bin/clang/liblldbCore/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2019/06/23 22:07:43 patrick Exp $
+# $OpenBSD: Makefile,v 1.4 2020/08/03 14:45:29 patrick Exp $
 
 LIB=	lldbCore
 NOPIC=
@@ -22,6 +22,7 @@ SRCS=	Address.cpp \
 	FormatEntity.cpp \
 	Highlighter.cpp \
 	IOHandler.cpp \
+	IOHandlerCursesGUI.cpp \
 	Mangled.cpp \
 	Module.cpp \
 	ModuleChild.cpp \
@@ -50,7 +51,7 @@ SRCS=	Address.cpp \
 	ValueObjectSyntheticFilter.cpp \
 	ValueObjectVariable.cpp \
 
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Core
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Core
 
 install:
 	@# Nothing here so far ...
@@ -59,3 +60,4 @@ install:
 
 CPPFLAGS+=	${LLDB_INCLUDES}
 CPPFLAGS+=	${CLANG_INCLUDES}
+CPPFLAGS+=	-I${.OBJDIR}/../include/lldb/Core
diff --git a/gnu/usr.bin/clang/liblldbDataFormatters/Makefile b/gnu/usr.bin/clang/liblldbDataFormatters/Makefile
index 4b3535ccd34..68e3521db8a 100644
--- a/gnu/usr.bin/clang/liblldbDataFormatters/Makefile
+++ b/gnu/usr.bin/clang/liblldbDataFormatters/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2018/10/04 11:43:29 patrick Exp $
+# $OpenBSD: Makefile,v 1.2 2020/08/03 14:45:29 patrick Exp $
 
 LIB=	lldbDataFormatters
 NOPIC=
@@ -19,11 +19,10 @@ SRCS=	CXXFunctionPointer.cpp \
 	TypeFormat.cpp \
 	TypeSummary.cpp \
 	TypeSynthetic.cpp \
-	TypeValidator.cpp \
 	ValueObjectPrinter.cpp \
 	VectorType.cpp \
 
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/DataFormatters
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/DataFormatters
 
 install:
 	@# Nothing here so far ...
diff --git a/gnu/usr.bin/clang/liblldbExpression/Makefile b/gnu/usr.bin/clang/liblldbExpression/Makefile
index cec66d0e58c..639da277f75 100644
--- a/gnu/usr.bin/clang/liblldbExpression/Makefile
+++ b/gnu/usr.bin/clang/liblldbExpression/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2018/10/04 11:43:29 patrick Exp $
+# $OpenBSD: Makefile,v 1.2 2020/08/03 14:45:29 patrick Exp $
 
 LIB=	lldbExpression
 NOPIC=
@@ -9,10 +9,8 @@ NOPROFILE=
 SRCS=	DiagnosticManager.cpp \
 	DWARFExpression.cpp \
 	Expression.cpp \
-	ExpressionSourceCode.cpp \
 	ExpressionVariable.cpp \
 	FunctionCaller.cpp \
-	IRDynamicChecks.cpp \
 	IRExecutionUnit.cpp \
 	IRInterpreter.cpp \
 	IRMemoryMap.cpp \
@@ -22,7 +20,7 @@ SRCS=	DiagnosticManager.cpp \
 	UserExpression.cpp \
 	UtilityFunction.cpp \
 
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Expression
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Expression
 
 install:
 	@# Nothing here so far ...
diff --git a/gnu/usr.bin/clang/liblldbHostCommon/Makefile b/gnu/usr.bin/clang/liblldbHostCommon/Makefile
index cfe84d83f49..69e79773255 100644
--- a/gnu/usr.bin/clang/liblldbHostCommon/Makefile
+++ b/gnu/usr.bin/clang/liblldbHostCommon/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2019/06/23 22:07:43 patrick Exp $
+# $OpenBSD: Makefile,v 1.3 2020/08/03 14:45:29 patrick Exp $
 
 LIB=	lldbHostCommon
 NOPIC=
@@ -6,9 +6,10 @@ NOPROFILE=
 
 .include <bsd.own.mk>
 SRCS=	Editline.cpp \
-	File.cpp \
+	FileAction.cpp \
 	FileCache.cpp \
 	FileSystem.cpp \
+	File.cpp \
 	GetOptInc.cpp \
 	Host.cpp \
 	HostInfoBase.cpp \
@@ -16,28 +17,29 @@ SRCS=	Editline.cpp \
 	HostProcess.cpp \
 	HostThread.cpp \
 	LockFileBase.cpp \
+	LZMA.cpp \
 	MainLoop.cpp \
 	MonitoringProcessLauncher.cpp \
-	NativeWatchpointList.cpp \
 	NativeProcessProtocol.cpp \
 	NativeRegisterContext.cpp \
 	NativeThreadProtocol.cpp \
+	NativeWatchpointList.cpp \
 	OptionParser.cpp \
 	PipeBase.cpp \
+	ProcessLaunchInfo.cpp \
 	ProcessRunLock.cpp \
 	PseudoTerminal.cpp \
-	Socket.cpp \
 	SocketAddress.cpp \
+	Socket.cpp \
 	StringConvert.cpp \
-	Symbols.cpp \
 	TaskPool.cpp \
 	TCPSocket.cpp \
 	Terminal.cpp \
 	ThreadLauncher.cpp \
-	XML.cpp \
 	UDPSocket.cpp \
+	XML.cpp \
 
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Host/common
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Host/common
 
 install:
 	@# Nothing here so far ...
diff --git a/gnu/usr.bin/clang/liblldbHostOpenBSD/Makefile b/gnu/usr.bin/clang/liblldbHostOpenBSD/Makefile
index 3f27f3ee5a0..b37f3b23158 100644
--- a/gnu/usr.bin/clang/liblldbHostOpenBSD/Makefile
+++ b/gnu/usr.bin/clang/liblldbHostOpenBSD/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2018/10/04 11:43:29 patrick Exp $
+# $OpenBSD: Makefile,v 1.2 2020/08/03 14:45:29 patrick Exp $
 
 LIB=	lldbHostOpenBSD
 NOPIC=
@@ -9,7 +9,7 @@ NOPROFILE=
 SRCS=	Host.cpp \
 	HostInfoOpenBSD.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Host/openbsd
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Host/openbsd
 
 install:
 	@# Nothing here so far ...
diff --git a/gnu/usr.bin/clang/liblldbHostPOSIX/Makefile b/gnu/usr.bin/clang/liblldbHostPOSIX/Makefile
index 3497ddf0531..0a91f287976 100644
--- a/gnu/usr.bin/clang/liblldbHostPOSIX/Makefile
+++ b/gnu/usr.bin/clang/liblldbHostPOSIX/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2018/10/04 11:43:29 patrick Exp $
+# $OpenBSD: Makefile,v 1.2 2020/08/03 14:45:30 patrick Exp $
 
 LIB=	lldbHostPOSIX
 NOPIC=
@@ -7,7 +7,7 @@ NOPROFILE=
 .include <bsd.own.mk>
 SRCS=	ConnectionFileDescriptorPosix.cpp \
 	DomainSocket.cpp \
-	FileSystem.cpp \
+	FileSystemPosix.cpp \
 	HostInfoPosix.cpp \
 	HostProcessPosix.cpp \
 	HostThreadPosix.cpp \
@@ -15,7 +15,7 @@ SRCS=	ConnectionFileDescriptorPosix.cpp \
 	PipePosix.cpp \
 	ProcessLauncherPosixFork.cpp \
 
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Host/posix
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Host/posix
 
 install:
 	@# Nothing here so far ...
diff --git a/gnu/usr.bin/clang/liblldbInitialization/Makefile b/gnu/usr.bin/clang/liblldbInitialization/Makefile
index 9f96a2cd3ca..1b54426ab3d 100644
--- a/gnu/usr.bin/clang/liblldbInitialization/Makefile
+++ b/gnu/usr.bin/clang/liblldbInitialization/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2018/10/04 11:43:29 patrick Exp $
+# $OpenBSD: Makefile,v 1.2 2020/08/03 14:45:30 patrick Exp $
 
 LIB=	lldbInitialization
 NOPIC=
@@ -9,7 +9,7 @@ SRCS=	SystemInitializerCommon.cpp \
 	SystemInitializer.cpp \
 	SystemLifetimeManager.cpp \
 
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Initialization
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Initialization
 
 install:
 	@# Nothing here so far ...
diff --git a/gnu/usr.bin/clang/liblldbInterpreter/Makefile b/gnu/usr.bin/clang/liblldbInterpreter/Makefile
index 6bd3a612992..b97b4886337 100644
--- a/gnu/usr.bin/clang/liblldbInterpreter/Makefile
+++ b/gnu/usr.bin/clang/liblldbInterpreter/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2019/01/27 16:59:42 patrick Exp $
+# $OpenBSD: Makefile,v 1.3 2020/08/03 14:45:30 patrick Exp $
 
 LIB=	lldbInterpreter
 NOPIC=
@@ -18,6 +18,7 @@ SRCS=	CommandAlias.cpp \
 	OptionGroupBoolean.cpp \
 	OptionGroupFile.cpp \
 	OptionGroupFormat.cpp \
+	OptionGroupPythonClassWithDict.cpp \
 	OptionGroupOutputFile.cpp \
 	OptionGroupPlatform.cpp \
 	OptionGroupString.cpp \
@@ -33,7 +34,7 @@ SRCS=	CommandAlias.cpp \
 	OptionValueDictionary.cpp \
 	OptionValueEnumeration.cpp \
 	OptionValueFileSpec.cpp \
-	OptionValueFileSpecLIst.cpp \
+	OptionValueFileSpecList.cpp \
 	OptionValueFormat.cpp \
 	OptionValueFormatEntity.cpp \
 	OptionValueLanguage.cpp \
@@ -50,7 +51,7 @@ SRCS=	CommandAlias.cpp \
 	Property.cpp \
 	ScriptInterpreter.cpp \
 
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Interpreter
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Interpreter
 
 install:
 	@# Nothing here so far ...
@@ -59,3 +60,4 @@ install:
 
 CPPFLAGS+=	${LLDB_INCLUDES}
 CPPFLAGS+=	${CLANG_INCLUDES}
+CPPFLAGS+=	-I${.OBJDIR}/../include/lldb/Interpreter
diff --git a/gnu/usr.bin/clang/liblldbPluginArchitecture/Makefile b/gnu/usr.bin/clang/liblldbPluginArchitecture/Makefile
index 9c875a97463..e620b191c14 100644
--- a/gnu/usr.bin/clang/liblldbPluginArchitecture/Makefile
+++ b/gnu/usr.bin/clang/liblldbPluginArchitecture/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2019/06/23 22:07:43 patrick Exp $
+# $OpenBSD: Makefile,v 1.4 2020/08/03 14:45:30 patrick Exp $
 
 LIB=	lldbPluginArchitecture
 NOPIC=
@@ -9,9 +9,9 @@ SRCS=	ArchitectureArm.cpp \
 	ArchitectureMips.cpp \
 	ArchitecturePPC64.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/Architecture/Arm
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/Architecture/Mips
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/Architecture/PPC64
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/Architecture/Arm
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/Architecture/Mips
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/Architecture/PPC64
 
 install:
 	@# Nothing here so far ...
diff --git a/gnu/usr.bin/clang/liblldbPluginDisassembler/Makefile b/gnu/usr.bin/clang/liblldbPluginDisassembler/Makefile
index 9e196abcb20..6f8146acf14 100644
--- a/gnu/usr.bin/clang/liblldbPluginDisassembler/Makefile
+++ b/gnu/usr.bin/clang/liblldbPluginDisassembler/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2018/10/04 11:43:29 patrick Exp $
+# $OpenBSD: Makefile,v 1.2 2020/08/03 14:45:30 patrick Exp $
 
 LIB=	lldbPluginDisassembler
 NOPIC=
@@ -7,7 +7,7 @@ NOPROFILE=
 .include <bsd.own.mk>
 SRCS=	DisassemblerLLVMC.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/Disassembler/llvm
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/Disassembler/llvm
 
 install:
 	@# Nothing here so far ...
diff --git a/gnu/usr.bin/clang/liblldbPluginDynamicLoader/Makefile b/gnu/usr.bin/clang/liblldbPluginDynamicLoader/Makefile
index d3403d44bac..7d656545ca0 100644
--- a/gnu/usr.bin/clang/liblldbPluginDynamicLoader/Makefile
+++ b/gnu/usr.bin/clang/liblldbPluginDynamicLoader/Makefile
@@ -1,12 +1,11 @@
-# $OpenBSD: Makefile,v 1.2 2019/01/27 16:59:42 patrick Exp $
+# $OpenBSD: Makefile,v 1.3 2020/08/03 14:45:30 patrick Exp $
 
 LIB=	lldbPluginDynamicLoader
 NOPIC=
 NOPROFILE=
 
 .include <bsd.own.mk>
-SRCS=	AuxVector.cpp \
-	DYLDRendezvous.cpp \
+SRCS=	DYLDRendezvous.cpp \
 	DynamicLoaderDarwin.cpp \
 	DynamicLoaderDarwinKernel.cpp \
 	DynamicLoaderHexagonDYLD.cpp \
@@ -17,12 +16,12 @@ SRCS=	AuxVector.cpp \
 	DynamicLoaderWindowsDYLD.cpp \
 	HexagonDYLDRendezvous.cpp \
 
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/DynamicLoader/Darwin-Kernel
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/DynamicLoader/Hexagon-DYLD
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/DynamicLoader/Static
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/DynamicLoader/Windows-DYLD
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/DynamicLoader/Darwin-Kernel
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/DynamicLoader/Hexagon-DYLD
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/DynamicLoader/POSIX-DYLD
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/DynamicLoader/Static
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/DynamicLoader/Windows-DYLD
 
 install:
 	@# Nothing here so far ...
@@ -31,3 +30,4 @@ install:
 
 CPPFLAGS+=	${LLDB_INCLUDES}
 CPPFLAGS+=	${CLANG_INCLUDES}
+CPPFLAGS+=	-I${.OBJDIR}/../include/lldb/Plugins
diff --git a/gnu/usr.bin/clang/liblldbPluginExpressionParser/Makefile b/gnu/usr.bin/clang/liblldbPluginExpressionParser/Makefile
index 395ddc9006c..1842060dd38 100644
--- a/gnu/usr.bin/clang/liblldbPluginExpressionParser/Makefile
+++ b/gnu/usr.bin/clang/liblldbPluginExpressionParser/Makefile
@@ -1,16 +1,18 @@
-# $OpenBSD: Makefile,v 1.3 2019/06/23 22:07:43 patrick Exp $
+# $OpenBSD: Makefile,v 1.4 2020/08/03 14:45:30 patrick Exp $
 
 LIB=	lldbPluginExpressionParser
 NOPIC=
 NOPROFILE=
 
 .include <bsd.own.mk>
-SRCS=	ASTDumper.cpp \
-	ASTResultSynthesizer.cpp \
+SRCS=	ASTResultSynthesizer.cpp \
 	ASTStructExtractor.cpp \
+	ASTUtils.cpp \
 	ClangASTSource.cpp \
+	ClangDeclVendor.cpp \
 	ClangExpressionDeclMap.cpp \
 	ClangExpressionParser.cpp \
+	ClangExpressionSourceCode.cpp \
 	ClangExpressionVariable.cpp \
 	ClangFunctionCaller.cpp \
 	ClangHost.cpp \
@@ -18,9 +20,11 @@ SRCS=	ASTDumper.cpp \
 	ClangPersistentVariables.cpp \
 	ClangUserExpression.cpp \
 	ClangUtilityFunction.cpp \
+	CppModuleConfiguration.cpp \
 	IRForTarget.cpp \
+	IRDynamicChecks.cpp \
 
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/ExpressionParser/Clang
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/ExpressionParser/Clang
 
 install:
 	@# Nothing here so far ...
diff --git a/gnu/usr.bin/clang/liblldbPluginInstruction/Makefile b/gnu/usr.bin/clang/liblldbPluginInstruction/Makefile
index 795547dce58..014adf95168 100644
--- a/gnu/usr.bin/clang/liblldbPluginInstruction/Makefile
+++ b/gnu/usr.bin/clang/liblldbPluginInstruction/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2019/01/27 16:59:42 patrick Exp $
+# $OpenBSD: Makefile,v 1.3 2020/08/03 14:45:30 patrick Exp $
 
 LIB=	lldbPluginInstruction
 NOPIC=
@@ -12,11 +12,11 @@ SRCS=	EmulateInstructionARM.cpp \
 	EmulateInstructionPPC64.cpp \
 	EmulationStateARM.cpp \
 
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/Instruction/ARM
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/Instruction/ARM64
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/Instruction/MIPS
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/Instruction/MIPS64
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/Instruction/PPC64
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/Instruction/ARM
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/Instruction/ARM64
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/Instruction/MIPS
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/Instruction/MIPS64
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/Instruction/PPC64
 
 install:
 	@# Nothing here so far ...
diff --git a/gnu/usr.bin/clang/liblldbPluginInstrumentationRuntime/Makefile b/gnu/usr.bin/clang/liblldbPluginInstrumentationRuntime/Makefile
index 8dd18140985..51b8912c7db 100644
--- a/gnu/usr.bin/clang/liblldbPluginInstrumentationRuntime/Makefile
+++ b/gnu/usr.bin/clang/liblldbPluginInstrumentationRuntime/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2018/10/04 11:43:29 patrick Exp $
+# $OpenBSD: Makefile,v 1.2 2020/08/03 14:45:30 patrick Exp $
 
 LIB=	lldbPluginInstrumentationRuntime
 NOPIC=
@@ -10,10 +10,10 @@ SRCS=	ASanRuntime.cpp \
 	TSanRuntime.cpp \
 	UBSanRuntime.cpp \
 
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/InstrumentationRuntime/ASan
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/InstrumentationRuntime/MainThreadChecker
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/InstrumentationRuntime/TSan
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/InstrumentationRuntime/UBSan
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/InstrumentationRuntime/ASan
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/InstrumentationRuntime/MainThreadChecker
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/InstrumentationRuntime/TSan
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/InstrumentationRuntime/UBSan
 
 install:
 	@# Nothing here so far ...
diff --git a/gnu/usr.bin/clang/liblldbPluginJITLoader/Makefile b/gnu/usr.bin/clang/liblldbPluginJITLoader/Makefile
index 494466a5396..531419623cf 100644
--- a/gnu/usr.bin/clang/liblldbPluginJITLoader/Makefile
+++ b/gnu/usr.bin/clang/liblldbPluginJITLoader/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2018/10/04 11:43:29 patrick Exp $
+# $OpenBSD: Makefile,v 1.2 2020/08/03 14:45:30 patrick Exp $
 
 LIB=	lldbPluginJITLoader
 NOPIC=
@@ -7,7 +7,7 @@ NOPROFILE=
 .include <bsd.own.mk>
 SRCS=	JITLoaderGDB.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/JITLoader/GDB
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/JITLoader/GDB
 
 install:
 	@# Nothing here so far ...
@@ -16,3 +16,4 @@ install:
 
 CPPFLAGS+=	${LLDB_INCLUDES}
 CPPFLAGS+=	${CLANG_INCLUDES}
+CPPFLAGS+=	-I${.OBJDIR}/../include/lldb/Plugins
diff --git a/gnu/usr.bin/clang/liblldbPluginLanguage/Makefile b/gnu/usr.bin/clang/liblldbPluginLanguage/Makefile
index c69c92a5116..b120fc086d4 100644
--- a/gnu/usr.bin/clang/liblldbPluginLanguage/Makefile
+++ b/gnu/usr.bin/clang/liblldbPluginLanguage/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2019/06/23 22:07:43 patrick Exp $
+# $OpenBSD: Makefile,v 1.3 2020/08/03 14:45:30 patrick Exp $
 
 LIB=	lldbPluginLanguage
 NOPIC=
@@ -40,10 +40,10 @@ SRCS=	BlockPointer.cpp \
 	ObjCLanguage.cpp \
 	ObjCPlusPlusLanguage.cpp \
 
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/Language/CPlusPlus
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/Language/ClangCommon
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/Language/ObjC
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/Language/ObjCPlusPlus
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/Language/CPlusPlus
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/Language/ClangCommon
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/Language/ObjC
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/Language/ObjCPlusPlus
 
 install:
 	@# Nothing here so far ...
diff --git a/gnu/usr.bin/clang/liblldbPluginLanguageRuntime/Makefile b/gnu/usr.bin/clang/liblldbPluginLanguageRuntime/Makefile
index e8d802989f8..4afe8d2e8d6 100644
--- a/gnu/usr.bin/clang/liblldbPluginLanguageRuntime/Makefile
+++ b/gnu/usr.bin/clang/liblldbPluginLanguageRuntime/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2019/06/23 22:07:43 patrick Exp $
+# $OpenBSD: Makefile,v 1.3 2020/08/03 14:45:30 patrick Exp $
 
 LIB=	lldbPluginLanguageRuntime
 NOPIC=
@@ -13,15 +13,19 @@ SRCS=	AppleObjCClassDescriptorV2.cpp \
 	AppleObjCTrampolineHandler.cpp \
 	AppleObjCTypeEncodingParser.cpp \
 	AppleThreadPlanStepThroughObjCTrampoline.cpp \
+	CPPLanguageRuntime.cpp \
 	ItaniumABILanguageRuntime.cpp \
+	ObjCLanguageRuntime.cpp \
 	RenderScriptExpressionOpts.cpp \
 	RenderScriptRuntime.cpp \
 	RenderScriptScriptGroup.cpp \
 	RenderScriptx86ABIFixups.cpp \
 
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/LanguageRuntime/CPlusPlus
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/LanguageRuntime/ObjC
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime
 
 install:
 	@# Nothing here so far ...
diff --git a/gnu/usr.bin/clang/liblldbPluginMemoryHistory/Makefile b/gnu/usr.bin/clang/liblldbPluginMemoryHistory/Makefile
index 87002cab519..97845fcba6c 100644
--- a/gnu/usr.bin/clang/liblldbPluginMemoryHistory/Makefile
+++ b/gnu/usr.bin/clang/liblldbPluginMemoryHistory/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2018/10/04 11:43:29 patrick Exp $
+# $OpenBSD: Makefile,v 1.2 2020/08/03 14:45:30 patrick Exp $
 
 LIB=	lldbPluginMemoryHistory
 NOPIC=
@@ -7,7 +7,7 @@ NOPROFILE=
 .include <bsd.own.mk>
 SRCS=	MemoryHistoryASan.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/MemoryHistory/asan
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/MemoryHistory/asan
 
 install:
 	@# Nothing here so far ...
diff --git a/gnu/usr.bin/clang/liblldbPluginObjectContainer/Makefile b/gnu/usr.bin/clang/liblldbPluginObjectContainer/Makefile
index 36a33b2634e..0c31f08d0ca 100644
--- a/gnu/usr.bin/clang/liblldbPluginObjectContainer/Makefile
+++ b/gnu/usr.bin/clang/liblldbPluginObjectContainer/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2018/10/04 11:43:29 patrick Exp $
+# $OpenBSD: Makefile,v 1.2 2020/08/03 14:45:30 patrick Exp $
 
 LIB=	lldbPluginObjectContainer
 NOPIC=
@@ -8,8 +8,8 @@ NOPROFILE=
 SRCS=	ObjectContainerBSDArchive.cpp \
 	ObjectContainerUniversalMachO.cpp \
 
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/ObjectContainer/BSD-Archive
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/ObjectContainer/Universal-Mach-O
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/ObjectContainer/BSD-Archive
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/ObjectContainer/Universal-Mach-O
 
 install:
 	@# Nothing here so far ...
diff --git a/gnu/usr.bin/clang/liblldbPluginObjectFile/Makefile b/gnu/usr.bin/clang/liblldbPluginObjectFile/Makefile
index 18bf278d402..f656bc86aef 100644
--- a/gnu/usr.bin/clang/liblldbPluginObjectFile/Makefile
+++ b/gnu/usr.bin/clang/liblldbPluginObjectFile/Makefile
@@ -1,23 +1,25 @@
-# $OpenBSD: Makefile,v 1.2 2019/06/23 22:07:44 patrick Exp $
+# $OpenBSD: Makefile,v 1.3 2020/08/03 14:45:30 patrick Exp $
 
 LIB=	lldbPluginObjectFile
 NOPIC=
 NOPROFILE=
 
 .include <bsd.own.mk>
-SRCS=	ELFHeader.cpp \
+SRCS=	BreakpadRecords.cpp \
+	ELFHeader.cpp \
 	ObjectFileBreakpad.cpp \
 	ObjectFileELF.cpp \
 	ObjectFileJIT.cpp \
 	ObjectFileMachO.cpp \
 	ObjectFilePECOFF.cpp \
+	PECallFrameInfo.cpp \
 	WindowsMiniDump.cpp \
 
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/ObjectFile/Breakpad
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/ObjectFile/ELF
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/ObjectFile/JIT
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/ObjectFile/Mach-O
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/ObjectFile/PECOFF
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/ObjectFile/Breakpad
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/ObjectFile/ELF
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/ObjectFile/JIT
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/ObjectFile/Mach-O
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/ObjectFile/PECOFF
 
 install:
 	@# Nothing here so far ...
diff --git a/gnu/usr.bin/clang/liblldbPluginOperatingSystem/Makefile b/gnu/usr.bin/clang/liblldbPluginOperatingSystem/Makefile
index e1dffe3be1f..a3414577ccf 100644
--- a/gnu/usr.bin/clang/liblldbPluginOperatingSystem/Makefile
+++ b/gnu/usr.bin/clang/liblldbPluginOperatingSystem/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2019/06/23 22:07:44 patrick Exp $
+# $OpenBSD: Makefile,v 1.3 2020/08/03 14:45:30 patrick Exp $
 
 LIB=	lldbPluginOperatingSystem
 NOPIC=
@@ -7,7 +7,7 @@ NOPROFILE=
 .include <bsd.own.mk>
 SRCS=	OperatingSystemPython.cpp \
 
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/OperatingSystem/Python
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/OperatingSystem/Python
 
 install:
 	@# Nothing here so far ...
diff --git a/gnu/usr.bin/clang/liblldbPluginPlatform/Makefile b/gnu/usr.bin/clang/liblldbPluginPlatform/Makefile
index 5483eafe08a..43bbd7c64a0 100644
--- a/gnu/usr.bin/clang/liblldbPluginPlatform/Makefile
+++ b/gnu/usr.bin/clang/liblldbPluginPlatform/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2019/06/23 22:07:44 patrick Exp $
+# $OpenBSD: Makefile,v 1.3 2020/08/03 14:45:30 patrick Exp $
 
 LIB=	lldbPluginPlatform
 NOPIC=
@@ -14,7 +14,6 @@ SRCS=	AdbClient.cpp \
 	PlatformDarwin.cpp \
 	PlatformDarwinKernel.cpp \
 	PlatformFreeBSD.cpp \
-	PlatformKalimba.cpp \
 	PlatformLinux.cpp \
 	PlatformMacOSX.cpp \
 	PlatformNetBSD.cpp \
@@ -29,16 +28,15 @@ SRCS=	AdbClient.cpp \
 	PlatformWindows.cpp \
 	PlatformiOSSimulator.cpp \
 
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/Platform/Android
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/Platform/FreeBSD
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/Platform/Kalimba
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/Platform/Linux
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/Platform/MacOSX
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/Platform/NetBSD
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/Platform/OpenBSD
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/Platform/POSIX
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/Platform/Windows
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/Platform/gdb-server
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/Platform/Android
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/Platform/FreeBSD
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/Platform/Linux
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/Platform/MacOSX
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/Platform/NetBSD
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/Platform/OpenBSD
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/Platform/POSIX
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/Platform/Windows
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/Platform/gdb-server
 
 install:
 	@# Nothing here so far ...
diff --git a/gnu/usr.bin/clang/liblldbPluginProcess/Makefile b/gnu/usr.bin/clang/liblldbPluginProcess/Makefile
index 4dd1a5c3aaf..687a51eb8b1 100644
--- a/gnu/usr.bin/clang/liblldbPluginProcess/Makefile
+++ b/gnu/usr.bin/clang/liblldbPluginProcess/Makefile
@@ -1,11 +1,12 @@
-# $OpenBSD: Makefile,v 1.6 2019/12/21 13:16:25 mortimer Exp $
+# $OpenBSD: Makefile,v 1.7 2020/08/03 14:45:30 patrick Exp $
 
 LIB=	lldbPluginProcess
 NOPIC=
 NOPROFILE=
 
 .include <bsd.own.mk>
-SRCS=	CrashReason.cpp \
+SRCS=	AuxVector.cpp \
+	CrashReason.cpp \
 	DynamicRegisterInfo.cpp \
 	FreeBSDSignals.cpp \
 	GDBRemoteClientBase.cpp \
@@ -85,6 +86,8 @@ SRCS=	CrashReason.cpp \
 	RegisterContextPOSIX_s390x.cpp \
 	RegisterContextPOSIX_x86.cpp \
 	RegisterContextThreadMemory.cpp \
+	RegisterContextWindows_i386.cpp \
+	RegisterContextWindows_x86_64.cpp \
 	RegisterInfoPOSIX_arm.cpp \
 	RegisterInfoPOSIX_arm64.cpp \
 	RegisterInfoPOSIX_ppc64le.cpp \
@@ -98,13 +101,13 @@ SRCS=	CrashReason.cpp \
 	UnwindLLDB.cpp \
 	UnwindMacOSXFrameBackchain.cpp \
 
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/Process/Utility
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/Process/elf-core
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/Process/gdb-remote
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/Process/mach-core
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/Process/minidump
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/Process/POSIX
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/Process/OpenBSD
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/Process/Utility
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/Process/elf-core
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/Process/gdb-remote
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/Process/mach-core
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/Process/minidump
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/Process/POSIX
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/Process/OpenBSD
 
 install:
 	@# Nothing here so far ...
@@ -113,3 +116,4 @@ install:
 
 CPPFLAGS+=	${LLDB_INCLUDES}
 CPPFLAGS+=	${CLANG_INCLUDES}
+CPPFLAGS+=	-I${.OBJDIR}/../include/lldb/Plugins
diff --git a/gnu/usr.bin/clang/liblldbPluginScriptInterpreter/Makefile b/gnu/usr.bin/clang/liblldbPluginScriptInterpreter/Makefile
index a5e937c1898..0732f17be03 100644
--- a/gnu/usr.bin/clang/liblldbPluginScriptInterpreter/Makefile
+++ b/gnu/usr.bin/clang/liblldbPluginScriptInterpreter/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2018/10/04 11:43:29 patrick Exp $
+# $OpenBSD: Makefile,v 1.2 2020/08/03 14:45:30 patrick Exp $
 
 LIB=	lldbPluginScriptInterpreter
 NOPIC=
@@ -7,7 +7,7 @@ NOPROFILE=
 .include <bsd.own.mk>
 SRCS=	ScriptInterpreterNone.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/ScriptInterpreter/None
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/ScriptInterpreter/None
 
 install:
 	@# Nothing here so far ...
diff --git a/gnu/usr.bin/clang/liblldbPluginStructuredData/Makefile b/gnu/usr.bin/clang/liblldbPluginStructuredData/Makefile
index 6d4474db466..98322c8009f 100644
--- a/gnu/usr.bin/clang/liblldbPluginStructuredData/Makefile
+++ b/gnu/usr.bin/clang/liblldbPluginStructuredData/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2018/10/04 11:43:29 patrick Exp $
+# $OpenBSD: Makefile,v 1.2 2020/08/03 14:45:31 patrick Exp $
 
 LIB=	lldbPluginStructuredData
 NOPIC=
@@ -7,7 +7,7 @@ NOPROFILE=
 .include <bsd.own.mk>
 SRCS=	StructuredDataDarwinLog.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/StructuredData/DarwinLog
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/StructuredData/DarwinLog
 
 install:
 	@# Nothing here so far ...
@@ -16,3 +16,4 @@ install:
 
 CPPFLAGS+=	${LLDB_INCLUDES}
 CPPFLAGS+=	${CLANG_INCLUDES}
+CPPFLAGS+=	-I${.OBJDIR}/../include/lldb/Plugins
diff --git a/gnu/usr.bin/clang/liblldbPluginSymbolFile/Makefile b/gnu/usr.bin/clang/liblldbPluginSymbolFile/Makefile
index 3931fe11db8..ca460f9c41c 100644
--- a/gnu/usr.bin/clang/liblldbPluginSymbolFile/Makefile
+++ b/gnu/usr.bin/clang/liblldbPluginSymbolFile/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2019/06/23 22:07:44 patrick Exp $
+# $OpenBSD: Makefile,v 1.4 2020/08/03 14:45:31 patrick Exp $
 
 LIB=	lldbPluginSymbolFile
 NOPIC=
@@ -6,6 +6,7 @@ NOPROFILE=
 
 .include <bsd.own.mk>
 SRCS=	AppleDWARFIndex.cpp \
+	CodeViewRegisterMapping.cpp \
 	CompileUnitIndex.cpp \
 	DIERef.cpp \
 	DWARFASTParserClang.cpp \
@@ -13,17 +14,14 @@ SRCS=	AppleDWARFIndex.cpp \
 	DWARFAttribute.cpp \
 	DWARFBaseDIE.cpp \
 	DWARFCompileUnit.cpp \
+	DWARFContext.cpp \
 	DWARFDIE.cpp \
-	DWARFDIECollection.cpp \
 	DWARFDataExtractor.cpp \
 	DWARFDebugAbbrev.cpp \
 	DWARFDebugArangeSet.cpp \
 	DWARFDebugAranges.cpp \
 	DWARFDebugInfo.cpp \
 	DWARFDebugInfoEntry.cpp \
-	DWARFDebugLine.cpp \
-	DWARFDebugMacinfo.cpp \
-	DWARFDebugMacinfoEntry.cpp \
 	DWARFDebugMacro.cpp \
 	DWARFDebugRanges.cpp \
 	DWARFDeclContext.cpp \
@@ -31,6 +29,7 @@ SRCS=	AppleDWARFIndex.cpp \
 	DWARFFormValue.cpp \
 	DWARFIndex.cpp \
 	DWARFLocationExpression.cpp \
+	DWARFTypeUnit.cpp \
 	DWARFUnit.cpp \
 	DebugNamesDWARFIndex.cpp \
 	HashedNameToDIE.cpp \
@@ -40,6 +39,7 @@ SRCS=	AppleDWARFIndex.cpp \
 	PDBASTParser.cpp \
 	PDBLocationToDWARFExpression.cpp \
 	PdbAstBuilder.cpp \
+	PdbFPOProgramToDWARFExpression.cpp \
 	PdbIndex.cpp \
 	PdbSymUid.cpp \
 	PdbUtil.cpp \
@@ -55,11 +55,11 @@ SRCS=	AppleDWARFIndex.cpp \
 	UdtRecordCompleter.cpp \
 	UniqueDWARFASTType.cpp \
 
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/SymbolFile/Breakpad
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/SymbolFile/DWARF
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/SymbolFile/NativePDB
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/SymbolFile/PDB
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/SymbolFile/Symtab
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/SymbolFile/Breakpad
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/SymbolFile/DWARF
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/SymbolFile/NativePDB
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/SymbolFile/PDB
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/SymbolFile/Symtab
 
 install:
 	@# Nothing here so far ...
@@ -68,3 +68,4 @@ install:
 
 CPPFLAGS+=	${LLDB_INCLUDES}
 CPPFLAGS+=	${CLANG_INCLUDES}
+CPPFLAGS+=	-I${.OBJDIR}/../include/lldb/Plugins
diff --git a/gnu/usr.bin/clang/liblldbPluginSymbolVendor/Makefile b/gnu/usr.bin/clang/liblldbPluginSymbolVendor/Makefile
index 66809a0ef3f..cd41bb2a651 100644
--- a/gnu/usr.bin/clang/liblldbPluginSymbolVendor/Makefile
+++ b/gnu/usr.bin/clang/liblldbPluginSymbolVendor/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2018/10/04 11:43:29 patrick Exp $
+# $OpenBSD: Makefile,v 1.2 2020/08/03 14:45:31 patrick Exp $
 
 LIB=	lldbPluginSymbolVendor
 NOPIC=
@@ -7,7 +7,7 @@ NOPROFILE=
 .include <bsd.own.mk>
 SRCS=	SymbolVendorELF.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/SymbolVendor/ELF
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/SymbolVendor/ELF
 
 install:
 	@# Nothing here so far ...
diff --git a/gnu/usr.bin/clang/liblldbPluginSystemRuntime/Makefile b/gnu/usr.bin/clang/liblldbPluginSystemRuntime/Makefile
index 2ed46b912d8..2bbd1190f20 100644
--- a/gnu/usr.bin/clang/liblldbPluginSystemRuntime/Makefile
+++ b/gnu/usr.bin/clang/liblldbPluginSystemRuntime/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2018/10/04 11:43:29 patrick Exp $
+# $OpenBSD: Makefile,v 1.2 2020/08/03 14:45:31 patrick Exp $
 
 LIB=	lldbPluginSystemRuntime
 NOPIC=
@@ -11,7 +11,7 @@ SRCS=	AppleGetItemInfoHandler.cpp \
 	AppleGetThreadItemInfoHandler.cpp \
 	SystemRuntimeMacOSX.cpp \
 
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/SystemRuntime/MacOSX
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/SystemRuntime/MacOSX
 
 install:
 	@# Nothing here so far ...
diff --git a/gnu/usr.bin/clang/liblldbPluginUnwindAssembly/Makefile b/gnu/usr.bin/clang/liblldbPluginUnwindAssembly/Makefile
index 8510b8c60b4..2d782f8ec47 100644
--- a/gnu/usr.bin/clang/liblldbPluginUnwindAssembly/Makefile
+++ b/gnu/usr.bin/clang/liblldbPluginUnwindAssembly/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2018/10/04 11:43:29 patrick Exp $
+# $OpenBSD: Makefile,v 1.2 2020/08/03 14:45:31 patrick Exp $
 
 LIB=	lldbPluginUnwindAssembly
 NOPIC=
@@ -9,8 +9,8 @@ SRCS=	UnwindAssembly-x86.cpp \
 	UnwindAssemblyInstEmulation.cpp \
 	x86AssemblyInspectionEngine.cpp \
 
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/UnwindAssembly/InstEmulation
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Plugins/UnwindAssembly/x86
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/UnwindAssembly/InstEmulation
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Plugins/UnwindAssembly/x86
 
 install:
 	@# Nothing here so far ...
diff --git a/gnu/usr.bin/clang/liblldbSymbol/Makefile b/gnu/usr.bin/clang/liblldbSymbol/Makefile
index d611ebc34d2..03cc8bf2cd7 100644
--- a/gnu/usr.bin/clang/liblldbSymbol/Makefile
+++ b/gnu/usr.bin/clang/liblldbSymbol/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2019/06/23 22:07:44 patrick Exp $
+# $OpenBSD: Makefile,v 1.3 2020/08/03 14:45:31 patrick Exp $
 
 LIB=	lldbSymbol
 NOPIC=
@@ -9,22 +9,26 @@ SRCS=	ArmUnwindInfo.cpp \
 	Block.cpp \
 	ClangASTContext.cpp \
 	ClangASTImporter.cpp \
+	ClangASTMetadata.cpp \
 	ClangExternalASTSourceCallbacks.cpp \
-	ClangExternalASTSourceCommon.cpp \
 	ClangUtil.cpp \
+	CompactUnwindInfo.cpp \
+	CompileUnit.cpp \
 	CompilerDecl.cpp \
 	CompilerDeclContext.cpp \
 	CompilerType.cpp \
-	CompileUnit.cpp \
-	CompactUnwindInfo.cpp \
+	CxxModuleHandler.cpp \
+	DWARFCallFrameInfo.cpp \
 	DebugMacros.cpp \
 	Declaration.cpp \
-	DWARFCallFrameInfo.cpp \
-	Function.cpp \
+	DeclVendor.cpp \
 	FuncUnwinders.cpp \
+	Function.cpp \
 	LineEntry.cpp \
 	LineTable.cpp \
+	LocateSymbolFile.cpp \
 	ObjectFile.cpp \
+	PostfixExpression.cpp \
 	Symbol.cpp \
 	SymbolContext.cpp \
 	SymbolFile.cpp \
@@ -38,9 +42,8 @@ SRCS=	ArmUnwindInfo.cpp \
 	UnwindTable.cpp \
 	Variable.cpp \
 	VariableList.cpp \
-	VerifyDecl.cpp \
 
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Symbol
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Symbol
 
 install:
 	@# Nothing here so far ...
diff --git a/gnu/usr.bin/clang/liblldbTarget/Makefile b/gnu/usr.bin/clang/liblldbTarget/Makefile
index 1c83551d8f2..67ba98dbb8a 100644
--- a/gnu/usr.bin/clang/liblldbTarget/Makefile
+++ b/gnu/usr.bin/clang/liblldbTarget/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2019/06/23 22:07:45 patrick Exp $
+# $OpenBSD: Makefile,v 1.3 2020/08/03 14:45:31 patrick Exp $
 
 LIB=	lldbTarget
 NOPIC=
@@ -6,9 +6,7 @@ NOPROFILE=
 
 .include <bsd.own.mk>
 SRCS=	ABI.cpp \
-	CPPLanguageRuntime.cpp \
 	ExecutionContext.cpp \
-	FileAction.cpp \
 	JITLoader.cpp \
 	JITLoaderList.cpp \
 	InstrumentationRuntime.cpp \
@@ -17,19 +15,18 @@ SRCS=	ABI.cpp \
 	LanguageRuntime.cpp \
 	Memory.cpp \
 	MemoryHistory.cpp \
+	MemoryRegionInfo.cpp \
 	ModuleCache.cpp \
-	ObjCLanguageRuntime.cpp \
 	OperatingSystem.cpp \
 	PathMappingList.cpp \
 	Platform.cpp \
 	Process.cpp \
-	ProcessInfo.cpp \
-	ProcessLaunchInfo.cpp \
 	Queue.cpp \
 	QueueItem.cpp \
 	QueueList.cpp \
 	RegisterContext.cpp \
 	RegisterNumber.cpp \
+	RemoteAwarePlatform.cpp \
 	SectionLoadHistory.cpp \
 	SectionLoadList.cpp \
 	StackFrame.cpp \
@@ -66,7 +63,7 @@ SRCS=	ABI.cpp \
 	UnixSignals.cpp \
 	UnwindAssembly.cpp \
 
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Target
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Target
 
 install:
 	@# Nothing here so far ...
@@ -75,3 +72,4 @@ install:
 
 CPPFLAGS+=	${LLDB_INCLUDES}
 CPPFLAGS+=	${CLANG_INCLUDES}
+CPPFLAGS+=	-I${.OBJDIR}/../include/lldb/Target
diff --git a/gnu/usr.bin/clang/liblldbUtility/Makefile b/gnu/usr.bin/clang/liblldbUtility/Makefile
index 60f267cb6c1..8f3cbd3eb10 100644
--- a/gnu/usr.bin/clang/liblldbUtility/Makefile
+++ b/gnu/usr.bin/clang/liblldbUtility/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2019/06/23 22:07:45 patrick Exp $
+# $OpenBSD: Makefile,v 1.4 2020/08/03 14:45:31 patrick Exp $
 
 LIB=	lldbUtility
 NOPIC=
@@ -20,16 +20,18 @@ SRCS=	ArchSpec.cpp \
 	Environment.cpp \
 	Event.cpp \
 	FileSpec.cpp \
+	GDBRemote.cpp \
 	IOObject.cpp \
-	JSON.cpp \
 	LLDBAssert.cpp \
 	Listener.cpp \
 	Log.cpp \
 	Logging.cpp \
 	NameMatches.cpp \
+	ProcessInfo.cpp \
 	RegisterValue.cpp \
 	RegularExpression.cpp \
 	Reproducer.cpp \
+	ReproducerInstrumentation.cpp \
 	Scalar.cpp \
 	SelectHelper.cpp \
 	SharingPtr.cpp \
@@ -37,7 +39,6 @@ SRCS=	ArchSpec.cpp \
 	Status.cpp \
 	Stream.cpp \
 	StreamCallback.cpp \
-	StreamGDBRemote.cpp \
 	StreamString.cpp \
 	StringExtractor.cpp \
 	StringExtractorGDBRemote.cpp \
@@ -46,13 +47,14 @@ SRCS=	ArchSpec.cpp \
 	StructuredData.cpp \
 	TildeExpressionResolver.cpp \
 	Timer.cpp \
-	UserID.cpp \
-	UriParser.cpp \
 	UUID.cpp \
+	UriParser.cpp \
+	UserID.cpp \
+	UserIDResolver.cpp \
 	VASprintf.cpp \
 	VMRange.cpp \
 
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source/Utility
+.PATH:	${.CURDIR}/../../../llvm/lldb/source/Utility
 
 install:
 	@# Nothing here so far ...
diff --git a/gnu/usr.bin/clang/llc/Makefile b/gnu/usr.bin/clang/llc/Makefile
index 81c783f7eeb..a4fb20c1d95 100644
--- a/gnu/usr.bin/clang/llc/Makefile
+++ b/gnu/usr.bin/clang/llc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2019/03/06 14:35:28 jsg Exp $
+# $OpenBSD: Makefile,v 1.5 2020/08/03 14:45:31 patrick Exp $
 
 .include <bsd.own.mk>
 
@@ -7,7 +7,7 @@ NOMAN=
 
 SRCS=	llc.cpp
 
-.PATH: ${.CURDIR}/../../../llvm/tools/llc
+.PATH: ${.CURDIR}/../../../llvm/llvm/tools/llc
 
 LLVM_LIBDEPS=	LLVM
 
diff --git a/gnu/usr.bin/clang/lld/Makefile b/gnu/usr.bin/clang/lld/Makefile
index bed8f8863e2..405f416f563 100644
--- a/gnu/usr.bin/clang/lld/Makefile
+++ b/gnu/usr.bin/clang/lld/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2019/05/17 14:50:41 schwarze Exp $
+# $OpenBSD: Makefile,v 1.18 2020/08/03 14:45:31 patrick Exp $
 
 .include <bsd.own.mk>
 
@@ -15,10 +15,10 @@ maninstall:
 .endif
 
 CPPFLAGS+=	${CLANG_INCLUDES}
-CPPFLAGS+=	-I${.CURDIR}/../../../llvm/tools/lld/include
+CPPFLAGS+=	-I${.CURDIR}/../../../llvm/lld/include
 
-.PATH:	${.CURDIR}/../../../llvm/tools/lld/tools/lld
-.PATH:	${.CURDIR}/../../../llvm/tools/lld/docs
+.PATH:	${.CURDIR}/../../../llvm/lld/tools/lld
+.PATH:	${.CURDIR}/../../../llvm/lld/docs
 
 LLVM_LIBDEPS=	LLVM \
 		lldELF \
diff --git a/gnu/usr.bin/clang/lldb-server/Makefile b/gnu/usr.bin/clang/lldb-server/Makefile
index 2e1c46ef1bd..ff404ab0502 100644
--- a/gnu/usr.bin/clang/lldb-server/Makefile
+++ b/gnu/usr.bin/clang/lldb-server/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2019/11/09 16:45:48 mortimer Exp $
+# $OpenBSD: Makefile,v 1.2 2020/08/03 14:45:31 patrick Exp $
 
 .include <bsd.own.mk>
 
@@ -17,8 +17,8 @@ SRCS=	Acceptor.cpp \
 LDADD+=	-lcurses -ledit -lpanel
 
 
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/tools/lldb-server
+.PATH:	${.CURDIR}/../../../llvm/lldb/source
+.PATH:	${.CURDIR}/../../../llvm/lldb/tools/lldb-server
 
 LLVM_LIBDEPS=	clangAST \
     clangAnalysis \
diff --git a/gnu/usr.bin/clang/lldb-tblgen/Makefile b/gnu/usr.bin/clang/lldb-tblgen/Makefile
new file mode 100644
index 00000000000..2a23ec13e3f
--- /dev/null
+++ b/gnu/usr.bin/clang/lldb-tblgen/Makefile
@@ -0,0 +1,19 @@
+# $OpenBSD: Makefile,v 1.1 2020/08/03 14:45:31 patrick Exp $
+
+PROG=	lldb-tblgen
+NOMAN=
+
+.include <bsd.own.mk>
+SRCS=	LLDBOptionDefEmitter.cpp \
+	LLDBPropertyDefEmitter.cpp \
+	LLDBTableGen.cpp \
+	LLDBTableGenUtils.cpp
+
+.PATH:	${.CURDIR}/../../../llvm/lldb/utils/TableGen
+
+LLVM_LIBDEPS=	LLVMTableGen LLVMSupport
+
+install:
+	@# Nothing here so far ...
+
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/clang/lldb/Makefile b/gnu/usr.bin/clang/lldb/Makefile
index be18e0c6717..d5a07b76578 100644
--- a/gnu/usr.bin/clang/lldb/Makefile
+++ b/gnu/usr.bin/clang/lldb/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.6 2019/06/23 22:07:45 patrick Exp $
+# $OpenBSD: Makefile,v 1.7 2020/08/03 14:45:31 patrick Exp $
 
 .include <bsd.own.mk>
 
 NOPROG=	lldb
 BINDIR=	/usr/bin
 LIBEXECDIR=/usr/libexec
+
 SRCS=	Driver.cpp \
 	Platform.cpp \
 	lldb.cpp
@@ -14,9 +15,9 @@ LDADD+=		-lcurses -ledit -lpanel
 CPPFLAGS+=	${LLDB_INCLUDES}
 CPPFLAGS+=	${CLANG_INCLUDES}
 
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/source
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/tools/driver
-.PATH:	${.CURDIR}/../../../llvm/tools/lldb/docs
+.PATH:	${.CURDIR}/../../../llvm/lldb/source
+.PATH:	${.CURDIR}/../../../llvm/lldb/tools/driver
+.PATH:	${.CURDIR}/../../../llvm/lldb/docs
 
 LLVM_LIBDEPS=	clangAST \
 		clangAnalysis \
diff --git a/gnu/usr.bin/clang/lldb/lldb.1 b/gnu/usr.bin/clang/lldb/lldb.1
new file mode 100644
index 00000000000..a941b8e2aa2
--- /dev/null
+++ b/gnu/usr.bin/clang/lldb/lldb.1
@@ -0,0 +1,408 @@
+.\" Man page generated from reStructuredText.
+.
+.TH "LLDB" "1" "Jun 15, 2020" "8" "LLDB"
+.SH NAME
+lldb \- LLDB Documentation
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.SH SYNOPSIS
+.nf
+\fBlldb\fP [\fIoptions\fP] \fIexecutable\fP
+.fi
+.sp
+.SH DESCRIPTION
+.sp
+\fBlldb\fP is a next generation, high\-performance debugger. It is built as
+a set of reusable components which highly leverage existing libraries in the
+larger LLVM Project, such as the Clang expression parser and LLVM disassembler.
+.sp
+\fBlldb\fP is the default debugger in Xcode on macOS and supports
+debugging C, Objective\-C and C++ on the desktop and iOS devices and simulator.
+.sp
+All of the code in the LLDB project is available under the Apache 2.0 License
+with LLVM exceptions.
+.SH ATTACHING
+.INDENT 0.0
+.TP
+.B \-\-attach\-name <name>
+Tells the debugger to attach to a process with the given name.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-attach\-pid <pid>
+Tells the debugger to attach to a process with the given pid.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-n <value>
+Alias for \-\-attach\-name
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-p <value>
+Alias for \-\-attach\-pid
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-wait\-for
+Tells the debugger to wait for a process with the given pid or name to launch before attaching.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-w
+Alias for \-\-wait\-for
+.UNINDENT
+.SH COMMANDS
+.INDENT 0.0
+.TP
+.B \-\-batch
+Tells the debugger to run the commands from \-s, \-S, \-o & \-O, and then quit.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-b
+Alias for \-\-batch
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-K <value>
+Alias for \-\-source\-on\-crash
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-k <value>
+Alias for \-\-one\-line\-on\-crash
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-local\-lldbinit
+Allow the debugger to parse the .lldbinit files in the current working directory, unless \-\-no\-lldbinit is passed.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-no\-lldbinit
+Do not automatically parse any \(aq.lldbinit\(aq files.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-one\-line\-before\-file <command>
+Tells the debugger to execute this one\-line lldb command before any file provided on the command line has been loaded.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-one\-line\-on\-crash <command>
+When in batch mode, tells the debugger to run this one\-line lldb command if the target crashes.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-one\-line <command>
+Tells the debugger to execute this one\-line lldb command after any file provided on the command line has been loaded.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-O <value>
+Alias for \-\-one\-line\-before\-file
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-o <value>
+Alias for \-\-one\-line
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-Q
+Alias for \-\-source\-quietly
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-source\-before\-file <file>
+Tells the debugger to read in and execute the lldb commands in the given file, before any file has been loaded.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-source\-on\-crash <file>
+When in batch mode, tells the debugger to source this file of lldb commands if the target crashes.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-source\-quietly
+Tells the debugger to execute this one\-line lldb command before any file has been loaded.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-source <file>
+Tells the debugger to read in and execute the lldb commands in the given file, after any file has been loaded.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-S <value>
+Alias for \-\-source\-before\-file
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-s <value>
+Alias for \-\-source
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-x
+Alias for \-\-no\-lldbinit
+.UNINDENT
+.SH OPTIONS
+.INDENT 0.0
+.TP
+.B \-\-arch <architecture>
+Tells the debugger to use the specified architecture when starting and running the program.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-a <value>
+Alias for \-\-arch
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-capture\-path <filename>
+Tells the debugger to use the given filename for the reproducer.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-capture
+Tells the debugger to capture a reproducer.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-core <filename>
+Tells the debugger to use the full path to <filename> as the core file.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-c <value>
+Alias for \-\-core
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-debug
+Tells the debugger to print out extra information for debugging itself.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-d
+Alias for \-\-debug
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-editor
+Tells the debugger to open source files using the host\(aqs "external editor" mechanism.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-e
+Alias for \-\-editor
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-file <filename>
+Tells the debugger to use the file <filename> as the program to be debugged.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-f <value>
+Alias for \-\-file
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-help
+Prints out the usage information for the LLDB debugger.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-h
+Alias for \-\-help
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-no\-use\-colors
+Do not use colors.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-replay <filename>
+Tells the debugger to replay a reproducer from <filename>.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-version
+Prints out the current version number of the LLDB debugger.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-v
+Alias for \-\-version
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-X
+Alias for \-\-no\-use\-color
+.UNINDENT
+.SH REPL
+.INDENT 0.0
+.TP
+.B \-r=<flags>
+Alias for \-\-repl=<flags>
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-repl\-language <language>
+Chooses the language for the REPL.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-repl=<flags>
+Runs lldb in REPL mode with a stub process with the given flags.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-R <value>
+Alias for \-\-repl\-language
+.UNINDENT
+.SH SCRIPTING
+.INDENT 0.0
+.TP
+.B \-l <value>
+Alias for \-\-script\-language
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-python\-path
+Prints out the path to the lldb.py file for this version of lldb.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-P
+Alias for \-\-python\-path
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-script\-language <language>
+Tells the debugger to use the specified scripting language for user\-defined scripts.
+.UNINDENT
+.SH EXAMPLES
+.sp
+The debugger can be started in several modes.
+.sp
+Passing an executable as a positional argument prepares \fBlldb\fP to
+debug the given executable. Arguments passed after \-\- are considered arguments
+to the debugged executable.
+.INDENT 0.0
+.INDENT 3.5
+lldb \-\-arch x86_64 /path/to/program \-\- \-\-arch arvm7
+.UNINDENT
+.UNINDENT
+.sp
+Passing one of the attach options causes \fBlldb\fP to immediately attach
+to the given process.
+.INDENT 0.0
+.INDENT 3.5
+lldb \-p <pid>
+lldb \-n <process\-name>
+.UNINDENT
+.UNINDENT
+.sp
+Passing \-\-repl starts \fBlldb\fP in REPL mode.
+.INDENT 0.0
+.INDENT 3.5
+lldb \-r
+.UNINDENT
+.UNINDENT
+.sp
+Passing \-\-core causes \fBlldb\fP to debug the core file.
+.INDENT 0.0
+.INDENT 3.5
+lldb \-c /path/to/core
+.UNINDENT
+.UNINDENT
+.sp
+Command options can be combined with these modes and cause \fBlldb\fP to
+run the specified commands before or after events, like loading the file or
+crashing, in the order provided on the command line.
+.INDENT 0.0
+.INDENT 3.5
+lldb \-O \(aqsettings set stop\-disassembly\-count 20\(aq \-o \(aqrun\(aq \-o \(aqbt\(aq
+lldb \-S /source/before/file \-s /source/after/file
+lldb \-K /source/before/crash \-k /source/after/crash
+.UNINDENT
+.UNINDENT
+.sp
+Note: In REPL mode no file is loaded, so commands specified to run after
+loading the file (via \-o or \-s) will be ignored.
+.SH USING LLDB
+.sp
+In \fBlldb\fP there is a help command which can be used to find
+descriptions and examples of all \fBlldb\fP commands.  To get help on
+"breakpoint set" you would type "help breakpoint set".
+.sp
+There is also an apropos command which will search the help text of all
+commands for a given term ‐‐ this is useful for locating a command by topic.
+For instance, "apropos breakpoint" will list any command that has the word
+"breakpoint" in its help text.
+.SH CONFIGURATION FILES
+.sp
+\fBlldb\fP reads things like settings, aliases and commands from the
+.lldbinit file. It will first look for ~/.lldbinit and load that first.
+Secondly, it will look for an .lldbinit file in the current working directory.
+For security reasons, \fBlldb\fP will print a warning and not source this
+file by default. This behavior can be changed by changing the
+target.load\-cwd\-lldbinit setting.
+.sp
+To always load the .lldbinit file in the current working directory, add the
+following command to ~/.lldbinit:
+.INDENT 0.0
+.INDENT 3.5
+settings set target.load\-cwd\-lldbinit true
+.UNINDENT
+.UNINDENT
+.sp
+To never load the .lldbinit file in the current working directory and silence
+the warning, add the following command to ~/.lldbinit:
+.INDENT 0.0
+.INDENT 3.5
+settings set target.load\-cwd\-lldbinit false
+.UNINDENT
+.UNINDENT
+.SH SEE ALSO
+.sp
+The LLDB project page \fI\%https://lldb.llvm.org\fP has many different resources
+for \fBlldb\fP users ‐‐ the gdb/lldb command equivalence page
+\fI\%https://lldb.llvm.org/use/map.html\fP can be especially helpful for users
+coming from gdb.
+.SH AUTHOR
+LLVM project
+.SH COPYRIGHT
+2007-2020, The LLDB Team
+.\" Generated by docutils manpage writer.
+.
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>
 
diff --git a/gnu/usr.bin/clang/llvm-tblgen/Makefile b/gnu/usr.bin/clang/llvm-tblgen/Makefile
index 98713a291f1..664dafc70bf 100644
--- a/gnu/usr.bin/clang/llvm-tblgen/Makefile
+++ b/gnu/usr.bin/clang/llvm-tblgen/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2019/06/23 22:07:45 patrick Exp $
+# $OpenBSD: Makefile,v 1.11 2020/08/03 14:45:31 patrick Exp $
 
 PROG=	llvm-tblgen
 NOMAN=
@@ -11,6 +11,7 @@ SRCS=	AsmMatcherEmitter.cpp \
 	CTagsEmitter.cpp \
 	CallingConvEmitter.cpp \
 	CodeEmitterGen.cpp \
+	CodeExpander.cpp \
 	CodeGenDAGPatterns.cpp \
 	CodeGenHwModes.cpp \
 	CodeGenInstruction.cpp \
@@ -23,17 +24,28 @@ SRCS=	AsmMatcherEmitter.cpp \
 	DAGISelMatcherGen.cpp \
 	DAGISelMatcherOpt.cpp \
 	DAGISelMatcher.cpp \
+	DFAEmitter.cpp \
 	DFAPacketizerEmitter.cpp \
 	DisassemblerEmitter.cpp \
 	ExegesisEmitter.cpp \
 	FastISelEmitter.cpp \
 	FixedLenDecoderEmitter.cpp \
+	GICombinerEmitter.cpp \
+	GIMatchDag.cpp \
+	GIMatchDagEdge.cpp \
+	GIMatchDagInstr.cpp \
+	GIMatchDagOperands.cpp \
+	GIMatchDagPredicate.cpp \
+	GIMatchDagPredicateDependencyEdge.cpp \
+	GIMatchTree.cpp \
 	GlobalISelEmitter.cpp \
 	InfoByHwMode.cpp \
 	InstrDocsEmitter.cpp \
 	InstrInfoEmitter.cpp \
 	IntrinsicEmitter.cpp \
+	OptEmitter.cpp \
 	OptParserEmitter.cpp \
+	OptRSTEmitter.cpp \
 	PredicateExpander.cpp \
 	PseudoLoweringEmitter.cpp \
 	RISCVCompressInstEmitter.cpp \
@@ -52,7 +64,8 @@ SRCS=	AsmMatcherEmitter.cpp \
 	X86ModRMFilters.cpp \
 	X86RecognizableInstr.cpp
 
-.PATH:	${.CURDIR}/../../../llvm/utils/TableGen
+.PATH:	${.CURDIR}/../../../llvm/llvm/utils/TableGen
+.PATH:	${.CURDIR}/../../../llvm/llvm/utils/TableGen/GlobalISel
 
 LLVM_LIBDEPS=	LLVMTableGen LLVMSupport
author	patrick <patrick@openbsd.org>	2020-08-03 14:45:22 +0000
committer	patrick <patrick@openbsd.org>	2020-08-03 14:45:22 +0000
commit	aa1fa3d4849d8c6172fb7a884e8fa612b2ab7385 (patch)
tree	e5a6c06e6050389a3a59e70ad18bf927de2a901f
parent	Import LLVM 10.0.0 release including clang, lld and lldb. (diff)
download	wireguard-openbsd-aa1fa3d4849d8c6172fb7a884e8fa612b2ab7385.tar.xz wireguard-openbsd-aa1fa3d4849d8c6172fb7a884e8fa612b2ab7385.zip