1 files changed, 199 insertions, 98 deletions

diff --git a/devel/llvm-devel/pkg-plist b/devel/llvm-devel/pkg-plist
index f7cd25027373..63aae3aa8f44 100644
--- a/devel/llvm-devel/pkg-plist
+++ b/devel/llvm-devel/pkg-plist
@@ -59,7 +59,7 @@ llvm-devel/bin/bugpoint
 %%CLANG%%llvm-devel/bin/c-index-test
 %%CLANG%%llvm-devel/bin/clang
 %%CLANG%%llvm-devel/bin/clang++
-%%CLANG%%llvm-devel/bin/clang-3.9
+%%CLANG%%llvm-devel/bin/clang-%%LLVM_MAJOR%%
 %%EXTRAS%%llvm-devel/bin/clang-apply-replacements
 %%CLANG%%llvm-devel/bin/clang-check
 %%CLANG%%llvm-devel/bin/clang-cl
@@ -74,12 +74,12 @@ llvm-devel/bin/llc
 %%LLD%%llvm-devel/bin/lld
 %%LLD%%llvm-devel/bin/lld-link
 %%LLDB%%llvm-devel/bin/lldb
-%%LLDB%%llvm-devel/bin/lldb-3.9.0
+%%LLDB%%llvm-devel/bin/lldb-%%LLVM_RELEASE%%
 %%LLDB%%llvm-devel/bin/lldb-argdumper
 %%LLDB%%llvm-devel/bin/lldb-mi
-%%LLDB%%llvm-devel/bin/lldb-mi-3.9.0
+%%LLDB%%llvm-devel/bin/lldb-mi-%%LLVM_RELEASE%%
 %%LLDB%%llvm-devel/bin/lldb-server
-%%LLDB%%llvm-devel/bin/lldb-server-3.9.0
+%%LLDB%%llvm-devel/bin/lldb-server-%%LLVM_RELEASE%%
 llvm-devel/bin/lli
 llvm-devel/bin/llvm-ar
 llvm-devel/bin/llvm-as
@@ -148,6 +148,7 @@ llvm-devel/bin/yaml2obj
 %%CLANG%%llvm-devel/include/clang/AST/AttrIterator.h
 %%CLANG%%llvm-devel/include/clang/AST/AttrVisitor.inc
 %%CLANG%%llvm-devel/include/clang/AST/Attrs.inc
+%%CLANG%%llvm-devel/include/clang/AST/Availability.h
 %%CLANG%%llvm-devel/include/clang/AST/BaseSubobject.h
 %%CLANG%%llvm-devel/include/clang/AST/BuiltinTypes.def
 %%CLANG%%llvm-devel/include/clang/AST/CXXInheritance.h
@@ -285,6 +286,7 @@ llvm-devel/bin/yaml2obj
 %%CLANG%%llvm-devel/include/clang/Basic/CapturedStmt.h
 %%CLANG%%llvm-devel/include/clang/Basic/CharInfo.h
 %%CLANG%%llvm-devel/include/clang/Basic/CommentOptions.h
+%%CLANG%%llvm-devel/include/clang/Basic/Cuda.h
 %%CLANG%%llvm-devel/include/clang/Basic/DebugInfoOptions.h
 %%CLANG%%llvm-devel/include/clang/Basic/Diagnostic.h
 %%CLANG%%llvm-devel/include/clang/Basic/DiagnosticASTKinds.inc
@@ -319,6 +321,7 @@ llvm-devel/bin/yaml2obj
 %%CLANG%%llvm-devel/include/clang/Basic/ObjCRuntime.h
 %%CLANG%%llvm-devel/include/clang/Basic/OpenCLExtensions.def
 %%CLANG%%llvm-devel/include/clang/Basic/OpenCLImageTypes.def
+%%CLANG%%llvm-devel/include/clang/Basic/OpenCLOptions.h
 %%CLANG%%llvm-devel/include/clang/Basic/OpenMPKinds.def
 %%CLANG%%llvm-devel/include/clang/Basic/OpenMPKinds.h
 %%CLANG%%llvm-devel/include/clang/Basic/OperatorKinds.def
@@ -466,6 +469,7 @@ llvm-devel/bin/yaml2obj
 %%CLANG%%llvm-devel/include/clang/Sema/AttrTemplateInstantiate.inc
 %%CLANG%%llvm-devel/include/clang/Sema/AttributeList.h
 %%CLANG%%llvm-devel/include/clang/Sema/CXXFieldCollector.h
+%%CLANG%%llvm-devel/include/clang/Sema/CleanupInfo.h
 %%CLANG%%llvm-devel/include/clang/Sema/CodeCompleteConsumer.h
 %%CLANG%%llvm-devel/include/clang/Sema/CodeCompleteOptions.h
 %%CLANG%%llvm-devel/include/clang/Sema/DeclSpec.h
@@ -509,6 +513,7 @@ llvm-devel/bin/yaml2obj
 %%CLANG%%llvm-devel/include/clang/StaticAnalyzer/Checkers/Checkers.inc
 %%CLANG%%llvm-devel/include/clang/StaticAnalyzer/Checkers/ClangCheckers.h
 %%CLANG%%llvm-devel/include/clang/StaticAnalyzer/Checkers/LocalCheckers.h
+%%CLANG%%llvm-devel/include/clang/StaticAnalyzer/Checkers/MPIFunctionClassifier.h
 %%CLANG%%llvm-devel/include/clang/StaticAnalyzer/Checkers/ObjCRetainCount.h
 %%CLANG%%llvm-devel/include/clang/StaticAnalyzer/Checkers/SValExplainer.h
 %%CLANG%%llvm-devel/include/clang/StaticAnalyzer/Core/Analyses.def
@@ -633,6 +638,8 @@ llvm-devel/bin/yaml2obj
 %%LLDB%%llvm-devel/include/lldb/API/SBLaunchInfo.h
 %%LLDB%%llvm-devel/include/lldb/API/SBLineEntry.h
 %%LLDB%%llvm-devel/include/lldb/API/SBListener.h
+%%LLDB%%llvm-devel/include/lldb/API/SBMemoryRegionInfo.h
+%%LLDB%%llvm-devel/include/lldb/API/SBMemoryRegionInfoList.h
 %%LLDB%%llvm-devel/include/lldb/API/SBModule.h
 %%LLDB%%llvm-devel/include/lldb/API/SBModuleSpec.h
 %%LLDB%%llvm-devel/include/lldb/API/SBPlatform.h
@@ -753,6 +760,7 @@ llvm-devel/bin/yaml2obj
 %%LLDB%%llvm-devel/include/lldb/Core/ThreadSafeDenseMap.h
 %%LLDB%%llvm-devel/include/lldb/Core/ThreadSafeDenseSet.h
 %%LLDB%%llvm-devel/include/lldb/Core/ThreadSafeSTLMap.h
+%%LLDB%%llvm-devel/include/lldb/Core/ThreadSafeSTLVector.h
 %%LLDB%%llvm-devel/include/lldb/Core/ThreadSafeValue.h
 %%LLDB%%llvm-devel/include/lldb/Core/Timer.h
 %%LLDB%%llvm-devel/include/lldb/Core/UUID.h
@@ -858,7 +866,6 @@ llvm-devel/bin/yaml2obj
 %%LLDB%%llvm-devel/include/lldb/Host/android/Android.h
 %%LLDB%%llvm-devel/include/lldb/Host/android/Config.h
 %%LLDB%%llvm-devel/include/lldb/Host/android/HostInfoAndroid.h
-%%LLDB%%llvm-devel/include/lldb/Host/android/ProcessLauncherAndroid.h
 %%LLDB%%llvm-devel/include/lldb/Host/common/GetOptInc.h
 %%LLDB%%llvm-devel/include/lldb/Host/common/NativeBreakpoint.h
 %%LLDB%%llvm-devel/include/lldb/Host/common/NativeBreakpointList.h
@@ -878,6 +885,7 @@ llvm-devel/bin/yaml2obj
 %%LLDB%%llvm-devel/include/lldb/Host/linux/HostInfoLinux.h
 %%LLDB%%llvm-devel/include/lldb/Host/linux/HostThreadLinux.h
 %%LLDB%%llvm-devel/include/lldb/Host/linux/Personality.h
+%%LLDB%%llvm-devel/include/lldb/Host/linux/ProcessLauncherLinux.h
 %%LLDB%%llvm-devel/include/lldb/Host/linux/Ptrace.h
 %%LLDB%%llvm-devel/include/lldb/Host/linux/Uio.h
 %%LLDB%%llvm-devel/include/lldb/Host/macosx/Config.h
@@ -1117,6 +1125,7 @@ llvm-devel/include/llvm/ADT/APInt.h
 llvm-devel/include/llvm/ADT/APSInt.h
 llvm-devel/include/llvm/ADT/ArrayRef.h
 llvm-devel/include/llvm/ADT/BitVector.h
+llvm-devel/include/llvm/ADT/BitmaskEnum.h
 llvm-devel/include/llvm/ADT/DAGDeltaAlgorithm.h
 llvm-devel/include/llvm/ADT/DeltaAlgorithm.h
 llvm-devel/include/llvm/ADT/DenseMap.h
@@ -1145,6 +1154,7 @@ llvm-devel/include/llvm/ADT/PointerSumType.h
 llvm-devel/include/llvm/ADT/PointerUnion.h
 llvm-devel/include/llvm/ADT/PostOrderIterator.h
 llvm-devel/include/llvm/ADT/PriorityQueue.h
+llvm-devel/include/llvm/ADT/PriorityWorklist.h
 llvm-devel/include/llvm/ADT/SCCIterator.h
 llvm-devel/include/llvm/ADT/STLExtras.h
 llvm-devel/include/llvm/ADT/ScopedHashTable.h
@@ -1180,13 +1190,13 @@ llvm-devel/include/llvm/Analysis/AliasAnalysisEvaluator.h
 llvm-devel/include/llvm/Analysis/AliasSetTracker.h
 llvm-devel/include/llvm/Analysis/AssumptionCache.h
 llvm-devel/include/llvm/Analysis/BasicAliasAnalysis.h
-llvm-devel/include/llvm/Analysis/BitSetUtils.h
 llvm-devel/include/llvm/Analysis/BlockFrequencyInfo.h
 llvm-devel/include/llvm/Analysis/BlockFrequencyInfoImpl.h
 llvm-devel/include/llvm/Analysis/BranchProbabilityInfo.h
 llvm-devel/include/llvm/Analysis/CFG.h
 llvm-devel/include/llvm/Analysis/CFGPrinter.h
-llvm-devel/include/llvm/Analysis/CFLAliasAnalysis.h
+llvm-devel/include/llvm/Analysis/CFLAndersAliasAnalysis.h
+llvm-devel/include/llvm/Analysis/CFLSteensAliasAnalysis.h
 llvm-devel/include/llvm/Analysis/CGSCCPassManager.h
 llvm-devel/include/llvm/Analysis/CallGraph.h
 llvm-devel/include/llvm/Analysis/CallGraphSCCPass.h
@@ -1204,12 +1214,15 @@ llvm-devel/include/llvm/Analysis/DominanceFrontierImpl.h
 llvm-devel/include/llvm/Analysis/EHPersonalities.h
 llvm-devel/include/llvm/Analysis/GlobalsModRef.h
 llvm-devel/include/llvm/Analysis/IVUsers.h
+llvm-devel/include/llvm/Analysis/IndirectCallPromotionAnalysis.h
+llvm-devel/include/llvm/Analysis/IndirectCallSiteVisitor.h
 llvm-devel/include/llvm/Analysis/InlineCost.h
 llvm-devel/include/llvm/Analysis/InstructionSimplify.h
 llvm-devel/include/llvm/Analysis/Interval.h
 llvm-devel/include/llvm/Analysis/IntervalIterator.h
 llvm-devel/include/llvm/Analysis/IntervalPartition.h
 llvm-devel/include/llvm/Analysis/IteratedDominanceFrontier.h
+llvm-devel/include/llvm/Analysis/LazyBlockFrequencyInfo.h
 llvm-devel/include/llvm/Analysis/LazyCallGraph.h
 llvm-devel/include/llvm/Analysis/LazyValueInfo.h
 llvm-devel/include/llvm/Analysis/Lint.h
@@ -1228,10 +1241,12 @@ llvm-devel/include/llvm/Analysis/ModuleSummaryAnalysis.h
 llvm-devel/include/llvm/Analysis/ObjCARCAliasAnalysis.h
 llvm-devel/include/llvm/Analysis/ObjCARCAnalysisUtils.h
 llvm-devel/include/llvm/Analysis/ObjCARCInstKind.h
+llvm-devel/include/llvm/Analysis/OptimizationDiagnosticInfo.h
 llvm-devel/include/llvm/Analysis/OrderedBasicBlock.h
 llvm-devel/include/llvm/Analysis/PHITransAddr.h
 llvm-devel/include/llvm/Analysis/Passes.h
 llvm-devel/include/llvm/Analysis/PostDominators.h
+llvm-devel/include/llvm/Analysis/ProfileSummaryInfo.h
 llvm-devel/include/llvm/Analysis/PtrUseVisitor.h
 llvm-devel/include/llvm/Analysis/RegionInfo.h
 llvm-devel/include/llvm/Analysis/RegionInfoImpl.h
@@ -1252,6 +1267,7 @@ llvm-devel/include/llvm/Analysis/TargetTransformInfo.h
 llvm-devel/include/llvm/Analysis/TargetTransformInfoImpl.h
 llvm-devel/include/llvm/Analysis/Trace.h
 llvm-devel/include/llvm/Analysis/TypeBasedAliasAnalysis.h
+llvm-devel/include/llvm/Analysis/TypeMetadataUtils.h
 llvm-devel/include/llvm/Analysis/ValueTracking.h
 llvm-devel/include/llvm/Analysis/VectorUtils.h
 llvm-devel/include/llvm/AsmParser/Parser.h
@@ -1286,6 +1302,9 @@ llvm-devel/include/llvm/CodeGen/GlobalISel/CallLowering.h
 llvm-devel/include/llvm/CodeGen/GlobalISel/GISelAccessor.h
 llvm-devel/include/llvm/CodeGen/GlobalISel/IRTranslator.h
 llvm-devel/include/llvm/CodeGen/GlobalISel/MachineIRBuilder.h
+llvm-devel/include/llvm/CodeGen/GlobalISel/MachineLegalizeHelper.h
+llvm-devel/include/llvm/CodeGen/GlobalISel/MachineLegalizePass.h
+llvm-devel/include/llvm/CodeGen/GlobalISel/MachineLegalizer.h
 llvm-devel/include/llvm/CodeGen/GlobalISel/RegBankSelect.h
 llvm-devel/include/llvm/CodeGen/GlobalISel/RegisterBank.h
 llvm-devel/include/llvm/CodeGen/GlobalISel/RegisterBankInfo.h
@@ -1304,6 +1323,7 @@ llvm-devel/include/llvm/CodeGen/LiveRangeEdit.h
 llvm-devel/include/llvm/CodeGen/LiveRegMatrix.h
 llvm-devel/include/llvm/CodeGen/LiveStackAnalysis.h
 llvm-devel/include/llvm/CodeGen/LiveVariables.h
+llvm-devel/include/llvm/CodeGen/LowLevelType.h
 llvm-devel/include/llvm/CodeGen/MIRParser/MIRParser.h
 llvm-devel/include/llvm/CodeGen/MIRYamlMapping.h
 llvm-devel/include/llvm/CodeGen/MachORelocation.h
@@ -1345,12 +1365,14 @@ llvm-devel/include/llvm/CodeGen/PBQP/Solution.h
 llvm-devel/include/llvm/CodeGen/PBQPRAConstraint.h
 llvm-devel/include/llvm/CodeGen/ParallelCG.h
 llvm-devel/include/llvm/CodeGen/Passes.h
+llvm-devel/include/llvm/CodeGen/PreISelIntrinsicLowering.h
 llvm-devel/include/llvm/CodeGen/PseudoSourceValue.h
 llvm-devel/include/llvm/CodeGen/RegAllocPBQP.h
 llvm-devel/include/llvm/CodeGen/RegAllocRegistry.h
 llvm-devel/include/llvm/CodeGen/RegisterClassInfo.h
 llvm-devel/include/llvm/CodeGen/RegisterPressure.h
 llvm-devel/include/llvm/CodeGen/RegisterScavenging.h
+llvm-devel/include/llvm/CodeGen/RegisterUsageInfo.h
 llvm-devel/include/llvm/CodeGen/ResourcePriorityQueue.h
 llvm-devel/include/llvm/CodeGen/RuntimeLibcalls.h
 llvm-devel/include/llvm/CodeGen/ScheduleDAG.h
@@ -1371,6 +1393,7 @@ llvm-devel/include/llvm/CodeGen/TailDuplicator.h
 llvm-devel/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h
 llvm-devel/include/llvm/CodeGen/TargetPassConfig.h
 llvm-devel/include/llvm/CodeGen/TargetSchedule.h
+llvm-devel/include/llvm/CodeGen/UnreachableBlockElim.h
 llvm-devel/include/llvm/CodeGen/ValueTypes.h
 llvm-devel/include/llvm/CodeGen/ValueTypes.td
 llvm-devel/include/llvm/CodeGen/VirtRegMap.h
@@ -1380,27 +1403,35 @@ llvm-devel/include/llvm/Config/AsmPrinters.def
 llvm-devel/include/llvm/Config/Disassemblers.def
 llvm-devel/include/llvm/Config/Targets.def
 llvm-devel/include/llvm/Config/llvm-config.h
+llvm-devel/include/llvm/DebugInfo/CodeView/CVRecord.h
 llvm-devel/include/llvm/DebugInfo/CodeView/CVSymbolTypes.def
+llvm-devel/include/llvm/DebugInfo/CodeView/CVSymbolVisitor.h
 llvm-devel/include/llvm/DebugInfo/CodeView/CVTypeVisitor.h
 llvm-devel/include/llvm/DebugInfo/CodeView/CodeView.h
-llvm-devel/include/llvm/DebugInfo/CodeView/CodeViewOStream.h
+llvm-devel/include/llvm/DebugInfo/CodeView/CodeViewError.h
+llvm-devel/include/llvm/DebugInfo/CodeView/EnumTables.h
 llvm-devel/include/llvm/DebugInfo/CodeView/FieldListRecordBuilder.h
 llvm-devel/include/llvm/DebugInfo/CodeView/FunctionId.h
 llvm-devel/include/llvm/DebugInfo/CodeView/Line.h
 llvm-devel/include/llvm/DebugInfo/CodeView/ListRecordBuilder.h
 llvm-devel/include/llvm/DebugInfo/CodeView/MemoryTypeTableBuilder.h
 llvm-devel/include/llvm/DebugInfo/CodeView/MethodListRecordBuilder.h
-llvm-devel/include/llvm/DebugInfo/CodeView/RecordIterator.h
+llvm-devel/include/llvm/DebugInfo/CodeView/ModuleSubstream.h
+llvm-devel/include/llvm/DebugInfo/CodeView/ModuleSubstreamVisitor.h
 llvm-devel/include/llvm/DebugInfo/CodeView/RecordSerialization.h
+llvm-devel/include/llvm/DebugInfo/CodeView/SymbolDumpDelegate.h
+llvm-devel/include/llvm/DebugInfo/CodeView/SymbolDumper.h
 llvm-devel/include/llvm/DebugInfo/CodeView/SymbolRecord.h
+llvm-devel/include/llvm/DebugInfo/CodeView/SymbolVisitorDelegate.h
 llvm-devel/include/llvm/DebugInfo/CodeView/TypeDumper.h
 llvm-devel/include/llvm/DebugInfo/CodeView/TypeIndex.h
 llvm-devel/include/llvm/DebugInfo/CodeView/TypeRecord.h
 llvm-devel/include/llvm/DebugInfo/CodeView/TypeRecordBuilder.h
 llvm-devel/include/llvm/DebugInfo/CodeView/TypeRecords.def
-llvm-devel/include/llvm/DebugInfo/CodeView/TypeStream.h
+llvm-devel/include/llvm/DebugInfo/CodeView/TypeStreamMerger.h
 llvm-devel/include/llvm/DebugInfo/CodeView/TypeSymbolEmitter.h
 llvm-devel/include/llvm/DebugInfo/CodeView/TypeTableBuilder.h
+llvm-devel/include/llvm/DebugInfo/CodeView/TypeVisitorCallbacks.h
 llvm-devel/include/llvm/DebugInfo/DIContext.h
 llvm-devel/include/llvm/DebugInfo/DWARF/DWARFAbbreviationDeclaration.h
 llvm-devel/include/llvm/DebugInfo/DWARF/DWARFAcceleratorTable.h
@@ -1421,6 +1452,20 @@ llvm-devel/include/llvm/DebugInfo/DWARF/DWARFSection.h
 llvm-devel/include/llvm/DebugInfo/DWARF/DWARFTypeUnit.h
 llvm-devel/include/llvm/DebugInfo/DWARF/DWARFUnit.h
 llvm-devel/include/llvm/DebugInfo/DWARF/DWARFUnitIndex.h
+llvm-devel/include/llvm/DebugInfo/Msf/ByteStream.h
+llvm-devel/include/llvm/DebugInfo/Msf/DirectoryStreamData.h
+llvm-devel/include/llvm/DebugInfo/Msf/IMsfFile.h
+llvm-devel/include/llvm/DebugInfo/Msf/IMsfStreamData.h
+llvm-devel/include/llvm/DebugInfo/Msf/IndexedStreamData.h
+llvm-devel/include/llvm/DebugInfo/Msf/MappedBlockStream.h
+llvm-devel/include/llvm/DebugInfo/Msf/MsfBuilder.h
+llvm-devel/include/llvm/DebugInfo/Msf/MsfCommon.h
+llvm-devel/include/llvm/DebugInfo/Msf/MsfError.h
+llvm-devel/include/llvm/DebugInfo/Msf/StreamArray.h
+llvm-devel/include/llvm/DebugInfo/Msf/StreamInterface.h
+llvm-devel/include/llvm/DebugInfo/Msf/StreamReader.h
+llvm-devel/include/llvm/DebugInfo/Msf/StreamRef.h
+llvm-devel/include/llvm/DebugInfo/Msf/StreamWriter.h
 llvm-devel/include/llvm/DebugInfo/PDB/ConcreteSymbolEnumerator.h
 llvm-devel/include/llvm/DebugInfo/PDB/DIA/DIADataStream.h
 llvm-devel/include/llvm/DebugInfo/PDB/DIA/DIAEnumDebugStreams.h
@@ -1477,20 +1522,26 @@ llvm-devel/include/llvm/DebugInfo/PDB/PDBSymbolTypeVTableShape.h
 llvm-devel/include/llvm/DebugInfo/PDB/PDBSymbolUnknown.h
 llvm-devel/include/llvm/DebugInfo/PDB/PDBSymbolUsingNamespace.h
 llvm-devel/include/llvm/DebugInfo/PDB/PDBTypes.h
-llvm-devel/include/llvm/DebugInfo/PDB/Raw/ByteStream.h
 llvm-devel/include/llvm/DebugInfo/PDB/Raw/DbiStream.h
+llvm-devel/include/llvm/DebugInfo/PDB/Raw/DbiStreamBuilder.h
+llvm-devel/include/llvm/DebugInfo/PDB/Raw/EnumTables.h
+llvm-devel/include/llvm/DebugInfo/PDB/Raw/Hash.h
+llvm-devel/include/llvm/DebugInfo/PDB/Raw/ISectionContribVisitor.h
 llvm-devel/include/llvm/DebugInfo/PDB/Raw/InfoStream.h
-llvm-devel/include/llvm/DebugInfo/PDB/Raw/MappedBlockStream.h
+llvm-devel/include/llvm/DebugInfo/PDB/Raw/InfoStreamBuilder.h
 llvm-devel/include/llvm/DebugInfo/PDB/Raw/ModInfo.h
 llvm-devel/include/llvm/DebugInfo/PDB/Raw/ModStream.h
 llvm-devel/include/llvm/DebugInfo/PDB/Raw/NameHashTable.h
 llvm-devel/include/llvm/DebugInfo/PDB/Raw/NameMap.h
+llvm-devel/include/llvm/DebugInfo/PDB/Raw/NameMapBuilder.h
 llvm-devel/include/llvm/DebugInfo/PDB/Raw/PDBFile.h
+llvm-devel/include/llvm/DebugInfo/PDB/Raw/PDBFileBuilder.h
+llvm-devel/include/llvm/DebugInfo/PDB/Raw/PublicsStream.h
 llvm-devel/include/llvm/DebugInfo/PDB/Raw/RawConstants.h
 llvm-devel/include/llvm/DebugInfo/PDB/Raw/RawError.h
 llvm-devel/include/llvm/DebugInfo/PDB/Raw/RawSession.h
-llvm-devel/include/llvm/DebugInfo/PDB/Raw/StreamInterface.h
-llvm-devel/include/llvm/DebugInfo/PDB/Raw/StreamReader.h
+llvm-devel/include/llvm/DebugInfo/PDB/Raw/RawTypes.h
+llvm-devel/include/llvm/DebugInfo/PDB/Raw/SymbolStream.h
 llvm-devel/include/llvm/DebugInfo/PDB/Raw/TpiStream.h
 llvm-devel/include/llvm/DebugInfo/Symbolize/DIPrinter.h
 llvm-devel/include/llvm/DebugInfo/Symbolize/SymbolizableModule.h
@@ -1608,6 +1659,7 @@ llvm-devel/include/llvm/IR/PassManager.h
 llvm-devel/include/llvm/IR/PassManagerInternal.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/Statepoint.h
 llvm-devel/include/llvm/IR/SymbolTableListTraits.h
 llvm-devel/include/llvm/IR/TrackingMDRef.h
@@ -1625,9 +1677,11 @@ llvm-devel/include/llvm/IR/ValueSymbolTable.h
 llvm-devel/include/llvm/IR/Verifier.h
 llvm-devel/include/llvm/IRReader/IRReader.h
 llvm-devel/include/llvm/InitializePasses.h
-llvm-devel/include/llvm/LTO/LTOCodeGenerator.h
-llvm-devel/include/llvm/LTO/LTOModule.h
-llvm-devel/include/llvm/LTO/ThinLTOCodeGenerator.h
+llvm-devel/include/llvm/LTO/LTO.h
+llvm-devel/include/llvm/LTO/legacy/LTOCodeGenerator.h
+llvm-devel/include/llvm/LTO/legacy/LTOModule.h
+llvm-devel/include/llvm/LTO/legacy/ThinLTOCodeGenerator.h
+llvm-devel/include/llvm/LTO/legacy/UpdateCompilerUsed.h
 llvm-devel/include/llvm/LibDriver/LibDriver.h
 llvm-devel/include/llvm/LineEditor/LineEditor.h
 llvm-devel/include/llvm/LinkAllIR.h
@@ -1643,7 +1697,6 @@ llvm-devel/include/llvm/MC/MCAsmInfoELF.h
 llvm-devel/include/llvm/MC/MCAsmLayout.h
 llvm-devel/include/llvm/MC/MCAssembler.h
 llvm-devel/include/llvm/MC/MCCodeEmitter.h
-llvm-devel/include/llvm/MC/MCCodeGenInfo.h
 llvm-devel/include/llvm/MC/MCCodeView.h
 llvm-devel/include/llvm/MC/MCContext.h
 llvm-devel/include/llvm/MC/MCDirectives.h
@@ -1724,6 +1777,7 @@ llvm-devel/include/llvm/Object/SymbolicFile.h
 llvm-devel/include/llvm/ObjectYAML/COFFYAML.h
 llvm-devel/include/llvm/ObjectYAML/ELFYAML.h
 llvm-devel/include/llvm/ObjectYAML/MachOYAML.h
+llvm-devel/include/llvm/ObjectYAML/ObjectYAML.h
 llvm-devel/include/llvm/ObjectYAML/YAML.h
 llvm-devel/include/llvm/Option/Arg.h
 llvm-devel/include/llvm/Option/ArgList.h
@@ -1748,6 +1802,7 @@ 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/Support/AArch64TargetParser.def
 llvm-devel/include/llvm/Support/ARMBuildAttributes.h
 llvm-devel/include/llvm/Support/ARMEHABI.h
 llvm-devel/include/llvm/Support/ARMTargetParser.def
@@ -1782,8 +1837,10 @@ llvm-devel/include/llvm/Support/Dwarf.h
 llvm-devel/include/llvm/Support/DynamicLibrary.h
 llvm-devel/include/llvm/Support/ELF.h
 llvm-devel/include/llvm/Support/ELFRelocs/AArch64.def
+llvm-devel/include/llvm/Support/ELFRelocs/AMDGPU.def
 llvm-devel/include/llvm/Support/ELFRelocs/ARM.def
 llvm-devel/include/llvm/Support/ELFRelocs/AVR.def
+llvm-devel/include/llvm/Support/ELFRelocs/BPF.def
 llvm-devel/include/llvm/Support/ELFRelocs/Hexagon.def
 llvm-devel/include/llvm/Support/ELFRelocs/Lanai.def
 llvm-devel/include/llvm/Support/ELFRelocs/Mips.def
@@ -1886,6 +1943,7 @@ llvm-devel/include/llvm/Support/type_traits.h
 llvm-devel/include/llvm/TableGen/Error.h
 llvm-devel/include/llvm/TableGen/Main.h
 llvm-devel/include/llvm/TableGen/Record.h
+llvm-devel/include/llvm/TableGen/SearchableTable.td
 llvm-devel/include/llvm/TableGen/SetTheory.h
 llvm-devel/include/llvm/TableGen/StringMatcher.h
 llvm-devel/include/llvm/TableGen/StringToOffsetTable.h
@@ -1910,8 +1968,11 @@ llvm-devel/include/llvm/Target/TargetRegisterInfo.h
 llvm-devel/include/llvm/Target/TargetSchedule.td
 llvm-devel/include/llvm/Target/TargetSelectionDAG.td
 llvm-devel/include/llvm/Target/TargetSubtargetInfo.h
+llvm-devel/include/llvm/Transforms/GCOVProfiler.h
 llvm-devel/include/llvm/Transforms/IPO.h
 llvm-devel/include/llvm/Transforms/IPO/ConstantMerge.h
+llvm-devel/include/llvm/Transforms/IPO/CrossDSOCFI.h
+llvm-devel/include/llvm/Transforms/IPO/DeadArgumentElimination.h
 llvm-devel/include/llvm/Transforms/IPO/ElimAvailExtern.h
 llvm-devel/include/llvm/Transforms/IPO/ForceFunctionAttrs.h
 llvm-devel/include/llvm/Transforms/IPO/FunctionAttrs.h
@@ -1921,7 +1982,8 @@ llvm-devel/include/llvm/Transforms/IPO/GlobalOpt.h
 llvm-devel/include/llvm/Transforms/IPO/InferFunctionAttrs.h
 llvm-devel/include/llvm/Transforms/IPO/InlinerPass.h
 llvm-devel/include/llvm/Transforms/IPO/Internalize.h
-llvm-devel/include/llvm/Transforms/IPO/LowerBitSets.h
+llvm-devel/include/llvm/Transforms/IPO/LowerTypeTests.h
+llvm-devel/include/llvm/Transforms/IPO/PartialInlining.h
 llvm-devel/include/llvm/Transforms/IPO/PassManagerBuilder.h
 llvm-devel/include/llvm/Transforms/IPO/SCCP.h
 llvm-devel/include/llvm/Transforms/IPO/StripDeadPrototypes.h
@@ -1932,20 +1994,46 @@ llvm-devel/include/llvm/Transforms/InstrProfiling.h
 llvm-devel/include/llvm/Transforms/Instrumentation.h
 llvm-devel/include/llvm/Transforms/ObjCARC.h
 llvm-devel/include/llvm/Transforms/PGOInstrumentation.h
+llvm-devel/include/llvm/Transforms/SampleProfile.h
 llvm-devel/include/llvm/Transforms/Scalar.h
 llvm-devel/include/llvm/Transforms/Scalar/ADCE.h
+llvm-devel/include/llvm/Transforms/Scalar/AlignmentFromAssumptions.h
+llvm-devel/include/llvm/Transforms/Scalar/BDCE.h
+llvm-devel/include/llvm/Transforms/Scalar/ConstantHoisting.h
+llvm-devel/include/llvm/Transforms/Scalar/CorrelatedValuePropagation.h
 llvm-devel/include/llvm/Transforms/Scalar/DCE.h
+llvm-devel/include/llvm/Transforms/Scalar/DeadStoreElimination.h
 llvm-devel/include/llvm/Transforms/Scalar/EarlyCSE.h
+llvm-devel/include/llvm/Transforms/Scalar/Float2Int.h
 llvm-devel/include/llvm/Transforms/Scalar/GVN.h
+llvm-devel/include/llvm/Transforms/Scalar/GuardWidening.h
+llvm-devel/include/llvm/Transforms/Scalar/IndVarSimplify.h
+llvm-devel/include/llvm/Transforms/Scalar/JumpThreading.h
+llvm-devel/include/llvm/Transforms/Scalar/LICM.h
+llvm-devel/include/llvm/Transforms/Scalar/LoopDeletion.h
+llvm-devel/include/llvm/Transforms/Scalar/LoopDistribute.h
+llvm-devel/include/llvm/Transforms/Scalar/LoopIdiomRecognize.h
+llvm-devel/include/llvm/Transforms/Scalar/LoopInstSimplify.h
 llvm-devel/include/llvm/Transforms/Scalar/LoopRotation.h
 llvm-devel/include/llvm/Transforms/Scalar/LoopSimplifyCFG.h
+llvm-devel/include/llvm/Transforms/Scalar/LoopStrengthReduce.h
+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/MemCpyOptimizer.h
+llvm-devel/include/llvm/Transforms/Scalar/MergedLoadStoreMotion.h
+llvm-devel/include/llvm/Transforms/Scalar/NaryReassociate.h
+llvm-devel/include/llvm/Transforms/Scalar/PartiallyInlineLibCalls.h
 llvm-devel/include/llvm/Transforms/Scalar/Reassociate.h
+llvm-devel/include/llvm/Transforms/Scalar/SCCP.h
 llvm-devel/include/llvm/Transforms/Scalar/SROA.h
 llvm-devel/include/llvm/Transforms/Scalar/SimplifyCFG.h
 llvm-devel/include/llvm/Transforms/Scalar/Sink.h
+llvm-devel/include/llvm/Transforms/Scalar/TailRecursionElimination.h
 llvm-devel/include/llvm/Transforms/Utils/ASanStackFrameLayout.h
+llvm-devel/include/llvm/Transforms/Utils/AddDiscriminators.h
 llvm-devel/include/llvm/Transforms/Utils/BasicBlockUtils.h
+llvm-devel/include/llvm/Transforms/Utils/BreakCriticalEdges.h
 llvm-devel/include/llvm/Transforms/Utils/BuildLibCalls.h
 llvm-devel/include/llvm/Transforms/Utils/BypassSlowDivision.h
 llvm-devel/include/llvm/Transforms/Utils/Cloning.h
@@ -1956,9 +2044,12 @@ llvm-devel/include/llvm/Transforms/Utils/Evaluator.h
 llvm-devel/include/llvm/Transforms/Utils/FunctionImportUtils.h
 llvm-devel/include/llvm/Transforms/Utils/GlobalStatus.h
 llvm-devel/include/llvm/Transforms/Utils/IntegerDivision.h
+llvm-devel/include/llvm/Transforms/Utils/LCSSA.h
 llvm-devel/include/llvm/Transforms/Utils/Local.h
+llvm-devel/include/llvm/Transforms/Utils/LoopSimplify.h
 llvm-devel/include/llvm/Transforms/Utils/LoopUtils.h
 llvm-devel/include/llvm/Transforms/Utils/LoopVersioning.h
+llvm-devel/include/llvm/Transforms/Utils/Mem2Reg.h
 llvm-devel/include/llvm/Transforms/Utils/MemorySSA.h
 llvm-devel/include/llvm/Transforms/Utils/ModuleUtils.h
 llvm-devel/include/llvm/Transforms/Utils/PromoteMemToReg.h
@@ -1966,6 +2057,7 @@ llvm-devel/include/llvm/Transforms/Utils/SSAUpdater.h
 llvm-devel/include/llvm/Transforms/Utils/SSAUpdaterImpl.h
 llvm-devel/include/llvm/Transforms/Utils/SanitizerStats.h
 llvm-devel/include/llvm/Transforms/Utils/SimplifyIndVar.h
+llvm-devel/include/llvm/Transforms/Utils/SimplifyInstructions.h
 llvm-devel/include/llvm/Transforms/Utils/SimplifyLibCalls.h
 llvm-devel/include/llvm/Transforms/Utils/SplitModule.h
 llvm-devel/include/llvm/Transforms/Utils/SymbolRewriter.h
@@ -1973,93 +2065,101 @@ llvm-devel/include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h
 llvm-devel/include/llvm/Transforms/Utils/UnrollLoop.h
 llvm-devel/include/llvm/Transforms/Utils/ValueMapper.h
 llvm-devel/include/llvm/Transforms/Vectorize.h
+llvm-devel/include/llvm/Transforms/Vectorize/LoopVectorize.h
+llvm-devel/include/llvm/Transforms/Vectorize/SLPVectorizer.h
 %%COMPILER_RT%%llvm-devel/include/sanitizer/allocator_interface.h
 %%COMPILER_RT%%llvm-devel/include/sanitizer/asan_interface.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/linux_syscall_hooks.h
 %%COMPILER_RT%%llvm-devel/include/sanitizer/lsan_interface.h
 %%COMPILER_RT%%llvm-devel/include/sanitizer/msan_interface.h
 %%COMPILER_RT%%llvm-devel/include/sanitizer/tsan_interface_atomic.h
+llvm-devel/include/xray/xray_interface.h
 llvm-devel/lib/BugpointPasses.so
 llvm-devel/lib/LLVMHello.so
 %%GOLD%%llvm-devel/lib/LLVMgold.so
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/Intrin.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/__clang_cuda_cmath.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/__clang_cuda_math_forward_declares.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/__clang_cuda_runtime_wrapper.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/__stddef_max_align_t.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/__wmmintrin_aes.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/__wmmintrin_pclmul.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/adxintrin.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/altivec.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/ammintrin.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/arm_acle.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/arm_neon.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/avx2intrin.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/avx512bwintrin.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/avx512cdintrin.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/avx512dqintrin.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/avx512erintrin.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/avx512fintrin.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/avx512ifmaintrin.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/avx512ifmavlintrin.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/avx512pfintrin.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/avx512vbmiintrin.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/avx512vbmivlintrin.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/avx512vlbwintrin.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/avx512vlcdintrin.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/avx512vldqintrin.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/avx512vlintrin.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/avxintrin.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/bmi2intrin.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/bmiintrin.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/cpuid.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/cuda_builtin_vars.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/emmintrin.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/f16cintrin.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/float.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/fma4intrin.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/fmaintrin.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/fxsrintrin.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/htmintrin.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/htmxlintrin.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/ia32intrin.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/immintrin.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/inttypes.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/iso646.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/lzcntintrin.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/mm3dnow.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/mm_malloc.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/mmintrin.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/module.modulemap
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/nmmintrin.h
-%%OPENMP%%llvm-devel/lib/clang/3.9.0/include/omp.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/pkuintrin.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/pmmintrin.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/popcntintrin.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/prfchwintrin.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/rdseedintrin.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/rtmintrin.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/s390intrin.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/shaintrin.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/smmintrin.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/tbmintrin.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/tgmath.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/tmmintrin.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/unwind.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/vadefs.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/vecintrin.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/wmmintrin.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/x86intrin.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/xmmintrin.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/xopintrin.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/xsavecintrin.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/xsaveintrin.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/xsaveoptintrin.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/xsavesintrin.h
-%%CLANG%%llvm-devel/lib/clang/3.9.0/include/xtestintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/__clang_cuda_cmath.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/__clang_cuda_intrinsics.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/__clang_cuda_math_forward_declares.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/__clang_cuda_runtime_wrapper.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/__stddef_max_align_t.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/__wmmintrin_aes.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/__wmmintrin_pclmul.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/adxintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/altivec.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/ammintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/arm_acle.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/arm_neon.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx2intrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx512bwintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx512cdintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx512dqintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx512erintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx512fintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx512ifmaintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx512ifmavlintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx512pfintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx512vbmiintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx512vbmivlintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx512vlbwintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx512vlcdintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx512vldqintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx512vlintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avxintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/bmi2intrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/bmiintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/clflushoptintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/cpuid.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/cuda_builtin_vars.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/emmintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/f16cintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/float.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/fma4intrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/fmaintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/fxsrintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/htmintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/htmxlintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/ia32intrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/immintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/intrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/inttypes.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/iso646.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/lzcntintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/mm3dnow.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/mm_malloc.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/mmintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/module.modulemap
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/mwaitxintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/nmmintrin.h
+%%OPENMP%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/omp.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/opencl-c.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/pkuintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/pmmintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/popcntintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/prfchwintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/rdseedintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/rtmintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/s390intrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/shaintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/smmintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/tbmintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/tgmath.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/tmmintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/unwind.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/vadefs.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/vecintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/wmmintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/x86intrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/xmmintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/xopintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/xsavecintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/xsaveintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/xsaveoptintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/xsavesintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/xtestintrin.h
 %%CLANG%%llvm-devel/lib/cmake/clang/ClangConfig.cmake
 %%CLANG%%llvm-devel/lib/cmake/clang/ClangTargets-%%CMAKE_BUILD_TYPE%%.cmake
 %%CLANG%%llvm-devel/lib/cmake/clang/ClangTargets.cmake
@@ -2121,6 +2221,7 @@ llvm-devel/lib/libLLVMCore.a
 llvm-devel/lib/libLLVMCoverage.a
 llvm-devel/lib/libLLVMDebugInfoCodeView.a
 llvm-devel/lib/libLLVMDebugInfoDWARF.a
+llvm-devel/lib/libLLVMDebugInfoMsf.a
 llvm-devel/lib/libLLVMDebugInfoPDB.a
 llvm-devel/lib/libLLVMExecutionEngine.a
 llvm-devel/lib/libLLVMGlobalISel.a
@@ -2205,7 +2306,7 @@ llvm-devel/lib/libLLVMXCoreInfo.a
 llvm-devel/lib/libLLVMipo.a
 llvm-devel/lib/libLTO.so
 %%CLANG%%llvm-devel/lib/libclang.so
-%%CLANG%%llvm-devel/lib/libclang.so.3.9
+%%CLANG%%llvm-devel/lib/libclang.so.%%LLVM_MAJOR%%
 %%CLANG%%llvm-devel/lib/libclangARCMigrate.a
 %%CLANG%%llvm-devel/lib/libclangAST.a
 %%CLANG%%llvm-devel/lib/libclangASTMatchers.a
@@ -2219,7 +2320,7 @@ llvm-devel/lib/libLTO.so
 %%CLANG%%llvm-devel/lib/libclangFormat.a
 %%CLANG%%llvm-devel/lib/libclangFrontend.a
 %%CLANG%%llvm-devel/lib/libclangFrontendTool.a
-%%CLANG%%llvm-devel/lib/libclangIncludeFixer.a
+%%EXTRAS%%llvm-devel/lib/libclangIncludeFixer.a
 %%CLANG%%llvm-devel/lib/libclangIndex.a
 %%CLANG%%llvm-devel/lib/libclangLex.a
 %%CLANG%%llvm-devel/lib/libclangParse.a
@@ -2246,7 +2347,7 @@ llvm-devel/lib/libLTO.so
 %%EXTRAS%%llvm-devel/lib/libclangTidyUtils.a
 %%CLANG%%llvm-devel/lib/libclangTooling.a
 %%CLANG%%llvm-devel/lib/libclangToolingCore.a
-llvm-devel/lib/libfindAllSymbols.a
+%%EXTRAS%%llvm-devel/lib/libfindAllSymbols.a
 %%OPENMP%%llvm-devel/lib/libgomp.so
 %%OPENMP%%llvm-devel/lib/libiomp5.so
 %%LLD%%llvm-devel/lib/liblldCOFF.a
@@ -2258,7 +2359,7 @@ llvm-devel/lib/libfindAllSymbols.a
 %%LLD%%llvm-devel/lib/liblldReaderWriter.a
 %%LLD%%llvm-devel/lib/liblldYAML.a
 %%LLDB%%llvm-devel/lib/liblldb.so
-%%LLDB%%llvm-devel/lib/liblldb.so.3.9.0
+%%LLDB%%llvm-devel/lib/liblldb.so.%%LLVM_RELEASE%%
 %%LLDB%%llvm-devel/lib/liblldbBase.a
 %%LLDB%%llvm-devel/lib/liblldbBreakpoint.a
 %%LLDB%%llvm-devel/lib/liblldbCommands.a