Update to a new snapshot.

Pull in fixes for building with all options disabled and python > 3.6.

Sponsored by:	DARPA, AFRL

6 files changed, 88 insertions, 58 deletions

diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile
index 42be2c561922..e83b56462d14 100644
--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	llvm
 PORTVERSION=	${LLVM_MAJOR}.0.d${SNAPDATE}
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	devel lang
 PKGNAMESUFFIX=	-devel
 
@@ -27,20 +27,9 @@ BUILD_DEPENDS=
 USES=		cmake compiler:c++11-lib libedit perl5 \
 		shebangfix
 USE_LDCONFIG=	${LLVM_PREFIX}/lib
-_USES_PYTHON?=	python:build,3.6
+_USES_PYTHON?=	python:build,3.6+
 USES+=		${_USES_PYTHON}
-SHEBANG_FILES=	utils/lit/lit.py utils/llvm-lit/llvm-lit.in \
-		tools/clang/utils/hmaptool/hmaptool \
-		tools/clang/tools/scan-view/bin/scan-view \
-		tools/clang/tools/clang-format/git-clang-format \
-		tools/clang/tools/clang-format/clang-format-diff.py \
-		tools/clang/tools/extra/clang-tidy/tool/clang-tidy-diff.py \
-		tools/clang/tools/extra/clang-tidy/tool/run-clang-tidy.py \
-		tools/clang/tools/extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py \
-		tools/opt-viewer/optrecord.py \
-		tools/opt-viewer/opt-diff.py \
-		tools/opt-viewer/opt-stats.py \
-		tools/opt-viewer/opt-viewer.py
+SHEBANG_FILES=	utils/lit/lit.py utils/llvm-lit/llvm-lit.in
 
 SUB_FILES=	llvm-wrapper.sh
 SUB_LIST=	LLVM_PREFIX="${LLVM_PREFIX}" LLVM_SUFFIX="${LLVM_SUFFIX}"
@@ -57,6 +46,10 @@ CMAKE_ARGS+=	-DLLVM_HOST_TRIPLE=${CONFIGURE_TARGET}
 # redefine CMAKE_INSTALL_MANDIR
 CMAKE_ARGS+=	-DCMAKE_INSTALL_MANDIR:PATH="share/man"
 CMAKE_ARGS+=	-DLLVM_PARALLEL_LINK_JOBS=1
+CMAKE_ARGS+=	-DLLVM_ENABLE_Z3_SOLVER=OFF
+CMAKE_ARGS+=	-DPYTHON_EXECUTABLE=${PYTHON_CMD} \
+		-DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDEDIR} \
+		-DPYTHON_LIBRARY=${LOCALBASE}/lib/lib${PYTHON_VERSION}m.so
 
 # Disable assertions.  They should be disabled by cmake, but USES=cmake
 # overrides -DCMAKE_*_FLAGS_RELEASE.
@@ -111,7 +104,6 @@ EXTRAS_GH_PROJECT=	clang-tools-extra:extras
 EXTRAS_GH_SUBDIR=	tools/clang/tools/extra:extras
 EXTRAS_GH_TAGNAME=	${EXTRAS_COMMIT}:extras
 LIT_DESC=		Install lit and FileCheck test tools
-LIT_LIB_DEPENDS=	libz3.so:math/z3
 LLD_DESC=		Install lld, the LLVM linker
 LLD_GH_PROJECT=		lld:lld
 LLD_GH_SUBDIR=		tools/lld:lld
@@ -124,7 +116,7 @@ LLDB_GH_SUBDIR=		tools/lldb:lldb
 LLDB_GH_TAGNAME=	${LLDB_COMMIT}:lldb
 LLDB_IMPLIES=		CLANG
 LLDB_PORTDOCS=		lldb
-LLDB_VARS=		_USES_PYTHON=python:3.6
+LLDB_VARS=		_USES_PYTHON=python:3.6+
 OPENMP_DESC=		Install libomp, the LLVM OpenMP runtime library
 OPENMP_CONFLICTS_INSTALL=	libiomp5-devel-*
 OPENMP_GH_PROJECT=	openmp:openmp
@@ -222,7 +214,11 @@ COMMANDS+=	${CLANG_COMMANDS}
 MAN1SRCS+=	clang.1 \
 		diagtool.1 \
 		scan-build.1
-CLANG_PATTERN=	(c-index-test|clang|scan-|Reporter.py|ScanView.py|scanview.css|sorttable.js|startfile.py|-analyzer)
+CLANG_PATTERN=	(c-index-test|clang|diagtool|hmaptool|scan-|Reporter.py|ScanView.py|scanview.css|sorttable.js|startfile.py|-analyzer)
+SHEBANG_FILES+= tools/clang/tools/clang-format/git-clang-format \
+		tools/clang/tools/clang-format/clang-format-diff.py \
+		tools/clang/tools/scan-view/bin/scan-view \
+		tools/clang/utils/hmaptool/hmaptool
 USES+=	gnome
 .endif
 
@@ -234,6 +230,9 @@ COMPILER_RT_PATTERN=	(sanitizer|include.xray)
 COMMANDS+=	${EXTRAS_COMMANDS}
 MAN1SRCS+=	extraclangtools.1
 PORTDOCS+=	clang-tools
+SHEBANG_FILES+=	tools/clang/tools/extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py \
+		tools/clang/tools/extra/clang-tidy/tool/clang-tidy-diff.py \
+		tools/clang/tools/extra/clang-tidy/tool/run-clang-tidy.py
 .endif
 
 .if ${PORT_OPTIONS:MLIT}
diff --git a/devel/llvm-devel/Makefile.COMMANDS b/devel/llvm-devel/Makefile.COMMANDS
index c52fc7d5e0de..52db276db72c 100644
--- a/devel/llvm-devel/Makefile.COMMANDS
+++ b/devel/llvm-devel/Makefile.COMMANDS
@@ -39,6 +39,7 @@ LLVM_COMMANDS=	\
 		llvm-rc \
 		llvm-readelf \
 		llvm-readobj \
+		llvm-reduce \
 		llvm-rtdyld \
 		llvm-size \
 		llvm-split \
@@ -97,6 +98,5 @@ LLDB_COMMANDS=	\
 		lldb \
 		lldb-argdumper \
 		lldb-instr \
-		lldb-mi \
 		lldb-server \
 		lldb-vscode
diff --git a/devel/llvm-devel/Makefile.snapshot b/devel/llvm-devel/Makefile.snapshot
index 3e0af0cb2832..8495e55e4370 100644
--- a/devel/llvm-devel/Makefile.snapshot
+++ b/devel/llvm-devel/Makefile.snapshot
@@ -4,14 +4,14 @@
 #
 # Generated by: files/gen-Makefile.snapshot.sh.
 #
-LLVM_MAJOR=	9
+LLVM_MAJOR=	10
 LLVM_RELEASE=	${LLVM_MAJOR}.0.0
-SNAPDATE=	20190712
+SNAPDATE=	20190821
 
-LLVM_COMMIT=		a8d9670f9d36415bae76d3dbaf8f648a2bb87c05
-CLANG_COMMIT=		de63fff9046d6771c5093d36f2e83ec4e9721153
-COMPILER_RT_COMMIT=	8f4dd24187bc77ca8c59ba6c7b50cd82fea5e373
-EXTRAS_COMMIT=		41581f29187ffcf3c90e6a9fad9a13844746711b
-LLD_COMMIT=		5bdcbbbd7ef13d4d3b223883926f903bfe6d4e3e
-LLDB_COMMIT=		e8fcd272823538d548425ed2e902347010d908a0
-OPENMP_COMMIT=		bb2634a97ed88cd542993339e10bbc98ffa37e41
+LLVM_COMMIT=		0b762696b2473cab574ad3a7822c0b5449b6fb54
+CLANG_COMMIT=		a19ba5238e9f864ab20cafad1cf8c5e09e394dc5
+COMPILER_RT_COMMIT=	e52749ced386eadf7efe931910f38747ec690ff6
+EXTRAS_COMMIT=		0b2126922b9db7490cc94c7706a82308f211fa60
+LLD_COMMIT=		51ec494940928b4442399977cb56f87b1bdec435
+LLDB_COMMIT=		054f396e52a944075687c3b863dc5cfb1ebafb6b
+OPENMP_COMMIT=		3f4c51a258bcfbf588265dd6e80726c67305f8eb
diff --git a/devel/llvm-devel/distinfo b/devel/llvm-devel/distinfo
index ce17077f80fc..15edb1ade271 100644
--- a/devel/llvm-devel/distinfo
+++ b/devel/llvm-devel/distinfo
@@ -1,15 +1,15 @@
-TIMESTAMP = 1562961712
-SHA256 (llvm-mirror-llvm-9.0.d20190712-a8d9670f9d36415bae76d3dbaf8f648a2bb87c05_GH0.tar.gz) = 89ed446a21f8fccdbfbd16b95cef1f89c03db16794ed2112ee4377db11b177d5
-SIZE (llvm-mirror-llvm-9.0.d20190712-a8d9670f9d36415bae76d3dbaf8f648a2bb87c05_GH0.tar.gz) = 49961695
-SHA256 (llvm-mirror-clang-de63fff9046d6771c5093d36f2e83ec4e9721153_GH0.tar.gz) = 3109bb5462701da8696a0eb1852f30b5aa937e0392708a0ebf4a00e1b3317630
-SIZE (llvm-mirror-clang-de63fff9046d6771c5093d36f2e83ec4e9721153_GH0.tar.gz) = 19018458
-SHA256 (llvm-mirror-compiler-rt-8f4dd24187bc77ca8c59ba6c7b50cd82fea5e373_GH0.tar.gz) = 2c54e465e15bda80be2be4d7320f49b502f73d798041e3f1f29621c75166c097
-SIZE (llvm-mirror-compiler-rt-8f4dd24187bc77ca8c59ba6c7b50cd82fea5e373_GH0.tar.gz) = 3404838
-SHA256 (llvm-mirror-clang-tools-extra-41581f29187ffcf3c90e6a9fad9a13844746711b_GH0.tar.gz) = 41cd4cde1daac628a984c9a63a624ba704f654d4a4b1293dba6f81384699e5c1
-SIZE (llvm-mirror-clang-tools-extra-41581f29187ffcf3c90e6a9fad9a13844746711b_GH0.tar.gz) = 2630440
-SHA256 (llvm-mirror-lld-5bdcbbbd7ef13d4d3b223883926f903bfe6d4e3e_GH0.tar.gz) = 5ff22ba409d491a60af6bb0e038e40d32607bdfd6a3466f2eae2fb413e136d1f
-SIZE (llvm-mirror-lld-5bdcbbbd7ef13d4d3b223883926f903bfe6d4e3e_GH0.tar.gz) = 1530100
-SHA256 (llvm-mirror-lldb-e8fcd272823538d548425ed2e902347010d908a0_GH0.tar.gz) = 0f91563050fdffe707a077f5fad942ca7d342ae7059622fcae40510226a112d7
-SIZE (llvm-mirror-lldb-e8fcd272823538d548425ed2e902347010d908a0_GH0.tar.gz) = 13669755
-SHA256 (llvm-mirror-openmp-bb2634a97ed88cd542993339e10bbc98ffa37e41_GH0.tar.gz) = 8c7896a707d0d36f1fcb817d2e505dd02f44d9253846c970c8b3fbee44d3bab9
-SIZE (llvm-mirror-openmp-bb2634a97ed88cd542993339e10bbc98ffa37e41_GH0.tar.gz) = 1495942
+TIMESTAMP = 1566379315
+SHA256 (llvm-mirror-llvm-10.0.d20190821-0b762696b2473cab574ad3a7822c0b5449b6fb54_GH0.tar.gz) = 863200c62a94accec000b334c369550c294ce2f4e93a14cf9121de899fe8f4c0
+SIZE (llvm-mirror-llvm-10.0.d20190821-0b762696b2473cab574ad3a7822c0b5449b6fb54_GH0.tar.gz) = 50367568
+SHA256 (llvm-mirror-clang-a19ba5238e9f864ab20cafad1cf8c5e09e394dc5_GH0.tar.gz) = f7bb218b0424adc9ca369377dfc4f229be795f55242665361b650cabdce1d5d7
+SIZE (llvm-mirror-clang-a19ba5238e9f864ab20cafad1cf8c5e09e394dc5_GH0.tar.gz) = 19196755
+SHA256 (llvm-mirror-compiler-rt-e52749ced386eadf7efe931910f38747ec690ff6_GH0.tar.gz) = d7975026edea6fa39ed04ebe67d1ad25926280dce0c5963aeb7219d53a1972f8
+SIZE (llvm-mirror-compiler-rt-e52749ced386eadf7efe931910f38747ec690ff6_GH0.tar.gz) = 3418990
+SHA256 (llvm-mirror-clang-tools-extra-0b2126922b9db7490cc94c7706a82308f211fa60_GH0.tar.gz) = 2317d32f9ee4de973615a4ee1e33e7872c020a227468cb23861ab5510914d25a
+SIZE (llvm-mirror-clang-tools-extra-0b2126922b9db7490cc94c7706a82308f211fa60_GH0.tar.gz) = 2693712
+SHA256 (llvm-mirror-lld-51ec494940928b4442399977cb56f87b1bdec435_GH0.tar.gz) = 7b36e4efeeaa8e7cab0489d229ac61510018844e85422c91f38a19341b0a3692
+SIZE (llvm-mirror-lld-51ec494940928b4442399977cb56f87b1bdec435_GH0.tar.gz) = 1548455
+SHA256 (llvm-mirror-lldb-054f396e52a944075687c3b863dc5cfb1ebafb6b_GH0.tar.gz) = b91c1aac1015ce86d535da6b6f057e046160b5d6dd68009f42553e4947636a7f
+SIZE (llvm-mirror-lldb-054f396e52a944075687c3b863dc5cfb1ebafb6b_GH0.tar.gz) = 13305676
+SHA256 (llvm-mirror-openmp-3f4c51a258bcfbf588265dd6e80726c67305f8eb_GH0.tar.gz) = ab1db327f4b43eeeb3ce14041790f971037f472fc6ae339488aafb36635246b0
+SIZE (llvm-mirror-openmp-3f4c51a258bcfbf588265dd6e80726c67305f8eb_GH0.tar.gz) = 1472426
diff --git a/devel/llvm-devel/files/gen-Makefile.snapshot.sh b/devel/llvm-devel/files/gen-Makefile.snapshot.sh
index 03274249197c..5d626af5fb55 100644
--- a/devel/llvm-devel/files/gen-Makefile.snapshot.sh
+++ b/devel/llvm-devel/files/gen-Makefile.snapshot.sh
@@ -17,7 +17,7 @@ cat <<EOF > Makefile.snapshot
 #
 # Generated by: files/gen-Makefile.snapshot.sh.
 #
-LLVM_MAJOR=	9
+LLVM_MAJOR=	10
 LLVM_RELEASE=	\${LLVM_MAJOR}.0.0
 SNAPDATE=	$(date +%Y%m%d)
 
diff --git a/devel/llvm-devel/pkg-plist b/devel/llvm-devel/pkg-plist
index 7397b62a6dfb..6bd8909e6ccb 100644
--- a/devel/llvm-devel/pkg-plist
+++ b/devel/llvm-devel/pkg-plist
@@ -38,6 +38,7 @@ bin/llvm-ranlib-devel
 bin/llvm-rc-devel
 bin/llvm-readelf-devel
 bin/llvm-readobj-devel
+bin/llvm-reduce-devel
 bin/llvm-rtdyld-devel
 bin/llvm-size-devel
 bin/llvm-split-devel
@@ -61,8 +62,8 @@ bin/sancov-devel
 %%CLANG%%bin/clang-offload-bundler-devel
 %%CLANG%%bin/clang-scan-deps-devel
 %%CLANG%%bin/clangd-devel
-bin/diagtool-devel
-bin/hmaptool-devel
+%%CLANG%%bin/diagtool-devel
+%%CLANG%%bin/hmaptool-devel
 %%CLANG%%bin/scan-build-devel
 %%CLANG%%bin/scan-view-devel
 %%EXTRAS%%bin/clang-apply-replacements-devel
@@ -83,7 +84,6 @@ bin/hmaptool-devel
 %%LLDB%%bin/lldb-devel
 %%LLDB%%bin/lldb-argdumper-devel
 %%LLDB%%bin/lldb-instr-devel
-%%LLDB%%bin/lldb-mi-devel
 %%LLDB%%bin/lldb-server-devel
 %%LLDB%%bin/lldb-vscode-devel
 %%LIT%%bin/FileCheck-devel
@@ -132,11 +132,11 @@ llvm-devel/bin/bugpoint
 %%CLANG%%llvm-devel/bin/clang-scan-deps
 %%EXTRAS%%llvm-devel/bin/clang-tidy
 %%CLANG%%llvm-devel/bin/clangd
-llvm-devel/bin/diagtool
+%%CLANG%%llvm-devel/bin/diagtool
 llvm-devel/bin/dsymutil
 %%EXTRAS%%llvm-devel/bin/find-all-symbols
 %%CLANG%%llvm-devel/bin/git-clang-format
-llvm-devel/bin/hmaptool
+%%CLANG%%llvm-devel/bin/hmaptool
 %%LLD%%llvm-devel/bin/ld.lld
 %%LLD%%llvm-devel/bin/ld64.lld
 llvm-devel/bin/llc
@@ -145,7 +145,6 @@ llvm-devel/bin/llc
 %%LLDB%%llvm-devel/bin/lldb
 %%LLDB%%llvm-devel/bin/lldb-argdumper
 %%LLDB%%llvm-devel/bin/lldb-instr
-%%LLDB%%llvm-devel/bin/lldb-mi
 %%LLDB%%llvm-devel/bin/lldb-server
 %%LLDB%%llvm-devel/bin/lldb-vscode
 llvm-devel/bin/lli
@@ -190,6 +189,7 @@ llvm-devel/bin/llvm-ranlib
 llvm-devel/bin/llvm-rc
 llvm-devel/bin/llvm-readelf
 llvm-devel/bin/llvm-readobj
+llvm-devel/bin/llvm-reduce
 llvm-devel/bin/llvm-rtdyld
 llvm-devel/bin/llvm-size
 llvm-devel/bin/llvm-split
@@ -380,6 +380,7 @@ llvm-devel/bin/yaml2obj
 %%CLANG%%llvm-devel/include/clang/Analysis/RetainSummaryManager.h
 %%CLANG%%llvm-devel/include/clang/Analysis/SelectorExtras.h
 %%CLANG%%llvm-devel/include/clang/Analysis/Support/BumpVector.h
+%%CLANG%%llvm-devel/include/clang/Basic/AArch64SVEACLETypes.def
 %%CLANG%%llvm-devel/include/clang/Basic/ABI.h
 %%CLANG%%llvm-devel/include/clang/Basic/AddressSpaces.h
 %%CLANG%%llvm-devel/include/clang/Basic/AlignedAllocation.h
@@ -458,6 +459,8 @@ llvm-devel/bin/yaml2obj
 %%CLANG%%llvm-devel/include/clang/Basic/Lambda.h
 %%CLANG%%llvm-devel/include/clang/Basic/LangOptions.def
 %%CLANG%%llvm-devel/include/clang/Basic/LangOptions.h
+%%CLANG%%llvm-devel/include/clang/Basic/LangStandard.h
+%%CLANG%%llvm-devel/include/clang/Basic/LangStandards.def
 %%CLANG%%llvm-devel/include/clang/Basic/Linkage.h
 %%CLANG%%llvm-devel/include/clang/Basic/MSP430Target.def
 %%CLANG%%llvm-devel/include/clang/Basic/MacroBuilder.h
@@ -514,6 +517,7 @@ llvm-devel/bin/yaml2obj
 %%CLANG%%llvm-devel/include/clang/Config/config.h
 %%CLANG%%llvm-devel/include/clang/CrossTU/CrossTUDiagnostic.h
 %%CLANG%%llvm-devel/include/clang/CrossTU/CrossTranslationUnit.h
+%%CLANG%%llvm-devel/include/clang/DirectoryWatcher/DirectoryWatcher.h
 %%CLANG%%llvm-devel/include/clang/Driver/Action.h
 %%CLANG%%llvm-devel/include/clang/Driver/Compilation.h
 %%CLANG%%llvm-devel/include/clang/Driver/DarwinSDKInfo.h
@@ -551,8 +555,6 @@ llvm-devel/bin/yaml2obj
 %%CLANG%%llvm-devel/include/clang/Frontend/FrontendDiagnostic.h
 %%CLANG%%llvm-devel/include/clang/Frontend/FrontendOptions.h
 %%CLANG%%llvm-devel/include/clang/Frontend/FrontendPluginRegistry.h
-%%CLANG%%llvm-devel/include/clang/Frontend/LangStandard.h
-%%CLANG%%llvm-devel/include/clang/Frontend/LangStandards.def
 %%CLANG%%llvm-devel/include/clang/Frontend/LayoutOverrideSource.h
 %%CLANG%%llvm-devel/include/clang/Frontend/LogDiagnosticPrinter.h
 %%CLANG%%llvm-devel/include/clang/Frontend/MigratorOptions.h
@@ -741,6 +743,8 @@ llvm-devel/bin/yaml2obj
 %%CLANG%%llvm-devel/include/clang/Tooling/Core/Diagnostic.h
 %%CLANG%%llvm-devel/include/clang/Tooling/Core/Lookup.h
 %%CLANG%%llvm-devel/include/clang/Tooling/Core/Replacement.h
+%%CLANG%%llvm-devel/include/clang/Tooling/DependencyScanning/DependencyScanningFilesystem.h
+%%CLANG%%llvm-devel/include/clang/Tooling/DependencyScanning/DependencyScanningService.h
 %%CLANG%%llvm-devel/include/clang/Tooling/DependencyScanning/DependencyScanningWorker.h
 %%CLANG%%llvm-devel/include/clang/Tooling/DiagnosticsYaml.h
 %%CLANG%%llvm-devel/include/clang/Tooling/Execution.h
@@ -753,6 +757,7 @@ llvm-devel/bin/yaml2obj
 %%CLANG%%llvm-devel/include/clang/Tooling/Refactoring/ASTSelection.h
 %%CLANG%%llvm-devel/include/clang/Tooling/Refactoring/AtomicChange.h
 %%CLANG%%llvm-devel/include/clang/Tooling/Refactoring/Extract/Extract.h
+%%CLANG%%llvm-devel/include/clang/Tooling/Refactoring/Extract/SourceExtraction.h
 %%CLANG%%llvm-devel/include/clang/Tooling/Refactoring/RangeSelector.h
 %%CLANG%%llvm-devel/include/clang/Tooling/Refactoring/RecursiveSymbolVisitor.h
 %%CLANG%%llvm-devel/include/clang/Tooling/Refactoring/RefactoringAction.h
@@ -784,6 +789,7 @@ llvm-devel/bin/yaml2obj
 %%CLANG%%llvm-devel/include/clang/Tooling/Syntax/Tree.h
 %%CLANG%%llvm-devel/include/clang/Tooling/ToolExecutorPluginRegistry.h
 %%CLANG%%llvm-devel/include/clang/Tooling/Tooling.h
+llvm-devel/include/fuzzer/FuzzedDataProvider.h
 %%LLD%%llvm-devel/include/lld/Common/Args.h
 %%LLD%%llvm-devel/include/lld/Common/Driver.h
 %%LLD%%llvm-devel/include/lld/Common/ErrorHandler.h
@@ -1176,9 +1182,7 @@ llvm-devel/bin/yaml2obj
 %%LLDB%%llvm-devel/include/lldb/Symbol/UnwindTable.h
 %%LLDB%%llvm-devel/include/lldb/Symbol/Variable.h
 %%LLDB%%llvm-devel/include/lldb/Symbol/VariableList.h
-%%LLDB%%llvm-devel/include/lldb/Symbol/VerifyDecl.h
 %%LLDB%%llvm-devel/include/lldb/Target/ABI.h
-%%LLDB%%llvm-devel/include/lldb/Target/CPPLanguageRuntime.h
 %%LLDB%%llvm-devel/include/lldb/Target/DynamicLoader.h
 %%LLDB%%llvm-devel/include/lldb/Target/ExecutionContext.h
 %%LLDB%%llvm-devel/include/lldb/Target/ExecutionContextScope.h
@@ -1192,7 +1196,6 @@ llvm-devel/bin/yaml2obj
 %%LLDB%%llvm-devel/include/lldb/Target/MemoryHistory.h
 %%LLDB%%llvm-devel/include/lldb/Target/MemoryRegionInfo.h
 %%LLDB%%llvm-devel/include/lldb/Target/ModuleCache.h
-%%LLDB%%llvm-devel/include/lldb/Target/ObjCLanguageRuntime.h
 %%LLDB%%llvm-devel/include/lldb/Target/OperatingSystem.h
 %%LLDB%%llvm-devel/include/lldb/Target/PathMappingList.h
 %%LLDB%%llvm-devel/include/lldb/Target/Platform.h
@@ -1258,7 +1261,6 @@ llvm-devel/bin/yaml2obj
 %%LLDB%%llvm-devel/include/lldb/Utility/Endian.h
 %%LLDB%%llvm-devel/include/lldb/Utility/Environment.h
 %%LLDB%%llvm-devel/include/lldb/Utility/Event.h
-%%LLDB%%llvm-devel/include/lldb/Utility/FileCollector.h
 %%LLDB%%llvm-devel/include/lldb/Utility/FileSpec.h
 %%LLDB%%llvm-devel/include/lldb/Utility/Flags.h
 %%LLDB%%llvm-devel/include/lldb/Utility/IOObject.h
@@ -1362,6 +1364,7 @@ llvm-devel/include/llvm/ADT/DenseMap.h
 llvm-devel/include/llvm/ADT/DenseMapInfo.h
 llvm-devel/include/llvm/ADT/DenseSet.h
 llvm-devel/include/llvm/ADT/DepthFirstIterator.h
+llvm-devel/include/llvm/ADT/DirectedGraph.h
 llvm-devel/include/llvm/ADT/EpochTracker.h
 llvm-devel/include/llvm/ADT/EquivalenceClasses.h
 llvm-devel/include/llvm/ADT/FoldingSet.h
@@ -1476,6 +1479,7 @@ llvm-devel/include/llvm/Analysis/Lint.h
 llvm-devel/include/llvm/Analysis/Loads.h
 llvm-devel/include/llvm/Analysis/LoopAccessAnalysis.h
 llvm-devel/include/llvm/Analysis/LoopAnalysisManager.h
+llvm-devel/include/llvm/Analysis/LoopCacheAnalysis.h
 llvm-devel/include/llvm/Analysis/LoopInfo.h
 llvm-devel/include/llvm/Analysis/LoopInfoImpl.h
 llvm-devel/include/llvm/Analysis/LoopIterator.h
@@ -1611,6 +1615,7 @@ llvm-devel/include/llvm/CodeGen/GlobalISel/CombinerHelper.h
 llvm-devel/include/llvm/CodeGen/GlobalISel/CombinerInfo.h
 llvm-devel/include/llvm/CodeGen/GlobalISel/ConstantFoldingMIRBuilder.h
 llvm-devel/include/llvm/CodeGen/GlobalISel/GISelChangeObserver.h
+llvm-devel/include/llvm/CodeGen/GlobalISel/GISelKnownBits.h
 llvm-devel/include/llvm/CodeGen/GlobalISel/GISelWorkList.h
 llvm-devel/include/llvm/CodeGen/GlobalISel/IRTranslator.h
 llvm-devel/include/llvm/CodeGen/GlobalISel/InstructionSelect.h
@@ -1892,10 +1897,12 @@ llvm-devel/include/llvm/DebugInfo/PDB/Native/HashTable.h
 llvm-devel/include/llvm/DebugInfo/PDB/Native/ISectionContribVisitor.h
 llvm-devel/include/llvm/DebugInfo/PDB/Native/InfoStream.h
 llvm-devel/include/llvm/DebugInfo/PDB/Native/InfoStreamBuilder.h
+llvm-devel/include/llvm/DebugInfo/PDB/Native/InjectedSourceStream.h
 llvm-devel/include/llvm/DebugInfo/PDB/Native/ModuleDebugStream.h
 llvm-devel/include/llvm/DebugInfo/PDB/Native/NamedStreamMap.h
 llvm-devel/include/llvm/DebugInfo/PDB/Native/NativeCompilandSymbol.h
 llvm-devel/include/llvm/DebugInfo/PDB/Native/NativeEnumGlobals.h
+llvm-devel/include/llvm/DebugInfo/PDB/Native/NativeEnumInjectedSources.h
 llvm-devel/include/llvm/DebugInfo/PDB/Native/NativeEnumModules.h
 llvm-devel/include/llvm/DebugInfo/PDB/Native/NativeEnumTypes.h
 llvm-devel/include/llvm/DebugInfo/PDB/Native/NativeExeSymbol.h
@@ -2012,9 +2019,12 @@ llvm-devel/include/llvm/ExecutionEngine/Orc/RPCUtils.h
 llvm-devel/include/llvm/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.h
 llvm-devel/include/llvm/ExecutionEngine/Orc/RawByteChannel.h
 llvm-devel/include/llvm/ExecutionEngine/Orc/RemoteObjectLayer.h
+llvm-devel/include/llvm/ExecutionEngine/Orc/SpeculateAnalyses.h
+llvm-devel/include/llvm/ExecutionEngine/Orc/Speculation.h
 llvm-devel/include/llvm/ExecutionEngine/Orc/SymbolStringPool.h
 llvm-devel/include/llvm/ExecutionEngine/Orc/ThreadSafeModule.h
 llvm-devel/include/llvm/ExecutionEngine/OrcMCJITReplacement.h
+llvm-devel/include/llvm/ExecutionEngine/OrcV1Deprecation.h
 llvm-devel/include/llvm/ExecutionEngine/RTDyldMemoryManager.h
 llvm-devel/include/llvm/ExecutionEngine/RuntimeDyld.h
 llvm-devel/include/llvm/ExecutionEngine/RuntimeDyldChecker.h
@@ -2053,6 +2063,7 @@ llvm-devel/include/llvm/IR/DiagnosticHandler.h
 llvm-devel/include/llvm/IR/DiagnosticInfo.h
 llvm-devel/include/llvm/IR/DiagnosticPrinter.h
 llvm-devel/include/llvm/IR/Dominators.h
+llvm-devel/include/llvm/IR/FixedMetadataKinds.def
 llvm-devel/include/llvm/IR/Function.h
 llvm-devel/include/llvm/IR/GVMaterializer.h
 llvm-devel/include/llvm/IR/GetElementPtrTypeIterator.h
@@ -2195,6 +2206,7 @@ llvm-devel/include/llvm/MC/MCParser/MCAsmParserExtension.h
 llvm-devel/include/llvm/MC/MCParser/MCAsmParserUtils.h
 llvm-devel/include/llvm/MC/MCParser/MCParsedAsmOperand.h
 llvm-devel/include/llvm/MC/MCParser/MCTargetAsmParser.h
+llvm-devel/include/llvm/MC/MCRegister.h
 llvm-devel/include/llvm/MC/MCRegisterInfo.h
 llvm-devel/include/llvm/MC/MCSchedule.h
 llvm-devel/include/llvm/MC/MCSection.h
@@ -2226,6 +2238,7 @@ llvm-devel/include/llvm/MC/MachineLocation.h
 llvm-devel/include/llvm/MC/SectionKind.h
 llvm-devel/include/llvm/MC/StringTableBuilder.h
 llvm-devel/include/llvm/MC/SubtargetFeature.h
+llvm-devel/include/llvm/MCA/CodeEmitter.h
 llvm-devel/include/llvm/MCA/Context.h
 llvm-devel/include/llvm/MCA/HWEventListener.h
 llvm-devel/include/llvm/MCA/HardwareUnits/HardwareUnit.h
@@ -2288,6 +2301,7 @@ llvm-devel/include/llvm/ObjectYAML/ObjectYAML.h
 llvm-devel/include/llvm/ObjectYAML/WasmYAML.h
 llvm-devel/include/llvm/ObjectYAML/XCOFFYAML.h
 llvm-devel/include/llvm/ObjectYAML/YAML.h
+llvm-devel/include/llvm/ObjectYAML/yaml2obj.h
 llvm-devel/include/llvm/Option/Arg.h
 llvm-devel/include/llvm/Option/ArgList.h
 llvm-devel/include/llvm/Option/OptParser.td
@@ -2314,10 +2328,14 @@ llvm-devel/include/llvm/ProfileData/ProfileCommon.h
 llvm-devel/include/llvm/ProfileData/SampleProf.h
 llvm-devel/include/llvm/ProfileData/SampleProfReader.h
 llvm-devel/include/llvm/ProfileData/SampleProfWriter.h
+llvm-devel/include/llvm/Remarks/BitstreamRemarkContainer.h
+llvm-devel/include/llvm/Remarks/BitstreamRemarkSerializer.h
 llvm-devel/include/llvm/Remarks/Remark.h
+llvm-devel/include/llvm/Remarks/RemarkFormat.h
 llvm-devel/include/llvm/Remarks/RemarkParser.h
 llvm-devel/include/llvm/Remarks/RemarkSerializer.h
 llvm-devel/include/llvm/Remarks/RemarkStringTable.h
+llvm-devel/include/llvm/Remarks/YAMLRemarkSerializer.h
 llvm-devel/include/llvm/Support/AArch64TargetParser.def
 llvm-devel/include/llvm/Support/AArch64TargetParser.h
 llvm-devel/include/llvm/Support/AMDGPUMetadata.h
@@ -2329,6 +2347,7 @@ llvm-devel/include/llvm/Support/ARMTargetParser.def
 llvm-devel/include/llvm/Support/ARMTargetParser.h
 llvm-devel/include/llvm/Support/ARMWinEH.h
 llvm-devel/include/llvm/Support/AlignOf.h
+llvm-devel/include/llvm/Support/Alignment.h
 llvm-devel/include/llvm/Support/Allocator.h
 llvm-devel/include/llvm/Support/ArrayRecycler.h
 llvm-devel/include/llvm/Support/Atomic.h
@@ -2375,6 +2394,7 @@ llvm-devel/include/llvm/Support/Error.h
 llvm-devel/include/llvm/Support/ErrorHandling.h
 llvm-devel/include/llvm/Support/ErrorOr.h
 llvm-devel/include/llvm/Support/FileCheck.h
+llvm-devel/include/llvm/Support/FileCollector.h
 llvm-devel/include/llvm/Support/FileOutputBuffer.h
 llvm-devel/include/llvm/Support/FileSystem.h
 llvm-devel/include/llvm/Support/FileUtilities.h
@@ -2412,7 +2432,6 @@ llvm-devel/include/llvm/Support/Memory.h
 llvm-devel/include/llvm/Support/MemoryBuffer.h
 llvm-devel/include/llvm/Support/MipsABIFlags.h
 llvm-devel/include/llvm/Support/Mutex.h
-llvm-devel/include/llvm/Support/MutexGuard.h
 llvm-devel/include/llvm/Support/NativeFormatting.h
 llvm-devel/include/llvm/Support/OnDiskHashTable.h
 llvm-devel/include/llvm/Support/Options.h
@@ -2466,7 +2485,6 @@ llvm-devel/include/llvm/Support/TrigramIndex.h
 llvm-devel/include/llvm/Support/TypeName.h
 llvm-devel/include/llvm/Support/Unicode.h
 llvm-devel/include/llvm/Support/UnicodeCharRanges.h
-llvm-devel/include/llvm/Support/UniqueLock.h
 llvm-devel/include/llvm/Support/VCSRevision.h
 llvm-devel/include/llvm/Support/Valgrind.h
 llvm-devel/include/llvm/Support/VersionTuple.h
@@ -2822,12 +2840,15 @@ llvm-devel/lib/SampleAnalyzerPlugin.so
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/ppc_wrappers/emmintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/ppc_wrappers/mm_malloc.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/ppc_wrappers/mmintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/ppc_wrappers/pmmintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/ppc_wrappers/smmintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/ppc_wrappers/tmmintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/ppc_wrappers/xmmintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/prfchwintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/ptwriteintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/rdseedintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/rtmintrin.h
-%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/s3%%LLVM_MAJOR%%0intrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/s390intrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/sgxintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/shaintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/smmintrin.h
@@ -2978,6 +2999,12 @@ llvm-devel/lib/libLLVMPowerPCDesc.a
 llvm-devel/lib/libLLVMPowerPCDisassembler.a
 llvm-devel/lib/libLLVMPowerPCInfo.a
 llvm-devel/lib/libLLVMProfileData.a
+llvm-devel/lib/libLLVMRISCVAsmParser.a
+llvm-devel/lib/libLLVMRISCVCodeGen.a
+llvm-devel/lib/libLLVMRISCVDesc.a
+llvm-devel/lib/libLLVMRISCVDisassembler.a
+llvm-devel/lib/libLLVMRISCVInfo.a
+llvm-devel/lib/libLLVMRISCVUtils.a
 llvm-devel/lib/libLLVMRemarks.a
 llvm-devel/lib/libLLVMRuntimeDyld.a
 llvm-devel/lib/libLLVMScalarOpts.a
@@ -3038,6 +3065,7 @@ llvm-devel/lib/libRemarks.so.%%LLVM_MAJOR%%svn
 %%CLANG%%llvm-devel/lib/libclangDaemon.a
 %%CLANG%%llvm-devel/lib/libclangDaemonTweaks.a
 %%CLANG%%llvm-devel/lib/libclangDependencyScanning.a
+%%CLANG%%llvm-devel/lib/libclangDirectoryWatcher.a
 %%CLANG%%llvm-devel/lib/libclangDoc.a
 %%CLANG%%llvm-devel/lib/libclangDriver.a
 %%CLANG%%llvm-devel/lib/libclangDynamicASTMatchers.a
@@ -3073,6 +3101,7 @@ llvm-devel/lib/libRemarks.so.%%LLVM_MAJOR%%svn
 %%EXTRAS%%llvm-devel/lib/libclangTidyGoogleModule.a
 %%EXTRAS%%llvm-devel/lib/libclangTidyHICPPModule.a
 %%EXTRAS%%llvm-devel/lib/libclangTidyLLVMModule.a
+%%EXTRAS%%llvm-devel/lib/libclangTidyLinuxKernelModule.a
 %%EXTRAS%%llvm-devel/lib/libclangTidyMPIModule.a
 %%EXTRAS%%llvm-devel/lib/libclangTidyMiscModule.a
 %%EXTRAS%%llvm-devel/lib/libclangTidyModernizeModule.a
@@ -3111,6 +3140,7 @@ llvm-devel/lib/libRemarks.so.%%LLVM_MAJOR%%svn
 %%CLANG%%llvm-devel/libexec/c++-analyzer
 %%CLANG%%llvm-devel/libexec/ccc-analyzer
 %%CLANG%%llvm-devel/share/clang/bash-autocomplete.sh
+%%EXTRAS%%llvm-devel/share/clang/clang-doc-default-stylesheet.css
 %%CLANG%%llvm-devel/share/clang/clang-format-bbedit.applescript
 %%CLANG%%llvm-devel/share/clang/clang-format-diff.py
 %%CLANG%%llvm-devel/share/clang/clang-format-sublime.py
@@ -3121,6 +3151,7 @@ llvm-devel/lib/libRemarks.so.%%LLVM_MAJOR%%svn
 %%EXTRAS%%llvm-devel/share/clang/clang-rename.el
 %%EXTRAS%%llvm-devel/share/clang/clang-rename.py
 %%EXTRAS%%llvm-devel/share/clang/clang-tidy-diff.py
+%%CLANG%%llvm-devel/share/clang/index.js
 %%EXTRAS%%llvm-devel/share/clang/run-clang-tidy.py
 %%EXTRAS%%llvm-devel/share/clang/run-find-all-symbols.py
 llvm-devel/share/opt-viewer/opt-diff.py