Update CHERI LLVM and Qemu to fresh snapshots.

svn path=/head/; revision=514196

devel/llvm-cheri/Makefile

@@ -48,9 +48,11 @@ STACK_ALIGN?=	-mstack-alignment=32
 
 CMAKE_INSTALL_PREFIX=	${LLVM_PREFIX}
 CMAKE_SOURCE_PATH=	${WRKSRC}/llvm
-CMAKE_ARGS+=	-DLLVM_BUILD_LLVM_DYLIB=ON \
-		-DLLVM_DEFAULT_TARGET_TRIPLE=cheri-unknown-freebsd
+CMAKE_ARGS+=	-DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_LINK_LLVM_DYLIB=ON
+CMAKEARGS+=	-DLLVM_DEFAULT_TARGET_TRIPLE=cheri-unknown-freebsd
+CMAKE_ARGS+=	-DCMAKE_INSTALL_MANDIR:PATH="share/man"
 CMAKE_ARGS+=	-DLLVM_PARALLEL_LINK_JOBS=1
+CMAKE_ARGS+=	-DLLVM_ENABLE_Z3_SOLVER=OFF
 
 USE_GITHUB=	yes
 GH_PROJECT=	llvm-project
@@ -91,6 +93,7 @@ COMMANDS=	bugpoint \
 		dsymutil \
 		llc \
 		lli \
+		llvm-addr2line \
 		llvm-ar \
 		llvm-as \
 		llvm-bcanalyzer \
@@ -108,8 +111,11 @@ COMMANDS=	bugpoint \
 		llvm-dwp \
 		llvm-exegesis \
 		llvm-extract \
+		llvm-ifs \
+		llvm-jitlink \
 		llvm-lib \
 		llvm-link \
+		llvm-lipo \
 		llvm-lto \
 		llvm-lto2 \
 		llvm-mc \
@@ -126,6 +132,7 @@ COMMANDS=	bugpoint \
 		llvm-rc \
 		llvm-readelf \
 		llvm-readobj \
+		llvm-reduce \
 		llvm-rtdyld \
 		llvm-size \
 		llvm-split \
@@ -161,12 +168,14 @@ COMMANDS+=	clang \
 		clang-format \
 		clang-refactor \
 		clang-rename \
+		clang-scan-deps \
 		diagtool \
 		scan-build \
 		scan-view
 MAN1SRCS+=	clang.1 \
-		diagtool.1
-DOCS_PLIST_FILES+=	man/man1/scan-build${LLVM_SUFFIX}.1.gz
+		diagtool.1 \
+		scan-build.1
+#DOCS_PLIST_FILES+=	man/man1/scan-build${LLVM_SUFFIX}.1.gz
 USES+=		gnome
 .endif
 
@@ -199,16 +208,43 @@ CMAKE_ARGS+=	-DLLVM_ENABLE_PROJECTS="${LLVM_ENABLE_PROJECTS:ts;}"
 _USES_PYTHON?=	python:2.7,build
 USES+=		${_USES_PYTHON}
 
-MAN1SRCS+=	bugpoint.1 dsymutil.1 llc.1 lli.1 llvm-ar.1 llvm-as.1 \
-		llvm-bcanalyzer.1 llvm-build.1 llvm-config.1 llvm-cov.1 \
+MAN1SRCS+=	bugpoint.1 \
+		dsymutil.1 \
+		llc.1 \
+		lli.1 \
+		llvm-addr2line.1 \
+		llvm-ar.1 \
+		llvm-as.1 \
+		llvm-bcanalyzer.1 \
+		llvm-build.1 \
+		llvm-config.1 \
+		llvm-cov.1 \
+		llvm-cxxfilt.1 \
 		llvm-cxxmap.1 \
-		llvm-diff.1 llvm-dis.1 llvm-dwarfdump.1 \
+		llvm-diff.1 \
+		llvm-dis.1 \
+		llvm-dwarfdump.1 \
 		llvm-exegesis.1 \
-		llvm-extract.1 llvm-lib.1 llvm-link.1 llvm-mca.1 llvm-nm.1 \
+		llvm-extract.1 \
+		llvm-lib.1 \
+		llvm-link.1 \
+		llvm-lipo.1 \
+		llvm-mca.1 \
+		llvm-nm.1 \
+		llvm-objcopy.1 \
 		llvm-objdump.1 \
 		llvm-pdbutil.1 \
-		llvm-profdata.1 llvm-readobj.1 llvm-stress.1 llvm-symbolizer.1 \
-		opt.1 tblgen.1
+		llvm-profdata.1 \
+		llvm-ranlib.1 \
+		llvm-readelf.1 \
+		llvm-readobj.1 \
+		llvm-size.1 \
+		llvm-stress.1 \
+		llvm-strings.1 \
+		llvm-strip.1 \
+		llvm-symbolizer.1 \
+		opt.1 \
+		tblgen.1
 
 .include <bsd.port.pre.mk>
 
@@ -246,14 +282,12 @@ post-install-DOCS-on:
 	${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/lit.1
 	${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/FileCheck.1
 .endif
+#.if ${PORT_OPTIONS:MCLANG}
+#	${MV} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/scan-build.1 \
+#	    ${STAGEDIR}${MANPREFIX}/man/man1/scan-build${LLVM_SUFFIX}.1
+#.endif
 	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/
 	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/
-.if ${PORT_OPTIONS:MCLANG}
-	${MV} ${STAGEDIR}${LLVM_PREFIX}/man/man1/scan-build.1 \
-	    ${STAGEDIR}${MANPREFIX}/man/man1/scan-build${LLVM_SUFFIX}.1
-	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/man/man1
-	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/man
-.endif
 
 post-install-LLDB-on:
 .if ${OPSYS} != "FreeBSD" || ${COMPILER_TYPE} == clang

devel/llvm-cheri/Makefile.snapshot

@@ -4,8 +4,8 @@
 #
 # Generated by: files/gen-Makefile.snapshot.sh.
 #
-LLVM_MAJOR=	9
+LLVM_MAJOR=	10
 LLVM_RELEASE=	${LLVM_MAJOR}.0.0
-SNAPDATE=	20190312
+SNAPDATE=	20191009
 
-LLVM_COMMIT=		ae861c7ece6f473789ad32dee3af20e628524732
+LLVM_COMMIT=		973fd936d9f4880ce48005c34e854a6c5260cbbb

devel/llvm-cheri/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1553122094
-SHA256 (CTSRD-CHERI-llvm-project-9.0.d20190312-ae861c7ece6f473789ad32dee3af20e628524732_GH0.tar.gz) = 892f63a248e2925b8d4da43d84f24f9574ae4b661c87f7e460f750aa9a61f08a
-SIZE (CTSRD-CHERI-llvm-project-9.0.d20190312-ae861c7ece6f473789ad32dee3af20e628524732_GH0.tar.gz) = 121689117
+TIMESTAMP = 1570653789
+SHA256 (CTSRD-CHERI-llvm-project-10.0.d20191009-973fd936d9f4880ce48005c34e854a6c5260cbbb_GH0.tar.gz) = 841be5ca9f9a4555a098ed08e726b162a1970e6b0c311b729d672769c81efdb2
+SIZE (CTSRD-CHERI-llvm-project-10.0.d20191009-973fd936d9f4880ce48005c34e854a6c5260cbbb_GH0.tar.gz) = 119433212

devel/llvm-cheri/files/gen-Makefile.snapshot.sh

@@ -38,7 +38,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=	${MAX_DATE}
 

devel/llvm-cheri/pkg-plist

@@ -4,6 +4,7 @@ bin/c-index-test%%COMMAND_SUFFIX%%
 bin/dsymutil%%COMMAND_SUFFIX%%
 bin/llc%%COMMAND_SUFFIX%%
 bin/lli%%COMMAND_SUFFIX%%
+bin/llvm-addr2line%%COMMAND_SUFFIX%%
 bin/llvm-ar%%COMMAND_SUFFIX%%
 bin/llvm-as%%COMMAND_SUFFIX%%
 bin/llvm-bcanalyzer%%COMMAND_SUFFIX%%
@@ -21,8 +22,11 @@ bin/llvm-dwarfdump%%COMMAND_SUFFIX%%
 bin/llvm-dwp%%COMMAND_SUFFIX%%
 bin/llvm-exegesis%%COMMAND_SUFFIX%%
 bin/llvm-extract%%COMMAND_SUFFIX%%
+bin/llvm-ifs%%COMMAND_SUFFIX%%
+bin/llvm-jitlink%%COMMAND_SUFFIX%%
 bin/llvm-lib%%COMMAND_SUFFIX%%
 bin/llvm-link%%COMMAND_SUFFIX%%
+bin/llvm-lipo%%COMMAND_SUFFIX%%
 bin/llvm-lto%%COMMAND_SUFFIX%%
 bin/llvm-lto2%%COMMAND_SUFFIX%%
 bin/llvm-mc%%COMMAND_SUFFIX%%
@@ -39,6 +43,7 @@ bin/llvm-ranlib%%COMMAND_SUFFIX%%
 bin/llvm-rc%%COMMAND_SUFFIX%%
 bin/llvm-readelf%%COMMAND_SUFFIX%%
 bin/llvm-readobj%%COMMAND_SUFFIX%%
+bin/llvm-reduce%%COMMAND_SUFFIX%%
 bin/llvm-rtdyld%%COMMAND_SUFFIX%%
 bin/llvm-size%%COMMAND_SUFFIX%%
 bin/llvm-split%%COMMAND_SUFFIX%%
@@ -60,6 +65,7 @@ bin/yaml2obj%%COMMAND_SUFFIX%%
 %%CLANG%%bin/clang-format%%COMMAND_SUFFIX%%
 %%CLANG%%bin/clang-refactor%%COMMAND_SUFFIX%%
 %%CLANG%%bin/clang-rename%%COMMAND_SUFFIX%%
+%%CLANG%%bin/clang-scan-deps%%COMMAND_SUFFIX%%
 bin/diagtool%%COMMAND_SUFFIX%%
 bin/scan-build%%COMMAND_SUFFIX%%
 bin/scan-view%%COMMAND_SUFFIX%%
@@ -87,6 +93,7 @@ llvm%%LLVM_SUFFIX%%/bin/capsizefix
 %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-offload-bundler
 %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-refactor
 %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-rename
+%%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-scan-deps
 llvm%%LLVM_SUFFIX%%/bin/diagtool
 llvm%%LLVM_SUFFIX%%/bin/dsymutil
 %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/git-clang-format
@@ -97,6 +104,7 @@ llvm%%LLVM_SUFFIX%%/bin/llc
 %%LLD%%llvm%%LLVM_SUFFIX%%/bin/lld
 %%LLD%%llvm%%LLVM_SUFFIX%%/bin/lld-link
 llvm%%LLVM_SUFFIX%%/bin/lli
+llvm%%LLVM_SUFFIX%%/bin/llvm-addr2line
 llvm%%LLVM_SUFFIX%%/bin/llvm-ar
 llvm%%LLVM_SUFFIX%%/bin/llvm-as
 llvm%%LLVM_SUFFIX%%/bin/llvm-bcanalyzer
@@ -117,8 +125,11 @@ llvm%%LLVM_SUFFIX%%/bin/llvm-dwp
 llvm%%LLVM_SUFFIX%%/bin/llvm-elfabi
 llvm%%LLVM_SUFFIX%%/bin/llvm-exegesis
 llvm%%LLVM_SUFFIX%%/bin/llvm-extract
+llvm%%LLVM_SUFFIX%%/bin/llvm-ifs
+llvm%%LLVM_SUFFIX%%/bin/llvm-jitlink
 llvm%%LLVM_SUFFIX%%/bin/llvm-lib
 llvm%%LLVM_SUFFIX%%/bin/llvm-link
+llvm%%LLVM_SUFFIX%%/bin/llvm-lipo
 llvm%%LLVM_SUFFIX%%/bin/llvm-lto
 llvm%%LLVM_SUFFIX%%/bin/llvm-lto2
 llvm%%LLVM_SUFFIX%%/bin/llvm-mc
@@ -135,6 +146,7 @@ llvm%%LLVM_SUFFIX%%/bin/llvm-ranlib
 llvm%%LLVM_SUFFIX%%/bin/llvm-rc
 llvm%%LLVM_SUFFIX%%/bin/llvm-readelf
 llvm%%LLVM_SUFFIX%%/bin/llvm-readobj
+llvm%%LLVM_SUFFIX%%/bin/llvm-reduce
 llvm%%LLVM_SUFFIX%%/bin/llvm-rtdyld
 llvm%%LLVM_SUFFIX%%/bin/llvm-size
 llvm%%LLVM_SUFFIX%%/bin/llvm-split
@@ -159,6 +171,7 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang-c/CXErrorCode.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang-c/CXString.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang-c/Documentation.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang-c/FatalErrorHandler.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang-c/Index.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang-c/Platform.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/ARCMigrate/ARCMT.h
@@ -170,10 +183,12 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/ASTContext.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/ASTContextAllocate.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/ASTDiagnostic.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/ASTDumper.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/ASTDumperUtils.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/ASTFwd.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/ASTImporter.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/ASTImporterLookupTable.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/ASTImporterSharedState.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/ASTLambda.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/ASTMutationListener.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/ASTNodeTraverser.h
@@ -210,6 +225,7 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/CommentSema.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/CommentVisitor.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/ComparisonCategories.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/CurrentSourceLocExprScope.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/DataCollection.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/Decl.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/DeclAccessPair.h
@@ -235,6 +251,7 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/ExternalASTSource.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/FormatString.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/GlobalDecl.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/JSONNodeDumper.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/LambdaCapture.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/LexicallyOrderedRecursiveASTVisitor.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/LocInfoType.h
@@ -248,6 +265,7 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/OpenMPClause.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/OperationKinds.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/OperationKinds.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/OptionalDiagnostic.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/ParentMap.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/PrettyDeclStackTrace.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/PrettyPrinter.h
@@ -316,10 +334,12 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/DomainSpecific/CocoaConventions.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/DomainSpecific/ObjCNoReturn.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/FlowSensitive/DataflowValues.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/PathDiagnostic.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/ProgramPoint.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/RetainSummaryManager.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/SelectorExtras.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/Support/BumpVector.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/AArch64SVEACLETypes.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/ABI.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/AddressSpaces.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/AlignedAllocation.h
@@ -329,6 +349,7 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/AttrList.inc
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/AttrSubMatchRulesList.inc
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/AttrSubjectMatchRules.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/AttributeCommonInfo.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/Attributes.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/BitmaskEnum.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/Builtins.def
@@ -393,14 +414,16 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/FileSystemStatCache.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/FixedPoint.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/IdentifierTable.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/JsonSupport.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/LLVM.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/Lambda.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/LangOptions.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/LangOptions.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/LangStandard.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/LangStandards.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/Linkage.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/MSP430Target.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/MacroBuilder.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/MemoryBufferCache.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/Module.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/ObjCRuntime.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/OpenCLExtensionTypes.def
@@ -454,6 +477,7 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Config/config.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/CrossTU/CrossTUDiagnostic.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/CrossTU/CrossTranslationUnit.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/DirectoryWatcher/DirectoryWatcher.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Driver/Action.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Driver/Compilation.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Driver/DarwinSDKInfo.h
@@ -491,8 +515,6 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Frontend/FrontendDiagnostic.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Frontend/FrontendOptions.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Frontend/FrontendPluginRegistry.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Frontend/LangStandard.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Frontend/LangStandards.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Frontend/LayoutOverrideSource.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Frontend/LogDiagnosticPrinter.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Frontend/MigratorOptions.h
@@ -509,13 +531,15 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Frontend/Utils.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Frontend/VerifyDiagnosticConsumer.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/FrontendTool/Utils.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Index/CodegenNameGenerator.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Index/CommentToXML.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Index/DeclOccurrence.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Index/IndexDataConsumer.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Index/IndexSymbol.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Index/IndexingAction.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Index/IndexingOptions.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Index/USRGeneration.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Lex/CodeCompletionHandler.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Lex/DependencyDirectivesSourceMinimizer.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Lex/DirectoryLookup.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Lex/ExternalPreprocessorSource.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Lex/HeaderMap.h
@@ -535,6 +559,7 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Lex/Pragma.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Lex/PreprocessingRecord.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Lex/Preprocessor.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Lex/PreprocessorExcludedConditionalDirectiveSkipMapping.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Lex/PreprocessorLexer.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Lex/PreprocessorOptions.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Lex/ScratchBuffer.h
@@ -603,6 +628,7 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Serialization/AttrPCHWrite.inc
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Serialization/ContinuousRangeMap.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Serialization/GlobalModuleIndex.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Serialization/InMemoryModuleCache.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Serialization/Module.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Serialization/ModuleFileExtension.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Serialization/ModuleManager.h
@@ -620,7 +646,6 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/BugReporter/BugReporterVisitors.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/BugReporter/BugType.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/BugReporter/CommonBugCategories.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/BugReporter/PathDiagnostic.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/Checker.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/CheckerManager.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/IssueHash.h
@@ -634,8 +659,9 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/CheckerHelpers.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/ConstraintManager.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/CoreEngine.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/DynamicCastInfo.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/DynamicType.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/DynamicTypeInfo.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/DynamicTypeMap.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/Environment.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/ExplodedGraph.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/ExprEngine.h
@@ -648,7 +674,6 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/ProgramState_Fwd.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/RangedConstraintManager.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/Regions.def
-%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/SMTAPI.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/SMTConstraintManager.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/SMTConv.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/SValBuilder.h
@@ -663,8 +688,6 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/SymExpr.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/SymbolManager.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/Symbols.def
-%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/TaintManager.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/TaintTag.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/PathSensitive/WorkList.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Frontend/AnalysisConsumer.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Frontend/CheckerRegistration.h
@@ -681,6 +704,9 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Core/Diagnostic.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Core/Lookup.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Core/Replacement.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/DependencyScanning/DependencyScanningFilesystem.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/DependencyScanning/DependencyScanningService.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/DependencyScanning/DependencyScanningWorker.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/DiagnosticsYaml.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Execution.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/FileMatchTrie.h
@@ -692,6 +718,8 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Refactoring/ASTSelection.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Refactoring/AtomicChange.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Refactoring/Extract/Extract.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Refactoring/Extract/SourceExtraction.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Refactoring/RangeSelector.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Refactoring/RecursiveSymbolVisitor.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Refactoring/RefactoringAction.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Refactoring/RefactoringActionRule.h
@@ -710,14 +738,22 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Refactoring/Rename/USRFinder.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Refactoring/Rename/USRFindingAction.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Refactoring/Rename/USRLocFinder.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Refactoring/SourceCode.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Refactoring/Stencil.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Refactoring/Transformer.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/RefactoringCallbacks.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/ReplacementsYaml.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/StandaloneExecution.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Syntax/BuildTree.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Syntax/Nodes.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Syntax/Tokens.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Syntax/Tree.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/ToolExecutorPluginRegistry.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Tooling.h
 %%LLD%%llvm%%LLVM_SUFFIX%%/include/lld/Common/Args.h
 %%LLD%%llvm%%LLVM_SUFFIX%%/include/lld/Common/Driver.h
 %%LLD%%llvm%%LLVM_SUFFIX%%/include/lld/Common/ErrorHandler.h
+%%LLD%%llvm%%LLVM_SUFFIX%%/include/lld/Common/Filesystem.h
 %%LLD%%llvm%%LLVM_SUFFIX%%/include/lld/Common/LLVM.h
 %%LLD%%llvm%%LLVM_SUFFIX%%/include/lld/Common/Memory.h
 %%LLD%%llvm%%LLVM_SUFFIX%%/include/lld/Common/Reproduce.h
@@ -765,8 +801,8 @@ llvm%%LLVM_SUFFIX%%/include/llvm-c/Initialization.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/LinkTimeOptimizer.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/Linker.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/Object.h
-llvm%%LLVM_SUFFIX%%/include/llvm-c/OptRemarks.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/OrcBindings.h
+llvm%%LLVM_SUFFIX%%/include/llvm-c/Remarks.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/Support.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/Target.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/TargetMachine.h
@@ -796,6 +832,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/ADT/DenseMap.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/DenseMapInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/DenseSet.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/DepthFirstIterator.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ADT/DirectedGraph.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/EpochTracker.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/EquivalenceClasses.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/FoldingSet.h
@@ -845,7 +882,6 @@ llvm%%LLVM_SUFFIX%%/include/llvm/ADT/TinyPtrVector.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/Triple.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/Twine.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/UniqueVector.h
-llvm%%LLVM_SUFFIX%%/include/llvm/ADT/VariadicFunction.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/bit.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/edit_distance.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/fallible_iterator.h
@@ -876,6 +912,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/CallGraph.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/CallGraphSCCPass.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/CallPrinter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/CaptureTracking.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/CheriBounds.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/CmpInstAnalysis.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/CodeMetrics.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/ConstantFolding.h
@@ -910,6 +947,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/Lint.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/Loads.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/LoopAccessAnalysis.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/LoopAnalysisManager.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/LoopCacheAnalysis.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/LoopInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/LoopInfoImpl.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/LoopIterator.h
@@ -961,6 +999,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/Utils/Local.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/ValueLattice.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/ValueLatticeUtils.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/ValueTracking.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/VecFuncs.def
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/VectorUtils.h
 llvm%%LLVM_SUFFIX%%/include/llvm/AsmParser/Parser.h
 llvm%%LLVM_SUFFIX%%/include/llvm/AsmParser/SlotMapping.h
@@ -990,20 +1029,24 @@ llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/ELFRelocs/x86_64.def
 llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/MachO.def
 llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/MachO.h
 llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/Magic.h
+llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/Minidump.h
+llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/MinidumpConstants.def
 llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/MsgPack.def
 llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/MsgPack.h
+llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/MsgPackDocument.h
 llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/MsgPackReader.h
-llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/MsgPackTypes.h
 llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/MsgPackWriter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/Wasm.h
 llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/WasmRelocs.def
-llvm%%LLVM_SUFFIX%%/include/llvm/Bitcode/BitCodes.h
+llvm%%LLVM_SUFFIX%%/include/llvm/BinaryFormat/XCOFF.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Bitcode/BitcodeAnalyzer.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Bitcode/BitcodeReader.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Bitcode/BitcodeWriter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Bitcode/BitcodeWriterPass.h
-llvm%%LLVM_SUFFIX%%/include/llvm/Bitcode/BitstreamReader.h
-llvm%%LLVM_SUFFIX%%/include/llvm/Bitcode/BitstreamWriter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Bitcode/LLVMBitCodes.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Bitstream/BitCodes.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Bitstream/BitstreamReader.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Bitstream/BitstreamWriter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/AccelTable.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/Analysis.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/AsmPrinter.h
@@ -1011,6 +1054,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/AsmPrinterHandler.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/AtomicExpandUtils.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/BasicTTIImpl.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/BuiltinGCs.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/CSEConfigBase.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/CalcSpillWeights.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/CallingConvLower.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/CommandFlags.inc
@@ -1039,6 +1083,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/CombinerHelper.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/CombinerInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/ConstantFoldingMIRBuilder.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/GISelChangeObserver.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/GISelKnownBits.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/GISelWorkList.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/IRTranslator.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GlobalISel/InstructionSelect.h
@@ -1074,6 +1119,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/LiveStacks.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/LiveVariables.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/LoopTraversal.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/LowLevelType.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MIRParser/MIParser.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MIRParser/MIRParser.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MIRPrinter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MIRYamlMapping.h
@@ -1109,6 +1155,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineSSAUpdater.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineScheduler.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineTraceMetrics.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MacroFusion.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/ModuloSchedule.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/PBQP/CostAllocator.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/PBQP/Graph.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/PBQP/Math.h
@@ -1122,6 +1169,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/PseudoSourceValue.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/ReachingDefAnalysis.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/RegAllocPBQP.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/RegAllocRegistry.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/Register.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/RegisterClassInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/RegisterPressure.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/RegisterScavenging.h
@@ -1144,6 +1192,8 @@ llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/SelectionDAGTargetInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/SlotIndexes.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/StackMaps.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/StackProtector.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/SwiftErrorValueTracking.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/SwitchLoweringUtils.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/TailDuplicator.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/TargetCallingConv.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/TargetFrameLowering.h
@@ -1259,6 +1309,14 @@ llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARF/DWARFTypeUnit.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARF/DWARFUnit.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARF/DWARFUnitIndex.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARF/DWARFVerifier.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/GSYM/FileEntry.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/GSYM/FileWriter.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/GSYM/FunctionInfo.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/GSYM/InlineInfo.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/GSYM/LineEntry.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/GSYM/LineTable.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/GSYM/Range.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/GSYM/StringTable.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/MSF/IMSFFile.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/MSF/MSFBuilder.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/MSF/MSFCommon.h
@@ -1310,10 +1368,12 @@ llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/HashTable.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/ISectionContribVisitor.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/InfoStream.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/InfoStreamBuilder.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/InjectedSourceStream.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/ModuleDebugStream.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/NamedStreamMap.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/NativeCompilandSymbol.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/NativeEnumGlobals.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/NativeEnumInjectedSources.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/NativeEnumModules.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/NativeEnumTypes.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/PDB/Native/NativeExeSymbol.h
@@ -1393,6 +1453,11 @@ llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/ExecutionEngine.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/GenericValue.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Interpreter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/JITEventListener.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/JITLink/EHFrameSupport.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/JITLink/JITLink.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/JITLink/JITLinkMemoryManager.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/JITLink/MachO.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/JITLink/MachO_x86_64.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/JITSymbol.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/MCJIT.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/OProfileWrapper.h
@@ -1413,6 +1478,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/LazyEmittingLayer.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/LazyReexports.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/Legacy.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/NullResolver.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/ObjectLinkingLayer.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/ObjectTransformLayer.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/OrcABISupport.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/OrcError.h
@@ -1424,9 +1490,12 @@ llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/RPCUtils.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/RawByteChannel.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/RemoteObjectLayer.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/SpeculateAnalyses.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/Speculation.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/SymbolStringPool.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/ThreadSafeModule.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/OrcMCJITReplacement.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/OrcV1Deprecation.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/RTDyldMemoryManager.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/RuntimeDyld.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/RuntimeDyldChecker.h
@@ -1466,6 +1535,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/IR/DiagnosticHandler.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/DiagnosticInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/DiagnosticPrinter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/Dominators.h
+llvm%%LLVM_SUFFIX%%/include/llvm/IR/FixedMetadataKinds.def
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/Function.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/GVMaterializer.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/GetElementPtrTypeIterator.h
@@ -1526,6 +1596,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/IR/PassTimingInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/PatternMatch.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/PredIteratorCache.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/ProfileSummary.h
+llvm%%LLVM_SUFFIX%%/include/llvm/IR/RemarkStreamer.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/RuntimeLibcalls.def
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/SafepointIRVerifier.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/Statepoint.h
@@ -1566,6 +1637,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCAsmInfoCOFF.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCAsmInfoDarwin.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCAsmInfoELF.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCAsmInfoWasm.h
+llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCAsmInfoXCOFF.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCAsmLayout.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCAsmMacro.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCAssembler.h
@@ -1607,6 +1679,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCParser/MCAsmParserExtension.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCParser/MCAsmParserUtils.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCParser/MCParsedAsmOperand.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCParser/MCTargetAsmParser.h
+llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCRegister.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCRegisterInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCSchedule.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCSection.h
@@ -1614,6 +1687,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCSectionCOFF.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCSectionELF.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCSectionMachO.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCSectionWasm.h
+llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCSectionXCOFF.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCStreamer.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCSubtargetInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCSymbol.h
@@ -1621,6 +1695,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCSymbolCOFF.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCSymbolELF.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCSymbolMachO.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCSymbolWasm.h
+llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCSymbolXCOFF.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCTargetOptions.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCTargetOptionsCommandFlags.inc
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCValue.h
@@ -1630,10 +1705,13 @@ llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCWin64EH.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCWinCOFFObjectWriter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCWinCOFFStreamer.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCWinEH.h
+llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCXCOFFObjectWriter.h
+llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCXCOFFStreamer.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MachineLocation.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/SectionKind.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/StringTableBuilder.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/SubtargetFeature.h
+llvm%%LLVM_SUFFIX%%/include/llvm/MCA/CodeEmitter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MCA/Context.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MCA/HWEventListener.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MCA/HardwareUnits/HardwareUnit.h
@@ -1650,6 +1728,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/MCA/Stages/DispatchStage.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MCA/Stages/EntryStage.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MCA/Stages/ExecuteStage.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MCA/Stages/InstructionTables.h
+llvm%%LLVM_SUFFIX%%/include/llvm/MCA/Stages/MicroOpQueueStage.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MCA/Stages/RetireStage.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MCA/Stages/Stage.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MCA/Support.h
@@ -1669,15 +1748,20 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Object/IRObjectFile.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Object/IRSymtab.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Object/MachO.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Object/MachOUniversal.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Object/Minidump.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Object/ModuleSymbolTable.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Object/ObjectFile.h
-llvm%%LLVM_SUFFIX%%/include/llvm/Object/RelocVisitor.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Object/RelocationResolver.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Object/StackMapParser.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Object/SymbolSize.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Object/SymbolicFile.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Object/TapiFile.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Object/TapiUniversal.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Object/Wasm.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Object/WasmTraits.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Object/WindowsMachineFlag.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Object/WindowsResource.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Object/XCOFFObjectFile.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ObjectYAML/COFFYAML.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ObjectYAML/CodeViewYAMLDebugSections.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ObjectYAML/CodeViewYAMLSymbols.h
@@ -1687,9 +1771,12 @@ llvm%%LLVM_SUFFIX%%/include/llvm/ObjectYAML/DWARFEmitter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ObjectYAML/DWARFYAML.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ObjectYAML/ELFYAML.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ObjectYAML/MachOYAML.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ObjectYAML/MinidumpYAML.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ObjectYAML/ObjectYAML.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ObjectYAML/WasmYAML.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ObjectYAML/XCOFFYAML.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ObjectYAML/YAML.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ObjectYAML/yaml2obj.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Option/Arg.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Option/ArgList.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Option/OptParser.td
@@ -1716,6 +1803,15 @@ llvm%%LLVM_SUFFIX%%/include/llvm/ProfileData/ProfileCommon.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ProfileData/SampleProf.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ProfileData/SampleProfReader.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ProfileData/SampleProfWriter.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Remarks/BitstreamRemarkContainer.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Remarks/BitstreamRemarkParser.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Remarks/BitstreamRemarkSerializer.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Remarks/Remark.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Remarks/RemarkFormat.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Remarks/RemarkParser.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Remarks/RemarkSerializer.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Remarks/RemarkStringTable.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Remarks/YAMLRemarkSerializer.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/AArch64TargetParser.def
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/AArch64TargetParser.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/AMDGPUMetadata.h
@@ -1727,6 +1823,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Support/ARMTargetParser.def
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/ARMTargetParser.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/ARMWinEH.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/AlignOf.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Support/Alignment.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/Allocator.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/ArrayRecycler.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/Atomic.h
@@ -1745,6 +1842,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Support/BuryPointer.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/CBindingWrapping.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/CFGUpdate.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/COM.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Support/CRC.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/CachePruning.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/Capacity.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/Casting.h
@@ -1773,6 +1871,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Support/Error.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/ErrorHandling.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/ErrorOr.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/FileCheck.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Support/FileCollector.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/FileOutputBuffer.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/FileSystem.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/FileUtilities.h
@@ -1785,6 +1884,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Support/FormatVariadicDetails.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/FormattedStream.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/GenericDomTree.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/GenericDomTreeConstruction.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Support/GenericIteratedDominanceFrontier.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/GlobPattern.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/GraphWriter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/Host.h
@@ -1809,7 +1909,6 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Support/Memory.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/MemoryBuffer.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/MipsABIFlags.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/Mutex.h
-llvm%%LLVM_SUFFIX%%/include/llvm/Support/MutexGuard.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/NativeFormatting.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/OnDiskHashTable.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/Options.h
@@ -1830,7 +1929,9 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Support/Registry.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/ReverseIteration.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/SHA1.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/SMLoc.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Support/SMTAPI.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/SaveAndRestore.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Support/ScalableSize.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/ScaledNumber.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/ScopedPrinter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/Signals.h
@@ -1853,6 +1954,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Support/TaskQueue.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/ThreadLocal.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/ThreadPool.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/Threading.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Support/TimeProfiler.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/Timer.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/ToolOutputFile.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/TrailingObjects.h
@@ -1860,7 +1962,6 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Support/TrigramIndex.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/TypeName.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/Unicode.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/UnicodeCharRanges.h
-llvm%%LLVM_SUFFIX%%/include/llvm/Support/UniqueLock.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/VCSRevision.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/Valgrind.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/VersionTuple.h
@@ -1904,10 +2005,19 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Target/TargetOptions.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Target/TargetPfmCounters.td
 llvm%%LLVM_SUFFIX%%/include/llvm/Target/TargetSchedule.td
 llvm%%LLVM_SUFFIX%%/include/llvm/Target/TargetSelectionDAG.td
+llvm%%LLVM_SUFFIX%%/include/llvm/Testing/Support/Annotations.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Testing/Support/Error.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Testing/Support/SupportHelpers.h
 llvm%%LLVM_SUFFIX%%/include/llvm/TextAPI/ELF/ELFStub.h
 llvm%%LLVM_SUFFIX%%/include/llvm/TextAPI/ELF/TBEHandler.h
+llvm%%LLVM_SUFFIX%%/include/llvm/TextAPI/MachO/Architecture.def
+llvm%%LLVM_SUFFIX%%/include/llvm/TextAPI/MachO/Architecture.h
+llvm%%LLVM_SUFFIX%%/include/llvm/TextAPI/MachO/ArchitectureSet.h
+llvm%%LLVM_SUFFIX%%/include/llvm/TextAPI/MachO/InterfaceFile.h
+llvm%%LLVM_SUFFIX%%/include/llvm/TextAPI/MachO/PackedVersion.h
+llvm%%LLVM_SUFFIX%%/include/llvm/TextAPI/MachO/Symbol.h
+llvm%%LLVM_SUFFIX%%/include/llvm/TextAPI/MachO/TextAPIReader.h
+llvm%%LLVM_SUFFIX%%/include/llvm/TextAPI/MachO/TextAPIWriter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ToolDrivers/llvm-dlltool/DlltoolDriver.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ToolDrivers/llvm-lib/LibDriver.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/AggressiveInstCombine/AggressiveInstCombine.h
@@ -1916,6 +2026,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Coroutines.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/IPO.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/IPO/AlwaysInliner.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/IPO/ArgumentPromotion.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/IPO/Attributor.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/IPO/CalledValuePropagation.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/IPO/ConstantMerge.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/IPO/CrossDSOCFI.h
@@ -1948,9 +2059,13 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Instrumentation/BoundsChecking.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Instrumentation/CGProfile.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Instrumentation/ControlHeightReduction.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Instrumentation/GCOVProfiler.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Instrumentation/HWAddressSanitizer.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Instrumentation/InstrOrderFile.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Instrumentation/InstrProfiling.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Instrumentation/MemorySanitizer.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Instrumentation/PGOInstrumentation.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Instrumentation/PoisonChecking.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Instrumentation/SanitizerCoverage.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Instrumentation/ThreadSanitizer.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/ObjCARC.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar.h
@@ -1978,6 +2093,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/LoopAccessAnalysisPrinter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/LoopDataPrefetch.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/LoopDeletion.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/LoopDistribute.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/LoopFuse.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/LoopIdiomRecognize.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/LoopInstSimplify.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/LoopLoadElimination.h
@@ -1995,6 +2111,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/LowerGuardIntrinsic.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/LowerWidenableCondition.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/MakeGuardsExplicit.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/MemCpyOptimizer.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/MergeICmps.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/MergedLoadStoreMotion.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/NaryReassociate.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/NewGVN.h
@@ -2043,6 +2160,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/LoopVersioning.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/LowerInvoke.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/LowerMemIntrinsics.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/Mem2Reg.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/MisExpect.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/ModuleUtils.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/NameAnonGlobals.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/PredicateInfo.h
@@ -2053,6 +2171,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/SSAUpdaterImpl.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/SanitizerStats.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/SimplifyIndVar.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/SimplifyLibCalls.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/SizeOpts.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/SplitModule.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/SymbolRewriter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h
@@ -2085,6 +2204,9 @@ llvm%%LLVM_SUFFIX%%/include/llvm/XRay/RecordPrinter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/XRay/Trace.h
 llvm%%LLVM_SUFFIX%%/include/llvm/XRay/XRayRecord.h
 llvm%%LLVM_SUFFIX%%/include/llvm/XRay/YAMLXRayRecord.h
+llvm%%LLVM_SUFFIX%%/lib/CheckerDependencyHandlingAnalyzerPlugin.so
+llvm%%LLVM_SUFFIX%%/lib/CheckerOptionHandlingAnalyzerPlugin.so
+llvm%%LLVM_SUFFIX%%/lib/SampleAnalyzerPlugin.so
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/__clang_cuda_builtin_vars.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/__clang_cuda_cmath.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/__clang_cuda_complex_builtins.h
@@ -2105,6 +2227,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/XRay/YAMLXRayRecord.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/arm_neon.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/armintr.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx2intrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512bf16intrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512bitalgintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512bwintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512cdintrin.h
@@ -2117,6 +2240,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/XRay/YAMLXRayRecord.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512vbmi2intrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512vbmiintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512vbmivlintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512vlbf16intrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512vlbitalgintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512vlbwintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512vlcdintrin.h
@@ -2124,7 +2248,9 @@ llvm%%LLVM_SUFFIX%%/include/llvm/XRay/YAMLXRayRecord.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512vlintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512vlvbmi2intrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512vlvnniintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512vlvp2intersectintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512vnniintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512vp2intersectintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512vpopcntdqintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512vpopcntdqvlintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avxintrin.h
@@ -2142,6 +2268,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/XRay/YAMLXRayRecord.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/cuda_wrappers/complex
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/cuda_wrappers/new
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/emmintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/enqcmdintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/f16cintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/float.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/fma4intrin.h
@@ -2167,16 +2294,28 @@ llvm%%LLVM_SUFFIX%%/include/llvm/XRay/YAMLXRayRecord.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/msa.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/mwaitxintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/nmmintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/opencl-c-base.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/opencl-c.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/openmp_wrappers/__clang_openmp_math.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/openmp_wrappers/__clang_openmp_math_declares.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/openmp_wrappers/cmath
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/openmp_wrappers/math.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/pconfigintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/pkuintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/pmmintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/popcntintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/ppc_wrappers/emmintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/ppc_wrappers/mm_malloc.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/ppc_wrappers/mmintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/ppc_wrappers/pmmintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/ppc_wrappers/smmintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/ppc_wrappers/tmmintrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/ppc_wrappers/xmmintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/prfchwintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/ptwriteintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/rdseedintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/rtmintrin.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/s3%%LLVM_MAJOR%%0intrin.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/s390intrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/sgxintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/shaintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/smmintrin.h
@@ -2223,38 +2362,38 @@ llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/DetermineGCCCompatible.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/FindLibpfm.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/FindOCaml.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/FindSphinx.cmake
+llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/FindZ3.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/GenerateVersionFromVCS.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/HandleLLVMOptions.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/HandleLLVMStdlib.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/LLVM-Config.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/LLVMConfig.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/LLVMConfigVersion.cmake
+llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/LLVMDistributionSupport.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/LLVMExports-%%CMAKE_BUILD_TYPE%%.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/LLVMExports.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/LLVMExternalProjectUtils.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/LLVMInstallSymlink.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/LLVMProcessSources.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/TableGen.cmake
+llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/UseLibtool.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/VersionFromVCS.cmake
 llvm%%LLVM_SUFFIX%%/lib/libLLVM-%%LLVM_MAJOR%%svn.so
 llvm%%LLVM_SUFFIX%%/lib/libLLVM-%%LLVM_RELEASE%%svn.so
 llvm%%LLVM_SUFFIX%%/lib/libLLVM.so
 llvm%%LLVM_SUFFIX%%/lib/libLLVMAArch64AsmParser.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMAArch64AsmPrinter.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMAArch64CodeGen.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMAArch64Desc.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMAArch64Disassembler.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMAArch64Info.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMAArch64Utils.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMAMDGPUAsmParser.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMAMDGPUAsmPrinter.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMAMDGPUCodeGen.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMAMDGPUDesc.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMAMDGPUDisassembler.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMAMDGPUInfo.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMAMDGPUUtils.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMARMAsmParser.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMARMAsmPrinter.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMARMCodeGen.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMARMDesc.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMARMDisassembler.a
@@ -2265,7 +2404,6 @@ llvm%%LLVM_SUFFIX%%/lib/libLLVMAnalysis.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMAsmParser.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMAsmPrinter.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMBPFAsmParser.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMBPFAsmPrinter.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMBPFCodeGen.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMBPFDesc.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMBPFDisassembler.a
@@ -2273,6 +2411,7 @@ llvm%%LLVM_SUFFIX%%/lib/libLLVMBPFInfo.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMBinaryFormat.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMBitReader.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMBitWriter.a
+llvm%%LLVM_SUFFIX%%/lib/libLLVMBitstreamReader.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMCHERICapOpts.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMCodeGen.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMCore.a
@@ -2280,6 +2419,7 @@ llvm%%LLVM_SUFFIX%%/lib/libLLVMCoroutines.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMCoverage.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMDebugInfoCodeView.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMDebugInfoDWARF.a
+llvm%%LLVM_SUFFIX%%/lib/libLLVMDebugInfoGSYM.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMDebugInfoMSF.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMDebugInfoPDB.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMDemangle.a
@@ -2296,9 +2436,9 @@ llvm%%LLVM_SUFFIX%%/lib/libLLVMIRReader.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMInstCombine.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMInstrumentation.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMInterpreter.a
+llvm%%LLVM_SUFFIX%%/lib/libLLVMJITLink.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMLTO.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMLanaiAsmParser.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMLanaiAsmPrinter.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMLanaiCodeGen.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMLanaiDesc.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMLanaiDisassembler.a
@@ -2313,40 +2453,41 @@ llvm%%LLVM_SUFFIX%%/lib/libLLVMMCJIT.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMMCParser.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMMIRParser.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMMSP430AsmParser.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMMSP430AsmPrinter.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMMSP430CodeGen.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMMSP430Desc.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMMSP430Disassembler.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMMSP430Info.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMMipsAsmParser.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMMipsAsmPrinter.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMMipsCodeGen.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMMipsDesc.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMMipsDisassembler.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMMipsInfo.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMNVPTXAsmPrinter.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMNVPTXCodeGen.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMNVPTXDesc.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMNVPTXInfo.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMObjCARCOpts.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMObject.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMObjectYAML.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMOptRemarks.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMOption.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMOrcJIT.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMPasses.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMPowerPCAsmParser.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMPowerPCAsmPrinter.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMPowerPCCodeGen.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMPowerPCDesc.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMPowerPCDisassembler.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMPowerPCInfo.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMProfileData.a
+llvm%%LLVM_SUFFIX%%/lib/libLLVMRISCVAsmParser.a
+llvm%%LLVM_SUFFIX%%/lib/libLLVMRISCVCodeGen.a
+llvm%%LLVM_SUFFIX%%/lib/libLLVMRISCVDesc.a
+llvm%%LLVM_SUFFIX%%/lib/libLLVMRISCVDisassembler.a
+llvm%%LLVM_SUFFIX%%/lib/libLLVMRISCVInfo.a
+llvm%%LLVM_SUFFIX%%/lib/libLLVMRISCVUtils.a
+llvm%%LLVM_SUFFIX%%/lib/libLLVMRemarks.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMRuntimeDyld.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMScalarOpts.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMSelectionDAG.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMSparcAsmParser.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMSparcAsmPrinter.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMSparcCodeGen.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMSparcDesc.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMSparcDisassembler.a
@@ -2354,7 +2495,6 @@ llvm%%LLVM_SUFFIX%%/lib/libLLVMSparcInfo.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMSupport.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMSymbolize.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMSystemZAsmParser.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMSystemZAsmPrinter.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMSystemZCodeGen.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMSystemZDesc.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMSystemZDisassembler.a
@@ -2365,20 +2505,17 @@ llvm%%LLVM_SUFFIX%%/lib/libLLVMTextAPI.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMTransformUtils.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMVectorize.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMWebAssemblyAsmParser.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMWebAssemblyAsmPrinter.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMWebAssemblyCodeGen.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMWebAssemblyDesc.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMWebAssemblyDisassembler.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMWebAssemblyInfo.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMWindowsManifest.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMX86AsmParser.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMX86AsmPrinter.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMX86CodeGen.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMX86Desc.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMX86Disassembler.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMX86Info.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMX86Utils.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMXCoreAsmPrinter.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMXCoreCodeGen.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMXCoreDesc.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMXCoreDisassembler.a
@@ -2387,8 +2524,10 @@ llvm%%LLVM_SUFFIX%%/lib/libLLVMXRay.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMipo.a
 llvm%%LLVM_SUFFIX%%/lib/libLTO.so
 llvm%%LLVM_SUFFIX%%/lib/libLTO.so.%%LLVM_MAJOR%%svn
-llvm%%LLVM_SUFFIX%%/lib/libOptRemarks.so
-llvm%%LLVM_SUFFIX%%/lib/libOptRemarks.so.%%LLVM_MAJOR%%svn
+llvm%%LLVM_SUFFIX%%/lib/libRemarks.so
+llvm%%LLVM_SUFFIX%%/lib/libRemarks.so.%%LLVM_MAJOR%%svn
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang-cpp.so
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang-cpp.so.%%LLVM_MAJOR%%svn
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang.so
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang.so.%%LLVM_MAJOR%%
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang.so.%%LLVM_MAJOR%%svn
@@ -2399,6 +2538,8 @@ llvm%%LLVM_SUFFIX%%/lib/libOptRemarks.so.%%LLVM_MAJOR%%svn
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangBasic.a
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangCodeGen.a
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangCrossTU.a
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangDependencyScanning.a
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangDirectoryWatcher.a
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangDriver.a
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangDynamicASTMatchers.a
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangEdit.a
@@ -2421,7 +2562,8 @@ llvm%%LLVM_SUFFIX%%/lib/libOptRemarks.so.%%LLVM_MAJOR%%svn
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangToolingASTDiff.a
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangToolingCore.a
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangToolingInclusions.a
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangToolingRefactor.a
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangToolingRefactoring.a
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangToolingSyntax.a
 %%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldCOFF.a
 %%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldCommon.a
 %%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldCore.a

emulators/qemu-cheri/Makefile

@@ -2,7 +2,7 @@
 
 PORTNAME=	qemu
 PORTVERSION=	0.d${SNAPDATE}
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	emulators devel
 PKGNAMESUFFIX=	-cheri
 
@@ -25,7 +25,8 @@ GH_TAGNAME=	${QEMU_COMMIT}
 GH_TUPLE=	qemu:keycodemapdb:6b3d716:qemu/ui/keycodemapdb
 
 HAS_CONFIGURE=	yes
-USES=	gettext-runtime gmake gnome libtool makeinfo pkgconfig python:2.7,build
+USES=	gettext-runtime gl gmake gnome libtool makeinfo pkgconfig \
+	python:2.7,build xorg
 USE_XORG=	pixman
 USE_GNOME+=	glib20 libxml2
 USE_GL+=	gbm

emulators/qemu-cheri/Makefile.snapshot

@@ -4,6 +4,6 @@
 #
 # Generated by: files/gen-Makefile.snapshot.sh.
 #
-SNAPDATE=	20190128
+SNAPDATE=	20190831
 
-QEMU_COMMIT=		86927ac45db75b1eaac578ed58b32355ca9ad5f6
+QEMU_COMMIT=		cab2ad32531f0a1aa9cef9332169f7e2825a98c6

emulators/qemu-cheri/distinfo

@@ -1,5 +1,5 @@
-TIMESTAMP = 1548717778
-SHA256 (CTSRD-CHERI-qemu-0.d20190128-86927ac45db75b1eaac578ed58b32355ca9ad5f6_GH0.tar.gz) = 0b274ed75457a3b277d54c83e414a3c750efb85a60104a7e4c124b4d656c49f0
-SIZE (CTSRD-CHERI-qemu-0.d20190128-86927ac45db75b1eaac578ed58b32355ca9ad5f6_GH0.tar.gz) = 16158436
+TIMESTAMP = 1570639000
+SHA256 (CTSRD-CHERI-qemu-0.d20190831-cab2ad32531f0a1aa9cef9332169f7e2825a98c6_GH0.tar.gz) = 583f9331057a3b8c4e8ae62ba37a4818840bd566f9705462072f7c42509ff600
+SIZE (CTSRD-CHERI-qemu-0.d20190831-cab2ad32531f0a1aa9cef9332169f7e2825a98c6_GH0.tar.gz) = 18941063
 SHA256 (qemu-keycodemapdb-6b3d716_GH0.tar.gz) = c9d3412510aac999865d01aaa14b1fa8dc0385db55c5cf6c4d95d160bd0eaee9
 SIZE (qemu-keycodemapdb-6b3d716_GH0.tar.gz) = 47905

emulators/qemu-cheri/files/patch-rdma-pvrdma-split

@@ -1,123 +0,0 @@
-diff --git configure configure
-index 457684a7e6..3da60d8436 100755
---- configure
-+++ configure
-@@ -353,6 +353,7 @@ hax="no"
- hvf="no"
- whpx="no"
- rdma=""
-+pvrdma=""
- gprof="no"
- debug_tcg="no"
- debug="no"
-@@ -1308,6 +1309,10 @@ for opt do
-   ;;
-   --disable-rdma) rdma="no"
-   ;;
-+  --enable-pvrdma) pvrdma="yes"
-+  ;;
-+  --disable-pvrdma) pvrdma="no"
-+  ;;
-   --with-gtkabi=*) gtkabi="$optarg"
-   ;;
-   --disable-vte) vte="no"
-@@ -1593,7 +1598,8 @@ disabled with --disable-FEATURE, default is enabled if available:
-   hax             HAX acceleration support
-   hvf             Hypervisor.framework acceleration support
-   whpx            Windows Hypervisor Platform acceleration support
--  rdma            Enable RDMA-based migration and PVRDMA support
-+  rdma            Enable RDMA-based migration
-+  pvrdma          Enable PVRDMA support
-   vde             support for vde network
-   netmap          support for netmap network
-   linux-aio       Linux AIO support
-@@ -2971,6 +2977,48 @@ EOF
-   fi
- fi
- 
-+##########################################
-+# PVRDMA detection
-+
-+cat > $TMPC <<EOF &&
-+#include <sys/mman.h>
-+
-+int
-+main(void)
-+{
-+    char buf = 0;
-+    void *addr = &buf;
-+    addr = mremap(addr, 0, 1, MREMAP_MAYMOVE | MREMAP_FIXED);
-+
-+    return 0;
-+}
-+EOF
-+
-+if test "$rdma" = "yes" ; then
-+    case "$pvrdma" in
-+    "")
-+        if compile_prog "" ""; then
-+            pvrdma="yes"
-+        else
-+            pvrdma="no"
-+        fi
-+        ;;
-+    "yes")
-+        if ! compile_prog "" ""; then
-+            error_exit "PVRDMA is not supported since mremap is not implemented"
-+        fi
-+        pvrdma="yes"
-+        ;;
-+    "no")
-+        pvrdma="no"
-+        ;;
-+    esac
-+else
-+    if test "$pvrdma" = "yes" ; then
-+        error_exit "PVRDMA requires rdma suppport"
-+    fi
-+    pvrdma="no"
-+fi
- 
- ##########################################
- # VNC SASL detection
-@@ -5820,6 +5868,7 @@ if test "$tcg" = "yes" ; then
- fi
- echo "malloc trim support $malloc_trim"
- echo "RDMA support      $rdma"
-+echo "PVRDMA support    $pvrdma"
- echo "fdt support       $fdt"
- echo "membarrier        $membarrier"
- echo "preadv support    $preadv"
-@@ -6568,6 +6617,10 @@ if test "$rdma" = "yes" ; then
-   echo "RDMA_LIBS=$rdma_libs" >> $config_host_mak
- fi
- 
-+if test "$pvrdma" = "yes" ; then
-+  echo "CONFIG_PVRDMA=y" >> $config_host_mak
-+fi
-+
- if test "$have_rtnetlink" = "yes" ; then
-   echo "CONFIG_RTNETLINK=y" >> $config_host_mak
- fi
-diff --git hw/rdma/Makefile.objs hw/rdma/Makefile.objs
-index 3504c39d21..bd36cbf51c 100644
---- hw/rdma/Makefile.objs
-+++ hw/rdma/Makefile.objs
-@@ -1,4 +1,4 @@
--ifeq ($(CONFIG_RDMA),y)
-+ifeq ($(CONFIG_PVRDMA),y)
- obj-$(CONFIG_PCI) += rdma_utils.o rdma_backend.o rdma_rm.o
- obj-$(CONFIG_PCI) += vmw/pvrdma_dev_ring.o vmw/pvrdma_cmd.o \
-                      vmw/pvrdma_qp_ops.o vmw/pvrdma_main.o
-diff --git hw/rdma/vmw/pvrdma_cmd.c hw/rdma/vmw/pvrdma_cmd.c
-index 99019d8741..bd14b4bc47 100644
---- hw/rdma/vmw/pvrdma_cmd.c
-+++ hw/rdma/vmw/pvrdma_cmd.c
-@@ -16,7 +16,6 @@
- #include "qemu/osdep.h"
- #include "qemu/error-report.h"
- #include "cpu.h"
--#include <linux/types.h>
- #include "hw/hw.h"
- #include "hw/pci/pci.h"
- #include "hw/pci/pci_ids.h"