Update to a new snapshot.

Correct finding libopenmp.

PR:		236788
Submitted by:	jbeich

4 files changed, 59 insertions, 36 deletions

diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile
index 1fb79d5ba0d1..c1b962eadaab 100644
--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@@ -36,7 +36,7 @@ SHEBANG_FILES=	utils/lit/lit.py utils/llvm-lit/llvm-lit.in \
 		tools/clang/tools/clang-format/clang-format-diff.py \
 		tools/clang/tools/extra/clang-tidy/tool/clang-tidy-diff.py \
 		tools/clang/tools/extra/clang-tidy/tool/run-clang-tidy.py \
-		tools/clang/tools/extra/include-fixer/find-all-symbols/tool/run-find-all-symbols.py \
+		tools/clang/tools/extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py \
 		tools/opt-viewer/optrecord.py \
 		tools/opt-viewer/opt-diff.py \
 		tools/opt-viewer/opt-stats.py \
@@ -341,6 +341,8 @@ post-patch:
 	    ${WRKSRC}/CMakeLists.txt
 
 post-patch-CLANG-on:
+	${REINPLACE_CMD} -e 's|%%LLVM_PREFIX%%|${LLVM_PREFIX}|' \
+	    ${PATCH_WRKSRC}/tools/clang/lib/Driver/ToolChains/CommonArgs.cpp
 	${REINPLACE_CMD} -e 's|%%LLVM_SUFFIX%%|${LLVM_SUFFIX}|' \
 	    ${PATCH_WRKSRC}/tools/clang/tools/clang-format/clang-format.py \
 	    ${PATCH_WRKSRC}/tools/clang/tools/clang-format/clang-format-sublime.py \
diff --git a/devel/llvm-devel/Makefile.snapshot b/devel/llvm-devel/Makefile.snapshot
index b5e541f6c631..0327a0ebb69a 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=	20190226
+SNAPDATE=	20190326
 
-LLVM_COMMIT=		df09ef993aaff2f33e5cd5e039f467b9bae09c7e
-CLANG_COMMIT=		29e2813a2ab7d5569860bb07892dfef7b5374d96
-COMPILER_RT_COMMIT=	9bd5a04467c4a6c79e6ae9fe48230e33314d0afd
-EXTRAS_COMMIT=		817f87451361131c193245b33e323031e7aeec0c
-LLD_COMMIT=		aa7adc0ec804b689771f11d52e39f83a16378f5f
-LLDB_COMMIT=		c4cc77b588472061ae5218c9066f6dd047133e85
-OPENMP_COMMIT=		acb2548ddecbc26d46c28b1cd799fe4ca18f8914
+LLVM_COMMIT=		2cdd5b4ce00108bc0d610813cf594fbf928cf9f5
+CLANG_COMMIT=		182d7fa38b05c20dea18a8d5c922710b2f0b7875
+COMPILER_RT_COMMIT=	2cc760cd1eee93e5ab3bb6fcbaae19e326790d85
+EXTRAS_COMMIT=		61c9b97d7b81cc2c013b423bf1763a92b14fcae3
+LLD_COMMIT=		8631b6a9d0b5f88c70c52eaad8c2385a51c584dd
+LLDB_COMMIT=		2102525947c11f7498597ef950c54a192885e508
+OPENMP_COMMIT=		3e3199a8000cd9d3b8f9f36a12798cc336fcd63f
diff --git a/devel/llvm-devel/distinfo b/devel/llvm-devel/distinfo
index 73f9e5540841..5a43fe59b84c 100644
--- a/devel/llvm-devel/distinfo
+++ b/devel/llvm-devel/distinfo
@@ -1,15 +1,15 @@
-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
+TIMESTAMP = 1553618549
+SHA256 (llvm-mirror-llvm-9.0.d20190326-2cdd5b4ce00108bc0d610813cf594fbf928cf9f5_GH0.tar.gz) = 96dbb58beb011ecbfe73c5a9648d35e910f7c14ec4b2c61a9479b4c4a7d659e6
+SIZE (llvm-mirror-llvm-9.0.d20190326-2cdd5b4ce00108bc0d610813cf594fbf928cf9f5_GH0.tar.gz) = 46914479
+SHA256 (llvm-mirror-clang-182d7fa38b05c20dea18a8d5c922710b2f0b7875_GH0.tar.gz) = c559c5154e40e25f83cab180015356db2cd9378d3236a1ef158cad1b7e444203
+SIZE (llvm-mirror-clang-182d7fa38b05c20dea18a8d5c922710b2f0b7875_GH0.tar.gz) = 18372075
+SHA256 (llvm-mirror-compiler-rt-2cc760cd1eee93e5ab3bb6fcbaae19e326790d85_GH0.tar.gz) = f299e317038b270cb6775ff396389ed7973966dccdb61eade5293fabcb60c91e
+SIZE (llvm-mirror-compiler-rt-2cc760cd1eee93e5ab3bb6fcbaae19e326790d85_GH0.tar.gz) = 3297553
+SHA256 (llvm-mirror-clang-tools-extra-61c9b97d7b81cc2c013b423bf1763a92b14fcae3_GH0.tar.gz) = 1cda8ac862733e48a232351f4648021c374fde2c1eaa45f417f4a03d4f1c8c70
+SIZE (llvm-mirror-clang-tools-extra-61c9b97d7b81cc2c013b423bf1763a92b14fcae3_GH0.tar.gz) = 2486760
+SHA256 (llvm-mirror-lld-8631b6a9d0b5f88c70c52eaad8c2385a51c584dd_GH0.tar.gz) = d808749b117ca131ea4e03c0c9a0306ec6b16608f88ad509fe08b3722bcdd539
+SIZE (llvm-mirror-lld-8631b6a9d0b5f88c70c52eaad8c2385a51c584dd_GH0.tar.gz) = 1425825
+SHA256 (llvm-mirror-lldb-2102525947c11f7498597ef950c54a192885e508_GH0.tar.gz) = 6596342ffe7bbabdf48b8e72d7d4abfd17b7c76c645ab6fa805cff751932edb6
+SIZE (llvm-mirror-lldb-2102525947c11f7498597ef950c54a192885e508_GH0.tar.gz) = 24868427
+SHA256 (llvm-mirror-openmp-3e3199a8000cd9d3b8f9f36a12798cc336fcd63f_GH0.tar.gz) = 0b92f7b2b3e8e2e1b85c285a2f3411cb30d2e23851ab0a1051ffc97354fbd121
+SIZE (llvm-mirror-openmp-3e3199a8000cd9d3b8f9f36a12798cc336fcd63f_GH0.tar.gz) = 1473285
diff --git a/devel/llvm-devel/pkg-plist b/devel/llvm-devel/pkg-plist
index c00843c4b154..e386062ffc23 100644
--- a/devel/llvm-devel/pkg-plist
+++ b/devel/llvm-devel/pkg-plist
@@ -450,7 +450,6 @@ llvm-devel/bin/yaml2obj
 %%CLANG%%llvm-devel/include/clang/Basic/Linkage.h
 %%CLANG%%llvm-devel/include/clang/Basic/MSP430Target.def
 %%CLANG%%llvm-devel/include/clang/Basic/MacroBuilder.h
-%%CLANG%%llvm-devel/include/clang/Basic/MemoryBufferCache.h
 %%CLANG%%llvm-devel/include/clang/Basic/Module.h
 %%CLANG%%llvm-devel/include/clang/Basic/ObjCRuntime.h
 %%CLANG%%llvm-devel/include/clang/Basic/OpenCLExtensionTypes.def
@@ -561,6 +560,7 @@ llvm-devel/bin/yaml2obj
 %%CLANG%%llvm-devel/include/clang/FrontendTool/Utils.h
 %%CLANG%%llvm-devel/include/clang/Index/CodegenNameGenerator.h
 %%CLANG%%llvm-devel/include/clang/Index/CommentToXML.h
+%%CLANG%%llvm-devel/include/clang/Index/DeclOccurrence.h
 %%CLANG%%llvm-devel/include/clang/Index/IndexDataConsumer.h
 %%CLANG%%llvm-devel/include/clang/Index/IndexSymbol.h
 %%CLANG%%llvm-devel/include/clang/Index/IndexingAction.h
@@ -653,6 +653,7 @@ llvm-devel/bin/yaml2obj
 %%CLANG%%llvm-devel/include/clang/Serialization/AttrPCHWrite.inc
 %%CLANG%%llvm-devel/include/clang/Serialization/ContinuousRangeMap.h
 %%CLANG%%llvm-devel/include/clang/Serialization/GlobalModuleIndex.h
+%%CLANG%%llvm-devel/include/clang/Serialization/InMemoryModuleCache.h
 %%CLANG%%llvm-devel/include/clang/Serialization/Module.h
 %%CLANG%%llvm-devel/include/clang/Serialization/ModuleFileExtension.h
 %%CLANG%%llvm-devel/include/clang/Serialization/ModuleManager.h
@@ -698,7 +699,6 @@ 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/SValBuilder.h
@@ -768,6 +768,7 @@ llvm-devel/bin/yaml2obj
 %%LLD%%llvm-devel/include/lld/Common/Args.h
 %%LLD%%llvm-devel/include/lld/Common/Driver.h
 %%LLD%%llvm-devel/include/lld/Common/ErrorHandler.h
+%%LLD%%llvm-devel/include/lld/Common/Filesystem.h
 %%LLD%%llvm-devel/include/lld/Common/LLVM.h
 %%LLD%%llvm-devel/include/lld/Common/Memory.h
 %%LLD%%llvm-devel/include/lld/Common/Reproduce.h
@@ -918,7 +919,6 @@ llvm-devel/bin/yaml2obj
 %%LLDB%%llvm-devel/include/lldb/Core/Opcode.h
 %%LLDB%%llvm-devel/include/lldb/Core/PluginInterface.h
 %%LLDB%%llvm-devel/include/lldb/Core/PluginManager.h
-%%LLDB%%llvm-devel/include/lldb/Core/RangeMap.h
 %%LLDB%%llvm-devel/include/lldb/Core/RichManglingContext.h
 %%LLDB%%llvm-devel/include/lldb/Core/STLUtils.h
 %%LLDB%%llvm-devel/include/lldb/Core/SearchFilter.h
@@ -1014,7 +1014,6 @@ 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
@@ -1023,7 +1022,6 @@ llvm-devel/bin/yaml2obj
 %%LLDB%%llvm-devel/include/lldb/Host/Socket.h
 %%LLDB%%llvm-devel/include/lldb/Host/SocketAddress.h
 %%LLDB%%llvm-devel/include/lldb/Host/StringConvert.h
-%%LLDB%%llvm-devel/include/lldb/Host/Symbols.h
 %%LLDB%%llvm-devel/include/lldb/Host/TaskPool.h
 %%LLDB%%llvm-devel/include/lldb/Host/Terminal.h
 %%LLDB%%llvm-devel/include/lldb/Host/ThreadLauncher.h
@@ -1137,6 +1135,7 @@ llvm-devel/bin/yaml2obj
 %%LLDB%%llvm-devel/include/lldb/Symbol/Function.h
 %%LLDB%%llvm-devel/include/lldb/Symbol/LineEntry.h
 %%LLDB%%llvm-devel/include/lldb/Symbol/LineTable.h
+%%LLDB%%llvm-devel/include/lldb/Symbol/LocateSymbolFile.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
@@ -1249,6 +1248,8 @@ llvm-devel/bin/yaml2obj
 %%LLDB%%llvm-devel/include/lldb/Utility/Logging.h
 %%LLDB%%llvm-devel/include/lldb/Utility/NameMatches.h
 %%LLDB%%llvm-devel/include/lldb/Utility/Predicate.h
+%%LLDB%%llvm-devel/include/lldb/Utility/ProcessInfo.h
+%%LLDB%%llvm-devel/include/lldb/Utility/RangeMap.h
 %%LLDB%%llvm-devel/include/lldb/Utility/RegisterValue.h
 %%LLDB%%llvm-devel/include/lldb/Utility/RegularExpression.h
 %%LLDB%%llvm-devel/include/lldb/Utility/Reproducer.h
@@ -1276,6 +1277,7 @@ llvm-devel/bin/yaml2obj
 %%LLDB%%llvm-devel/include/lldb/Utility/UUID.h
 %%LLDB%%llvm-devel/include/lldb/Utility/UriParser.h
 %%LLDB%%llvm-devel/include/lldb/Utility/UserID.h
+%%LLDB%%llvm-devel/include/lldb/Utility/UserIDResolver.h
 %%LLDB%%llvm-devel/include/lldb/Utility/VASPrintf.h
 %%LLDB%%llvm-devel/include/lldb/Utility/VMRange.h
 %%LLDB%%llvm-devel/include/lldb/lldb-defines.h
@@ -1307,8 +1309,8 @@ llvm-devel/include/llvm-c/Initialization.h
 llvm-devel/include/llvm-c/LinkTimeOptimizer.h
 llvm-devel/include/llvm-c/Linker.h
 llvm-devel/include/llvm-c/Object.h
-llvm-devel/include/llvm-c/OptRemarks.h
 llvm-devel/include/llvm-c/OrcBindings.h
+llvm-devel/include/llvm-c/Remarks.h
 llvm-devel/include/llvm-c/Support.h
 llvm-devel/include/llvm-c/Target.h
 llvm-devel/include/llvm-c/TargetMachine.h
@@ -1532,10 +1534,12 @@ llvm-devel/include/llvm/BinaryFormat/ELFRelocs/x86_64.def
 llvm-devel/include/llvm/BinaryFormat/MachO.def
 llvm-devel/include/llvm/BinaryFormat/MachO.h
 llvm-devel/include/llvm/BinaryFormat/Magic.h
+llvm-devel/include/llvm/BinaryFormat/Minidump.h
+llvm-devel/include/llvm/BinaryFormat/MinidumpConstants.def
 llvm-devel/include/llvm/BinaryFormat/MsgPack.def
 llvm-devel/include/llvm/BinaryFormat/MsgPack.h
+llvm-devel/include/llvm/BinaryFormat/MsgPackDocument.h
 llvm-devel/include/llvm/BinaryFormat/MsgPackReader.h
-llvm-devel/include/llvm/BinaryFormat/MsgPackTypes.h
 llvm-devel/include/llvm/BinaryFormat/MsgPackWriter.h
 llvm-devel/include/llvm/BinaryFormat/Wasm.h
 llvm-devel/include/llvm/BinaryFormat/WasmRelocs.def
@@ -1616,6 +1620,7 @@ llvm-devel/include/llvm/CodeGen/LiveStacks.h
 llvm-devel/include/llvm/CodeGen/LiveVariables.h
 llvm-devel/include/llvm/CodeGen/LoopTraversal.h
 llvm-devel/include/llvm/CodeGen/LowLevelType.h
+llvm-devel/include/llvm/CodeGen/MIRParser/MIParser.h
 llvm-devel/include/llvm/CodeGen/MIRParser/MIRParser.h
 llvm-devel/include/llvm/CodeGen/MIRPrinter.h
 llvm-devel/include/llvm/CodeGen/MIRYamlMapping.h
@@ -2066,6 +2071,7 @@ llvm-devel/include/llvm/IR/PassTimingInfo.h
 llvm-devel/include/llvm/IR/PatternMatch.h
 llvm-devel/include/llvm/IR/PredIteratorCache.h
 llvm-devel/include/llvm/IR/ProfileSummary.h
+llvm-devel/include/llvm/IR/RemarkStreamer.h
 llvm-devel/include/llvm/IR/RuntimeLibcalls.def
 llvm-devel/include/llvm/IR/SafepointIRVerifier.h
 llvm-devel/include/llvm/IR/Statepoint.h
@@ -2209,9 +2215,10 @@ llvm-devel/include/llvm/Object/IRObjectFile.h
 llvm-devel/include/llvm/Object/IRSymtab.h
 llvm-devel/include/llvm/Object/MachO.h
 llvm-devel/include/llvm/Object/MachOUniversal.h
+llvm-devel/include/llvm/Object/Minidump.h
 llvm-devel/include/llvm/Object/ModuleSymbolTable.h
 llvm-devel/include/llvm/Object/ObjectFile.h
-llvm-devel/include/llvm/Object/RelocVisitor.h
+llvm-devel/include/llvm/Object/RelocationResolver.h
 llvm-devel/include/llvm/Object/StackMapParser.h
 llvm-devel/include/llvm/Object/SymbolSize.h
 llvm-devel/include/llvm/Object/SymbolicFile.h
@@ -2227,6 +2234,7 @@ llvm-devel/include/llvm/ObjectYAML/DWARFEmitter.h
 llvm-devel/include/llvm/ObjectYAML/DWARFYAML.h
 llvm-devel/include/llvm/ObjectYAML/ELFYAML.h
 llvm-devel/include/llvm/ObjectYAML/MachOYAML.h
+llvm-devel/include/llvm/ObjectYAML/MinidumpYAML.h
 llvm-devel/include/llvm/ObjectYAML/ObjectYAML.h
 llvm-devel/include/llvm/ObjectYAML/WasmYAML.h
 llvm-devel/include/llvm/ObjectYAML/YAML.h
@@ -2256,6 +2264,8 @@ llvm-devel/include/llvm/ProfileData/ProfileCommon.h
 llvm-devel/include/llvm/ProfileData/SampleProf.h
 llvm-devel/include/llvm/ProfileData/SampleProfReader.h
 llvm-devel/include/llvm/ProfileData/SampleProfWriter.h
+llvm-devel/include/llvm/Remarks/Remark.h
+llvm-devel/include/llvm/Remarks/RemarkParser.h
 llvm-devel/include/llvm/Support/AArch64TargetParser.def
 llvm-devel/include/llvm/Support/AArch64TargetParser.h
 llvm-devel/include/llvm/Support/AMDGPUMetadata.h
@@ -2369,6 +2379,7 @@ llvm-devel/include/llvm/Support/Registry.h
 llvm-devel/include/llvm/Support/ReverseIteration.h
 llvm-devel/include/llvm/Support/SHA1.h
 llvm-devel/include/llvm/Support/SMLoc.h
+llvm-devel/include/llvm/Support/SMTAPI.h
 llvm-devel/include/llvm/Support/SaveAndRestore.h
 llvm-devel/include/llvm/Support/ScaledNumber.h
 llvm-devel/include/llvm/Support/ScopedPrinter.h
@@ -2447,6 +2458,14 @@ llvm-devel/include/llvm/Testing/Support/Error.h
 llvm-devel/include/llvm/Testing/Support/SupportHelpers.h
 llvm-devel/include/llvm/TextAPI/ELF/ELFStub.h
 llvm-devel/include/llvm/TextAPI/ELF/TBEHandler.h
+llvm-devel/include/llvm/TextAPI/MachO/Architecture.def
+llvm-devel/include/llvm/TextAPI/MachO/Architecture.h
+llvm-devel/include/llvm/TextAPI/MachO/ArchitectureSet.h
+llvm-devel/include/llvm/TextAPI/MachO/InterfaceFile.h
+llvm-devel/include/llvm/TextAPI/MachO/PackedVersion.h
+llvm-devel/include/llvm/TextAPI/MachO/Symbol.h
+llvm-devel/include/llvm/TextAPI/MachO/TextAPIReader.h
+llvm-devel/include/llvm/TextAPI/MachO/TextAPIWriter.h
 llvm-devel/include/llvm/ToolDrivers/llvm-dlltool/DlltoolDriver.h
 llvm-devel/include/llvm/ToolDrivers/llvm-lib/LibDriver.h
 llvm-devel/include/llvm/Transforms/AggressiveInstCombine/AggressiveInstCombine.h
@@ -2486,6 +2505,7 @@ llvm-devel/include/llvm/Transforms/Instrumentation/BoundsChecking.h
 llvm-devel/include/llvm/Transforms/Instrumentation/CGProfile.h
 llvm-devel/include/llvm/Transforms/Instrumentation/ControlHeightReduction.h
 llvm-devel/include/llvm/Transforms/Instrumentation/GCOVProfiler.h
+llvm-devel/include/llvm/Transforms/Instrumentation/InstrOrderFile.h
 llvm-devel/include/llvm/Transforms/Instrumentation/InstrProfiling.h
 llvm-devel/include/llvm/Transforms/Instrumentation/MemorySanitizer.h
 llvm-devel/include/llvm/Transforms/Instrumentation/PGOInstrumentation.h
@@ -2627,7 +2647,6 @@ llvm-devel/include/llvm/XRay/YAMLXRayRecord.h
 %%COMPILER_RT%%llvm-devel/include/sanitizer/common_interface_defs.h
 %%COMPILER_RT%%llvm-devel/include/sanitizer/coverage_interface.h
 %%COMPILER_RT%%llvm-devel/include/sanitizer/dfsan_interface.h
-%%COMPILER_RT%%llvm-devel/include/sanitizer/esan_interface.h
 %%COMPILER_RT%%llvm-devel/include/sanitizer/hwasan_interface.h
 %%COMPILER_RT%%llvm-devel/include/sanitizer/linux_syscall_hooks.h
 %%COMPILER_RT%%llvm-devel/include/sanitizer/lsan_interface.h
@@ -2764,6 +2783,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/FindZ3.cmake
 llvm-devel/lib/cmake/llvm/GenerateVersionFromVCS.cmake
 llvm-devel/lib/cmake/llvm/HandleLLVMOptions.cmake
 llvm-devel/lib/cmake/llvm/HandleLLVMStdlib.cmake
@@ -2871,7 +2891,6 @@ llvm-devel/lib/libLLVMNVPTXInfo.a
 llvm-devel/lib/libLLVMObjCARCOpts.a
 llvm-devel/lib/libLLVMObject.a
 llvm-devel/lib/libLLVMObjectYAML.a
-llvm-devel/lib/libLLVMOptRemarks.a
 llvm-devel/lib/libLLVMOption.a
 llvm-devel/lib/libLLVMOrcJIT.a
 llvm-devel/lib/libLLVMPasses.a
@@ -2882,6 +2901,7 @@ llvm-devel/lib/libLLVMPowerPCDesc.a
 llvm-devel/lib/libLLVMPowerPCDisassembler.a
 llvm-devel/lib/libLLVMPowerPCInfo.a
 llvm-devel/lib/libLLVMProfileData.a
+llvm-devel/lib/libLLVMRemarks.a
 llvm-devel/lib/libLLVMRuntimeDyld.a
 llvm-devel/lib/libLLVMScalarOpts.a
 llvm-devel/lib/libLLVMSelectionDAG.a
@@ -2927,8 +2947,8 @@ llvm-devel/lib/libLLVMXRay.a
 llvm-devel/lib/libLLVMipo.a
 llvm-devel/lib/libLTO.so
 llvm-devel/lib/libLTO.so.%%LLVM_MAJOR%%svn
-llvm-devel/lib/libOptRemarks.so
-llvm-devel/lib/libOptRemarks.so.%%LLVM_MAJOR%%svn
+llvm-devel/lib/libRemarks.so
+llvm-devel/lib/libRemarks.so.%%LLVM_MAJOR%%svn
 %%CLANG%%llvm-devel/lib/libclang.so
 %%CLANG%%llvm-devel/lib/libclang.so.%%LLVM_MAJOR%%
 %%CLANG%%llvm-devel/lib/libclang.so.%%LLVM_MAJOR%%svn
@@ -2982,6 +3002,7 @@ llvm-devel/lib/libOptRemarks.so.%%LLVM_MAJOR%%svn
 %%EXTRAS%%llvm-devel/lib/libclangTidyMiscModule.a
 %%EXTRAS%%llvm-devel/lib/libclangTidyModernizeModule.a
 %%EXTRAS%%llvm-devel/lib/libclangTidyObjCModule.a
+%%EXTRAS%%llvm-devel/lib/libclangTidyOpenMPModule.a
 %%EXTRAS%%llvm-devel/lib/libclangTidyPerformanceModule.a
 %%EXTRAS%%llvm-devel/lib/libclangTidyPlugin.a
 %%EXTRAS%%llvm-devel/lib/libclangTidyPortabilityModule.a