Update to a more recent shapshot.

Adapt to removal of the ARM license.

Allow licenses to sit somewhere other then WRKSRC.

Fix the plist when OPENMP is disabled.

PR:		236008

5 files changed, 60 insertions, 44 deletions

diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile
index 909da28cd7ee..9a28534f8f85 100644
--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@@ -15,6 +15,7 @@ LICENSE+=	LLVM2
 LICENSE_FILE_LLVM2=	${WRKSRC}/LICENSE.TXT
 LICENSE_NAME_LLVM2= 	Apache License 2.0 with LLVM Exceptions
 LICENSE_PERMS_LLVM2=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+LICENSE:=	${LICENSE:NARM}
 
 LLVM_SUFFIX=	-devel
 LLVM_PREFIX=	${PREFIX}/llvm${LLVM_SUFFIX}
@@ -116,6 +117,7 @@ LLDB_GH_PROJECT=	lldb:lldb
 LLDB_GH_SUBDIR=		tools/lldb:lldb
 LLDB_GH_TAGNAME=	${LLDB_COMMIT}:lldb
 LLDB_IMPLIES=		CLANG
+LLDB_PORTDOCS=		lldb
 LLDB_VARS=		_USES_PYTHON=python:2.7
 OPENMP_DESC=		Install libomp, the LLVM OpenMP runtime library
 OPENMP_CONFLICTS_INSTALL=	libiomp5-devel-*
@@ -298,12 +300,15 @@ COMMANDS+=	ld.lld \
 .if ${PORT_OPTIONS:MLLDB}
 COMMANDS+=	lldb \
 		lldb-argdumper \
+		lldb-instr \
 		lldb-mi \
 		lldb-server \
 		lldb-test \
 		lldb-vscode
 .endif
 
+OPENMP_PATTERN=	lib[ig]*omp|omp.h|ompt.h|omp-tools.h
+
 .if ! ${OPTIONS_DEFINE:MCOMPILER_RT}
 # Hack to disable COMPILER_RT in plist of unsupported architectures
 PLIST_SUB+=	COMPILER_RT="@comment "
@@ -531,13 +536,13 @@ build-plist:
 	    -e 's|${LLVM_MAJOR:C/\./\\./}|%%LLVM_MAJOR%%|' | \
 	    ${SORT} >> ${PLIST}.tmp
 	awk '{ \
-	    if ($$0 ~ /${CLANG_PATTERN}/ && $$0 !~ /omp.h|${EXTRAS_PATTERN}|libclang_rt/) {printf "%%%%CLANG%%%%"} \
+	    if ($$0 ~ /${CLANG_PATTERN}/ && $$0 !~ /${OPENMP_PATTERN}|${EXTRAS_PATTERN}|libclang_rt/) {printf "%%%%CLANG%%%%"} \
 	    if ($$0 ~ /${COMPILER_RT_PATTERN}/) \
 		{printf "%%%%COMPILER_RT%%%%"} \
 	    if ($$0 ~ /lld|wasm-ld/ && $$0 !~ /lldb/) {printf "%%%%LLD%%%%"} \
 	    if ($$0 ~ /(${EXTRAS_PATTERN})/) {printf "%%%%EXTRAS%%%%"} \
 	    if ($$0 ~ /(argdumper|lldb|six.py)/) {printf "%%%%LLDB%%%%"} \
-	    if ($$0 ~ /(lib[ig]*omp|omp.h|ompt.h)/) {printf "%%%%OPENMP%%%%"} \
+	    if ($$0 ~ /(${OPENMP_PATTERN})/) {printf "%%%%OPENMP%%%%"} \
 	    if ($$0 ~ /LLVMgold/) {printf "%%%%GOLD%%%%"} \
 	    if ($$0 !~ /libclang_rt/) {print} \
 	}' ${PLIST}.tmp >> ${PLIST}
diff --git a/devel/llvm-devel/Makefile.LICENSE b/devel/llvm-devel/Makefile.LICENSE
index 8ddbb6286601..c9868e45df99 100644
--- a/devel/llvm-devel/Makefile.LICENSE
+++ b/devel/llvm-devel/Makefile.LICENSE
@@ -16,11 +16,12 @@
 LICENSE=	ARM BSD3CLAUSE LLVM MIT PD REGEX
 LICENSE_COMB=	multi
 
-LICENSE_FILE_ARM=	${WRKSRC}/lib/Target/ARM/LICENSE.TXT
-LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/utils/unittest/googletest/LICENSE.TXT
-LICENSE_FILE_LLVM=	${WRKSRC}/LICENSE.TXT
-LICENSE_FILE_MIT=	${WRKSRC}/test/YAMLParser/LICENSE.txt
-LICENSE_FILE_REGEX=	${WRKSRC}/lib/Support/COPYRIGHT.regex
+LICENSE_DIR?=		${WRKSRC}
+LICENSE_FILE_ARM=	${LICENSE_DIR}/lib/Target/ARM/LICENSE.TXT
+LICENSE_FILE_BSD3CLAUSE=	${LICENSE_DIR}/utils/unittest/googletest/LICENSE.TXT
+LICENSE_FILE_LLVM=	${LICENSE_DIR}/LICENSE.TXT
+LICENSE_FILE_MIT=	${LICENSE_DIR}/test/YAMLParser/LICENSE.txt
+LICENSE_FILE_REGEX=	${LICENSE_DIR}/lib/Support/COPYRIGHT.regex
 LICENSE_NAME_ARM=	ARM Limited license
 LICENSE_NAME_LLVM=	LLVM Release License
 LICENSE_NAME_REGEX=	OpenBSD Regex License
diff --git a/devel/llvm-devel/Makefile.snapshot b/devel/llvm-devel/Makefile.snapshot
index ecfd9d9008de..b5e541f6c631 100644
--- a/devel/llvm-devel/Makefile.snapshot
+++ b/devel/llvm-devel/Makefile.snapshot
@@ -6,12 +6,12 @@
 #
 LLVM_MAJOR=	9
 LLVM_RELEASE=	${LLVM_MAJOR}.0.0
-SNAPDATE=	20190122
+SNAPDATE=	20190226
 
-LLVM_COMMIT=		4b96e4b486d2a92e8f7820f6efa2c2aa0023bb66
-CLANG_COMMIT=		7f77c0c9a77506be62cd0c96fbfc1c0c8b3d5220
-COMPILER_RT_COMMIT=	225c642c81174798d0af44148018faa0022ef056
-EXTRAS_COMMIT=		10ead75b2238df9e3ddb19dc73431a57cb0ffb66
-LLD_COMMIT=		e4443d35d929f53a03dcfb72283c53c5fe549d23
-LLDB_COMMIT=		e29cec1fb4a359e5ac39bc472ad2e48aa4a97229
-OPENMP_COMMIT=		c1fe93aaa489a8e621016755bf5269602ab54d8d
+LLVM_COMMIT=		df09ef993aaff2f33e5cd5e039f467b9bae09c7e
+CLANG_COMMIT=		29e2813a2ab7d5569860bb07892dfef7b5374d96
+COMPILER_RT_COMMIT=	9bd5a04467c4a6c79e6ae9fe48230e33314d0afd
+EXTRAS_COMMIT=		817f87451361131c193245b33e323031e7aeec0c
+LLD_COMMIT=		aa7adc0ec804b689771f11d52e39f83a16378f5f
+LLDB_COMMIT=		c4cc77b588472061ae5218c9066f6dd047133e85
+OPENMP_COMMIT=		acb2548ddecbc26d46c28b1cd799fe4ca18f8914
diff --git a/devel/llvm-devel/distinfo b/devel/llvm-devel/distinfo
index e81124a03362..73f9e5540841 100644
--- a/devel/llvm-devel/distinfo
+++ b/devel/llvm-devel/distinfo
@@ -1,15 +1,15 @@
-TIMESTAMP = 1548117256
-SHA256 (llvm-mirror-llvm-9.0.d20190122-4b96e4b486d2a92e8f7820f6efa2c2aa0023bb66_GH0.tar.gz) = 38af1c73fa3c12819ec2e2f32029724aa934cb7fb2ff9e9eb0e80d938b10d5ff
-SIZE (llvm-mirror-llvm-9.0.d20190122-4b96e4b486d2a92e8f7820f6efa2c2aa0023bb66_GH0.tar.gz) = 46030490
-SHA256 (llvm-mirror-clang-7f77c0c9a77506be62cd0c96fbfc1c0c8b3d5220_GH0.tar.gz) = 3531e0602de9d4b3ef56b45da32a7b4271d4f68fa751faa60bc243d1c1901e30
-SIZE (llvm-mirror-clang-7f77c0c9a77506be62cd0c96fbfc1c0c8b3d5220_GH0.tar.gz) = 18095756
-SHA256 (llvm-mirror-compiler-rt-225c642c81174798d0af44148018faa0022ef056_GH0.tar.gz) = 878de1bd743028c6affab1a030a4408145a15dc5dd2e2fc03bf4a4de3768e1a7
-SIZE (llvm-mirror-compiler-rt-225c642c81174798d0af44148018faa0022ef056_GH0.tar.gz) = 3280771
-SHA256 (llvm-mirror-clang-tools-extra-10ead75b2238df9e3ddb19dc73431a57cb0ffb66_GH0.tar.gz) = e212a767cf6d6640b40ce87b5f94e7c0962e9c91cc93cd6c1ba15746131bf6cf
-SIZE (llvm-mirror-clang-tools-extra-10ead75b2238df9e3ddb19dc73431a57cb0ffb66_GH0.tar.gz) = 1426040
-SHA256 (llvm-mirror-lld-e4443d35d929f53a03dcfb72283c53c5fe549d23_GH0.tar.gz) = 85154d769818aa7dbb2797099810bd8ec34d3c4f4f86cb7f1fee084ec9946235
-SIZE (llvm-mirror-lld-e4443d35d929f53a03dcfb72283c53c5fe549d23_GH0.tar.gz) = 1392709
-SHA256 (llvm-mirror-lldb-e29cec1fb4a359e5ac39bc472ad2e48aa4a97229_GH0.tar.gz) = ce236fc8de0b4cf7c11176396787ed7a89442a1281f56a63f30ecdcf8446bb2c
-SIZE (llvm-mirror-lldb-e29cec1fb4a359e5ac39bc472ad2e48aa4a97229_GH0.tar.gz) = 24675546
-SHA256 (llvm-mirror-openmp-c1fe93aaa489a8e621016755bf5269602ab54d8d_GH0.tar.gz) = 4cb9a819088cf5df2f43559c95855f18ca523d4070bf2cb4ebeb88f5e20bec0c
-SIZE (llvm-mirror-openmp-c1fe93aaa489a8e621016755bf5269602ab54d8d_GH0.tar.gz) = 1484607
+TIMESTAMP = 1551198781
+SHA256 (llvm-mirror-llvm-9.0.d20190226-df09ef993aaff2f33e5cd5e039f467b9bae09c7e_GH0.tar.gz) = 999ad545e459dd8d97ee2a8406f79d0e435e714444db1b6699a57ca28c694f08
+SIZE (llvm-mirror-llvm-9.0.d20190226-df09ef993aaff2f33e5cd5e039f467b9bae09c7e_GH0.tar.gz) = 46497809
+SHA256 (llvm-mirror-clang-29e2813a2ab7d5569860bb07892dfef7b5374d96_GH0.tar.gz) = 26547ad3e76689a67279f2f442da0e12b9c79508ea1f02d69eaafcdf93817cbb
+SIZE (llvm-mirror-clang-29e2813a2ab7d5569860bb07892dfef7b5374d96_GH0.tar.gz) = 18213382
+SHA256 (llvm-mirror-compiler-rt-9bd5a04467c4a6c79e6ae9fe48230e33314d0afd_GH0.tar.gz) = fa6e06192e6eae6a6442a6ee50ccd1e97f0892d74382a7e472e756765e8a4d22
+SIZE (llvm-mirror-compiler-rt-9bd5a04467c4a6c79e6ae9fe48230e33314d0afd_GH0.tar.gz) = 3301979
+SHA256 (llvm-mirror-clang-tools-extra-817f87451361131c193245b33e323031e7aeec0c_GH0.tar.gz) = aec3d31fa308669510d5f171fd3dd79652f49ef555a5013580bd7e9c5f579397
+SIZE (llvm-mirror-clang-tools-extra-817f87451361131c193245b33e323031e7aeec0c_GH0.tar.gz) = 1484800
+SHA256 (llvm-mirror-lld-aa7adc0ec804b689771f11d52e39f83a16378f5f_GH0.tar.gz) = 7d768ba405465999522f26b77cbabde79d7d45599684589cfcd09ecfff6e9f7e
+SIZE (llvm-mirror-lld-aa7adc0ec804b689771f11d52e39f83a16378f5f_GH0.tar.gz) = 1419053
+SHA256 (llvm-mirror-lldb-c4cc77b588472061ae5218c9066f6dd047133e85_GH0.tar.gz) = 20106738238c0de29f3e37f9a3b57e2ee16b320f849e5a30f2602c63d5ee78f4
+SIZE (llvm-mirror-lldb-c4cc77b588472061ae5218c9066f6dd047133e85_GH0.tar.gz) = 24805091
+SHA256 (llvm-mirror-openmp-acb2548ddecbc26d46c28b1cd799fe4ca18f8914_GH0.tar.gz) = fb8f64d02ff672096c087a1a38413ccd4fc69fc70ce958dcbfd7e06dc86a3c33
+SIZE (llvm-mirror-openmp-acb2548ddecbc26d46c28b1cd799fe4ca18f8914_GH0.tar.gz) = 1490150
diff --git a/devel/llvm-devel/pkg-plist b/devel/llvm-devel/pkg-plist
index 80e2a25a2d17..0ae59b8e2da9 100644
--- a/devel/llvm-devel/pkg-plist
+++ b/devel/llvm-devel/pkg-plist
@@ -67,6 +67,7 @@ bin/hmaptool-devel
 %%LLD%%bin/wasm-ld-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-test-devel
@@ -139,6 +140,7 @@ llvm-devel/bin/llc
 %%LLD%%llvm-devel/bin/lld-link
 %%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-test
@@ -224,6 +226,7 @@ llvm-devel/bin/yaml2obj
 %%CLANG%%llvm-devel/include/clang/AST/ASTImporterLookupTable.h
 %%CLANG%%llvm-devel/include/clang/AST/ASTLambda.h
 %%CLANG%%llvm-devel/include/clang/AST/ASTMutationListener.h
+%%CLANG%%llvm-devel/include/clang/AST/ASTNodeTraverser.h
 %%CLANG%%llvm-devel/include/clang/AST/ASTStructuralEquivalence.h
 %%CLANG%%llvm-devel/include/clang/AST/ASTTypeTraits.h
 %%CLANG%%llvm-devel/include/clang/AST/ASTUnresolvedSet.h
@@ -352,6 +355,7 @@ llvm-devel/bin/yaml2obj
 %%CLANG%%llvm-devel/include/clang/Analysis/Analyses/UninitializedValues.h
 %%CLANG%%llvm-devel/include/clang/Analysis/AnalysisDeclContext.h
 %%CLANG%%llvm-devel/include/clang/Analysis/AnalysisDiagnostic.h
+%%CLANG%%llvm-devel/include/clang/Analysis/AnyCall.h
 %%CLANG%%llvm-devel/include/clang/Analysis/BodyFarm.h
 %%CLANG%%llvm-devel/include/clang/Analysis/CFG.h
 %%CLANG%%llvm-devel/include/clang/Analysis/CFGStmtMap.h
@@ -363,6 +367,7 @@ llvm-devel/bin/yaml2obj
 %%CLANG%%llvm-devel/include/clang/Analysis/DomainSpecific/ObjCNoReturn.h
 %%CLANG%%llvm-devel/include/clang/Analysis/FlowSensitive/DataflowValues.h
 %%CLANG%%llvm-devel/include/clang/Analysis/ProgramPoint.h
+%%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/ABI.h
@@ -693,11 +698,9 @@ llvm-devel/bin/yaml2obj
 %%CLANG%%llvm-devel/include/clang/StaticAnalyzer/Core/PathSensitive/ProgramState_Fwd.h
 %%CLANG%%llvm-devel/include/clang/StaticAnalyzer/Core/PathSensitive/RangedConstraintManager.h
 %%CLANG%%llvm-devel/include/clang/StaticAnalyzer/Core/PathSensitive/Regions.def
+%%CLANG%%llvm-devel/include/clang/StaticAnalyzer/Core/PathSensitive/SMTAPI.h
 %%CLANG%%llvm-devel/include/clang/StaticAnalyzer/Core/PathSensitive/SMTConstraintManager.h
 %%CLANG%%llvm-devel/include/clang/StaticAnalyzer/Core/PathSensitive/SMTConv.h
-%%CLANG%%llvm-devel/include/clang/StaticAnalyzer/Core/PathSensitive/SMTExpr.h
-%%CLANG%%llvm-devel/include/clang/StaticAnalyzer/Core/PathSensitive/SMTSolver.h
-%%CLANG%%llvm-devel/include/clang/StaticAnalyzer/Core/PathSensitive/SMTSort.h
 %%CLANG%%llvm-devel/include/clang/StaticAnalyzer/Core/PathSensitive/SValBuilder.h
 %%CLANG%%llvm-devel/include/clang/StaticAnalyzer/Core/PathSensitive/SValVisitor.h
 %%CLANG%%llvm-devel/include/clang/StaticAnalyzer/Core/PathSensitive/SVals.def
@@ -713,7 +716,6 @@ llvm-devel/bin/yaml2obj
 %%CLANG%%llvm-devel/include/clang/StaticAnalyzer/Core/PathSensitive/TaintManager.h
 %%CLANG%%llvm-devel/include/clang/StaticAnalyzer/Core/PathSensitive/TaintTag.h
 %%CLANG%%llvm-devel/include/clang/StaticAnalyzer/Core/PathSensitive/WorkList.h
-%%CLANG%%llvm-devel/include/clang/StaticAnalyzer/Core/RetainSummaryManager.h
 %%CLANG%%llvm-devel/include/clang/StaticAnalyzer/Frontend/AnalysisConsumer.h
 %%CLANG%%llvm-devel/include/clang/StaticAnalyzer/Frontend/CheckerRegistration.h
 %%CLANG%%llvm-devel/include/clang/StaticAnalyzer/Frontend/CheckerRegistry.h
@@ -821,7 +823,6 @@ llvm-devel/bin/yaml2obj
 %%LLDB%%llvm-devel/include/lldb/API/SBFrame.h
 %%LLDB%%llvm-devel/include/lldb/API/SBFunction.h
 %%LLDB%%llvm-devel/include/lldb/API/SBHostOS.h
-%%LLDB%%llvm-devel/include/lldb/API/SBInitializerOptions.h
 %%LLDB%%llvm-devel/include/lldb/API/SBInstruction.h
 %%LLDB%%llvm-devel/include/lldb/API/SBInstructionList.h
 %%LLDB%%llvm-devel/include/lldb/API/SBLanguageRuntime.h
@@ -837,6 +838,7 @@ llvm-devel/bin/yaml2obj
 %%LLDB%%llvm-devel/include/lldb/API/SBProcessInfo.h
 %%LLDB%%llvm-devel/include/lldb/API/SBQueue.h
 %%LLDB%%llvm-devel/include/lldb/API/SBQueueItem.h
+%%LLDB%%llvm-devel/include/lldb/API/SBReproducer.h
 %%LLDB%%llvm-devel/include/lldb/API/SBSection.h
 %%LLDB%%llvm-devel/include/lldb/API/SBSourceManager.h
 %%LLDB%%llvm-devel/include/lldb/API/SBStream.h
@@ -989,6 +991,7 @@ llvm-devel/bin/yaml2obj
 %%LLDB%%llvm-devel/include/lldb/Host/Debug.h
 %%LLDB%%llvm-devel/include/lldb/Host/Editline.h
 %%LLDB%%llvm-devel/include/lldb/Host/File.h
+%%LLDB%%llvm-devel/include/lldb/Host/FileAction.h
 %%LLDB%%llvm-devel/include/lldb/Host/FileCache.h
 %%LLDB%%llvm-devel/include/lldb/Host/FileSystem.h
 %%LLDB%%llvm-devel/include/lldb/Host/Host.h
@@ -1011,6 +1014,8 @@ llvm-devel/bin/yaml2obj
 %%LLDB%%llvm-devel/include/lldb/Host/Pipe.h
 %%LLDB%%llvm-devel/include/lldb/Host/PipeBase.h
 %%LLDB%%llvm-devel/include/lldb/Host/PosixApi.h
+%%LLDB%%llvm-devel/include/lldb/Host/ProcessInfo.h
+%%LLDB%%llvm-devel/include/lldb/Host/ProcessLaunchInfo.h
 %%LLDB%%llvm-devel/include/lldb/Host/ProcessLauncher.h
 %%LLDB%%llvm-devel/include/lldb/Host/ProcessRunLock.h
 %%LLDB%%llvm-devel/include/lldb/Host/PseudoTerminal.h
@@ -1134,6 +1139,7 @@ llvm-devel/bin/yaml2obj
 %%LLDB%%llvm-devel/include/lldb/Symbol/LineTable.h
 %%LLDB%%llvm-devel/include/lldb/Symbol/ObjectContainer.h
 %%LLDB%%llvm-devel/include/lldb/Symbol/ObjectFile.h
+%%LLDB%%llvm-devel/include/lldb/Symbol/SourceModule.h
 %%LLDB%%llvm-devel/include/lldb/Symbol/Symbol.h
 %%LLDB%%llvm-devel/include/lldb/Symbol/SymbolContext.h
 %%LLDB%%llvm-devel/include/lldb/Symbol/SymbolContextScope.h
@@ -1155,7 +1161,6 @@ llvm-devel/bin/yaml2obj
 %%LLDB%%llvm-devel/include/lldb/Target/DynamicLoader.h
 %%LLDB%%llvm-devel/include/lldb/Target/ExecutionContext.h
 %%LLDB%%llvm-devel/include/lldb/Target/ExecutionContextScope.h
-%%LLDB%%llvm-devel/include/lldb/Target/FileAction.h
 %%LLDB%%llvm-devel/include/lldb/Target/InstrumentationRuntime.h
 %%LLDB%%llvm-devel/include/lldb/Target/InstrumentationRuntimeStopInfo.h
 %%LLDB%%llvm-devel/include/lldb/Target/JITLoader.h
@@ -1171,8 +1176,6 @@ llvm-devel/bin/yaml2obj
 %%LLDB%%llvm-devel/include/lldb/Target/PathMappingList.h
 %%LLDB%%llvm-devel/include/lldb/Target/Platform.h
 %%LLDB%%llvm-devel/include/lldb/Target/Process.h
-%%LLDB%%llvm-devel/include/lldb/Target/ProcessInfo.h
-%%LLDB%%llvm-devel/include/lldb/Target/ProcessLaunchInfo.h
 %%LLDB%%llvm-devel/include/lldb/Target/ProcessStructReader.h
 %%LLDB%%llvm-devel/include/lldb/Target/Queue.h
 %%LLDB%%llvm-devel/include/lldb/Target/QueueItem.h
@@ -1180,6 +1183,7 @@ llvm-devel/bin/yaml2obj
 %%LLDB%%llvm-devel/include/lldb/Target/RegisterCheckpoint.h
 %%LLDB%%llvm-devel/include/lldb/Target/RegisterContext.h
 %%LLDB%%llvm-devel/include/lldb/Target/RegisterNumber.h
+%%LLDB%%llvm-devel/include/lldb/Target/RemoteAwarePlatform.h
 %%LLDB%%llvm-devel/include/lldb/Target/SectionLoadHistory.h
 %%LLDB%%llvm-devel/include/lldb/Target/SectionLoadList.h
 %%LLDB%%llvm-devel/include/lldb/Target/StackFrame.h
@@ -1233,6 +1237,7 @@ 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
@@ -1247,6 +1252,7 @@ llvm-devel/bin/yaml2obj
 %%LLDB%%llvm-devel/include/lldb/Utility/RegisterValue.h
 %%LLDB%%llvm-devel/include/lldb/Utility/RegularExpression.h
 %%LLDB%%llvm-devel/include/lldb/Utility/Reproducer.h
+%%LLDB%%llvm-devel/include/lldb/Utility/ReproducerInstrumentation.h
 %%LLDB%%llvm-devel/include/lldb/Utility/Scalar.h
 %%LLDB%%llvm-devel/include/lldb/Utility/SelectHelper.h
 %%LLDB%%llvm-devel/include/lldb/Utility/SharedCluster.h
@@ -1384,6 +1390,7 @@ llvm-devel/include/llvm/ADT/UniqueVector.h
 llvm-devel/include/llvm/ADT/VariadicFunction.h
 llvm-devel/include/llvm/ADT/bit.h
 llvm-devel/include/llvm/ADT/edit_distance.h
+llvm-devel/include/llvm/ADT/fallible_iterator.h
 llvm-devel/include/llvm/ADT/ilist.h
 llvm-devel/include/llvm/ADT/ilist_base.h
 llvm-devel/include/llvm/ADT/ilist_iterator.h
@@ -1419,6 +1426,7 @@ llvm-devel/include/llvm/Analysis/DemandedBits.h
 llvm-devel/include/llvm/Analysis/DependenceAnalysis.h
 llvm-devel/include/llvm/Analysis/DivergenceAnalysis.h
 llvm-devel/include/llvm/Analysis/DomPrinter.h
+llvm-devel/include/llvm/Analysis/DomTreeUpdater.h
 llvm-devel/include/llvm/Analysis/DominanceFrontier.h
 llvm-devel/include/llvm/Analysis/DominanceFrontierImpl.h
 llvm-devel/include/llvm/Analysis/EHPersonalities.h
@@ -1998,7 +2006,6 @@ llvm-devel/include/llvm/IR/DerivedUser.h
 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/DomTreeUpdater.h
 llvm-devel/include/llvm/IR/Dominators.h
 llvm-devel/include/llvm/IR/Function.h
 llvm-devel/include/llvm/IR/GVMaterializer.h
@@ -2366,6 +2373,7 @@ llvm-devel/include/llvm/Support/SaveAndRestore.h
 llvm-devel/include/llvm/Support/ScaledNumber.h
 llvm-devel/include/llvm/Support/ScopedPrinter.h
 llvm-devel/include/llvm/Support/Signals.h
+llvm-devel/include/llvm/Support/Signposts.h
 llvm-devel/include/llvm/Support/SmallVectorMemoryBuffer.h
 llvm-devel/include/llvm/Support/Solaris/sys/regset.h
 llvm-devel/include/llvm/Support/SourceMgr.h
@@ -2473,6 +2481,7 @@ llvm-devel/include/llvm/Transforms/IPO/WholeProgramDevirt.h
 llvm-devel/include/llvm/Transforms/InstCombine/InstCombine.h
 llvm-devel/include/llvm/Transforms/InstCombine/InstCombineWorklist.h
 llvm-devel/include/llvm/Transforms/Instrumentation.h
+llvm-devel/include/llvm/Transforms/Instrumentation/AddressSanitizer.h
 llvm-devel/include/llvm/Transforms/Instrumentation/BoundsChecking.h
 llvm-devel/include/llvm/Transforms/Instrumentation/CGProfile.h
 llvm-devel/include/llvm/Transforms/Instrumentation/ControlHeightReduction.h
@@ -2521,6 +2530,7 @@ llvm-devel/include/llvm/Transforms/Scalar/LoopUnrollPass.h
 llvm-devel/include/llvm/Transforms/Scalar/LowerAtomic.h
 llvm-devel/include/llvm/Transforms/Scalar/LowerExpectIntrinsic.h
 llvm-devel/include/llvm/Transforms/Scalar/LowerGuardIntrinsic.h
+llvm-devel/include/llvm/Transforms/Scalar/LowerWidenableCondition.h
 llvm-devel/include/llvm/Transforms/Scalar/MakeGuardsExplicit.h
 llvm-devel/include/llvm/Transforms/Scalar/MemCpyOptimizer.h
 llvm-devel/include/llvm/Transforms/Scalar/MergedLoadStoreMotion.h
@@ -2705,9 +2715,9 @@ llvm-devel/include/llvm/XRay/YAMLXRayRecord.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/msa.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/mwaitxintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/nmmintrin.h
-%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/omp-tools.h
+%%OPENMP%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/omp-tools.h
 %%OPENMP%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/omp.h
-%%CLANG%%%%OPENMP%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/ompt.h
+%%OPENMP%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/ompt.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/opencl-c.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/pconfigintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/pkuintrin.h
@@ -2754,8 +2764,7 @@ llvm-devel/lib/cmake/llvm/DetermineGCCCompatible.cmake
 llvm-devel/lib/cmake/llvm/FindLibpfm.cmake
 llvm-devel/lib/cmake/llvm/FindOCaml.cmake
 llvm-devel/lib/cmake/llvm/FindSphinx.cmake
-llvm-devel/lib/cmake/llvm/GenerateVersionFromCVS.cmake
-llvm-devel/lib/cmake/llvm/GetSVN.cmake
+llvm-devel/lib/cmake/llvm/GenerateVersionFromVCS.cmake
 llvm-devel/lib/cmake/llvm/HandleLLVMOptions.cmake
 llvm-devel/lib/cmake/llvm/HandleLLVMStdlib.cmake
 llvm-devel/lib/cmake/llvm/LLVM-Config.cmake
@@ -2933,6 +2942,7 @@ llvm-devel/lib/libOptRemarks.so.%%LLVM_MAJOR%%svn
 %%CLANG%%llvm-devel/lib/libclangCodeGen.a
 %%CLANG%%llvm-devel/lib/libclangCrossTU.a
 %%CLANG%%llvm-devel/lib/libclangDaemon.a
+%%CLANG%%llvm-devel/lib/libclangDaemonTweaks.a
 %%CLANG%%llvm-devel/lib/libclangDoc.a
 %%CLANG%%llvm-devel/lib/libclangDriver.a
 %%CLANG%%llvm-devel/lib/libclangDynamicASTMatchers.a
@@ -3124,7 +3134,6 @@ llvm-devel/share/opt-viewer/style.css
 %%CLANG%%llvm-devel/share/scan-view/startfile.py
 %%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/BooleanExpression.py
 %%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/LitConfig.py
-%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/LitTestCase.py
 %%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/ProgressBar.py
 %%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/ShCommands.py
 %%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/ShUtil.py
@@ -3136,5 +3145,6 @@ llvm-devel/share/opt-viewer/style.css
 %%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/main.py
 %%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/run.py
 %%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/util.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/worker.py
 @postexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi
 @postunexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi