From ce14442b6c570ab3767fbc55f2b92ab180b73900 Mon Sep 17 00:00:00 2001
From: dim <dim@FreeBSD.org>
Date: Thu, 21 Dec 2017 21:24:52 +0000
Subject: [PATCH] First step in updating llvm/clang build glue: make only the
 clang executable build.

---
 lib/clang/libclang/Makefile         | 36 +++++++++++++++++++--
 lib/clang/liblldb/Makefile          |  2 --
 lib/clang/libllvm/Makefile          | 49 +++++++++++++++++++++--------
 lib/clang/libllvmminimal/Makefile   |  1 +
 usr.bin/clang/clang-tblgen/Makefile |  1 +
 usr.bin/clang/llvm-tblgen/Makefile  |  4 +++
 6 files changed, 75 insertions(+), 18 deletions(-)

diff --git a/lib/clang/libclang/Makefile b/lib/clang/libclang/Makefile
index 6a0d1dfc049d..afb50be97226 100644
--- a/lib/clang/libclang/Makefile
+++ b/lib/clang/libclang/Makefile
@@ -7,6 +7,7 @@ LIB=		clang
 
 CFLAGS+=	-I${.OBJDIR}
 CFLAGS+=	-I${OBJTOP}/lib/clang/libllvm
+CFLAGS+=	-I${CLANG_SRCS}/lib/Basic
 CFLAGS+=	-I${CLANG_SRCS}/lib/Driver
 
 # Ensure FREEBSD_CC_VERSION is defined for Basic/Targets.cpp
@@ -82,6 +83,7 @@ SRCS_MIN+=	AST/NestedNameSpecifier.cpp
 SRCS_MIN+=	AST/ODRHash.cpp
 SRCS_MIN+=	AST/OpenMPClause.cpp
 SRCS_MIN+=	AST/ParentMap.cpp
+SRCS_MIN+=	AST/QualTypeNames.cpp
 SRCS_MIN+=	AST/RawCommentList.cpp
 SRCS_MIN+=	AST/RecordLayout.cpp
 SRCS_MIN+=	AST/RecordLayoutBuilder.cpp
@@ -150,11 +152,34 @@ SRCS_MIN+=	Basic/ObjCRuntime.cpp
 SRCS_MIN+=	Basic/OpenMPKinds.cpp
 SRCS_MIN+=	Basic/OperatorPrecedence.cpp
 SRCS_MIN+=	Basic/SanitizerBlacklist.cpp
+SRCS_MIN+=	Basic/SanitizerSpecialCaseList.cpp
 SRCS_MIN+=	Basic/Sanitizers.cpp
 SRCS_MIN+=	Basic/SourceLocation.cpp
 SRCS_MIN+=	Basic/SourceManager.cpp
 SRCS_MIN+=	Basic/TargetInfo.cpp
 SRCS_MIN+=	Basic/Targets.cpp
+SRCS_MIN+=	Basic/Targets/AArch64.cpp
+SRCS_MIN+=	Basic/Targets/AMDGPU.cpp
+SRCS_MIN+=	Basic/Targets/ARM.cpp
+SRCS_MIN+=	Basic/Targets/AVR.cpp
+SRCS_MIN+=	Basic/Targets/BPF.cpp
+SRCS_MIN+=	Basic/Targets/Hexagon.cpp
+SRCS_MIN+=	Basic/Targets/Lanai.cpp
+SRCS_MIN+=	Basic/Targets/Le64.cpp
+SRCS_MIN+=	Basic/Targets/MSP430.cpp
+SRCS_MIN+=	Basic/Targets/Mips.cpp
+SRCS_MIN+=	Basic/Targets/NVPTX.cpp
+SRCS_MIN+=	Basic/Targets/Nios2.cpp
+SRCS_MIN+=	Basic/Targets/OSTargets.cpp
+SRCS_MIN+=	Basic/Targets/PNaCl.cpp
+SRCS_MIN+=	Basic/Targets/PPC.cpp
+SRCS_MIN+=	Basic/Targets/SPIR.cpp
+SRCS_MIN+=	Basic/Targets/Sparc.cpp
+SRCS_MIN+=	Basic/Targets/SystemZ.cpp
+SRCS_MIN+=	Basic/Targets/TCE.cpp
+SRCS_MIN+=	Basic/Targets/WebAssembly.cpp
+SRCS_MIN+=	Basic/Targets/X86.cpp
+SRCS_MIN+=	Basic/Targets/XCore.cpp
 SRCS_MIN+=	Basic/TokenKinds.cpp
 SRCS_MIN+=	Basic/Version.cpp
 SRCS_MIN+=	Basic/VersionTuple.cpp
@@ -237,7 +262,6 @@ SRCS_MIN+=	Driver/ToolChains/Arch/Sparc.cpp
 SRCS_MIN+=	Driver/ToolChains/Arch/SystemZ.cpp
 SRCS_MIN+=	Driver/ToolChains/Arch/X86.cpp
 SRCS_MIN+=	Driver/ToolChains/BareMetal.cpp
-SRCS_MIN+=	Driver/ToolChains/Bitrig.cpp
 SRCS_MIN+=	Driver/ToolChains/Clang.cpp
 SRCS_MIN+=	Driver/ToolChains/CloudABI.cpp
 SRCS_MIN+=	Driver/ToolChains/CommonArgs.cpp
@@ -576,7 +600,6 @@ SRCS_MIN+=	Tooling/ArgumentsAdjusters.cpp
 SRCS_MIN+=	Tooling/CommonOptionsParser.cpp
 SRCS_MIN+=	Tooling/CompilationDatabase.cpp
 SRCS_MIN+=	Tooling/Core/Lookup.cpp
-SRCS_EXT+=	Tooling/Core/QualTypeNames.cpp
 SRCS_EXT+=	Tooling/Core/Replacement.cpp
 SRCS_MIN+=	Tooling/FileMatchTrie.cpp
 SRCS_MIN+=	Tooling/FixIt.cpp
@@ -665,6 +688,12 @@ clang/AST/DeclNodes.inc: ${CLANG_SRCS}/include/clang/Basic/DeclNodes.td
 	    ${CLANG_SRCS}/include/clang/Basic/DeclNodes.td
 TGHDRS+=	clang/AST/DeclNodes.inc
 
+clang/AST/StmtDataCollectors.inc: ${CLANG_SRCS}/include/clang/AST/StmtDataCollectors.td
+	${CLANG_TBLGEN} -gen-clang-data-collectors \
+	    -d ${.TARGET:C/$/.d/} -o ${.TARGET} \
+	    ${CLANG_SRCS}/include/clang/AST/StmtDataCollectors.td
+TGHDRS+=	clang/AST/StmtDataCollectors.inc
+
 clang/AST/StmtNodes.inc: ${CLANG_SRCS}/include/clang/Basic/StmtNodes.td
 	${CLANG_TBLGEN} -gen-clang-stmt-nodes \
 	    -d ${.TARGET:C/$/.d/} -o ${.TARGET} \
@@ -690,7 +719,8 @@ clang/Basic/AttrSubMatchRulesList.inc: ${CLANG_SRCS}/include/clang/Basic/Attr.td
 TGHDRS+=	clang/Basic/AttrSubMatchRulesList.inc
 
 .for hdr in \
-	AST Analysis Comment Common Driver Frontend Lex Parse Sema Serialization
+	AST Analysis Comment Common CrossTU Driver Frontend Lex Parse \
+	Refactoring Sema Serialization SemaSerialization
 clang/Basic/Diagnostic${hdr}Kinds.inc: \
 	${CLANG_SRCS}/include/clang/Basic/Diagnostic.td
 	${CLANG_TBLGEN} -gen-clang-diags-defs -clang-component=${hdr} \
diff --git a/lib/clang/liblldb/Makefile b/lib/clang/liblldb/Makefile
index d57a6379c579..e39daf241b5e 100644
--- a/lib/clang/liblldb/Makefile
+++ b/lib/clang/liblldb/Makefile
@@ -131,7 +131,6 @@ SRCS+=		Core/AddressRange.cpp
 SRCS+=		Core/AddressResolver.cpp
 SRCS+=		Core/AddressResolverFileLine.cpp
 SRCS+=		Core/AddressResolverName.cpp
-SRCS+=		Core/ArchSpec.cpp
 SRCS+=		Core/Broadcaster.cpp
 SRCS+=		Core/Communication.cpp
 SRCS+=		Core/Debugger.cpp
@@ -582,7 +581,6 @@ SRCS+=		Utility/StringExtractorGDBRemote.cpp
 SRCS+=		Utility/StringLexer.cpp
 SRCS+=		Utility/StringList.cpp
 SRCS+=		Utility/StructuredData.cpp
-SRCS+=		Utility/TaskPool.cpp
 SRCS+=		Utility/TildeExpressionResolver.cpp
 SRCS+=		Utility/Timer.cpp
 SRCS+=		Utility/UUID.cpp
diff --git a/lib/clang/libllvm/Makefile b/lib/clang/libllvm/Makefile
index e7d9541c60bf..6f1e7e302365 100644
--- a/lib/clang/libllvm/Makefile
+++ b/lib/clang/libllvm/Makefile
@@ -32,6 +32,7 @@ SRCS_MIN+=	Analysis/CallGraph.cpp
 SRCS_MIN+=	Analysis/CallGraphSCCPass.cpp
 SRCS_MIN+=	Analysis/CallPrinter.cpp
 SRCS_MIN+=	Analysis/CaptureTracking.cpp
+SRCS_MIN+=	Analysis/CmpInstAnalysis.cpp
 SRCS_MIN+=	Analysis/CodeMetrics.cpp
 SRCS_MIN+=	Analysis/ConstantFolding.cpp
 SRCS_MIN+=	Analysis/CostModel.cpp
@@ -74,7 +75,7 @@ SRCS_MIN+=	Analysis/ModuleSummaryAnalysis.cpp
 SRCS_MIN+=	Analysis/ObjCARCAliasAnalysis.cpp
 SRCS_MIN+=	Analysis/ObjCARCAnalysisUtils.cpp
 SRCS_MIN+=	Analysis/ObjCARCInstKind.cpp
-SRCS_MIN+=	Analysis/OptimizationDiagnosticInfo.cpp
+SRCS_MIN+=	Analysis/OptimizationRemarkEmitter.cpp
 SRCS_MIN+=	Analysis/OrderedBasicBlock.cpp
 SRCS_MIN+=	Analysis/PHITransAddr.cpp
 SRCS_MIN+=	Analysis/PostDominators.cpp
@@ -88,12 +89,13 @@ SRCS_MIN+=	Analysis/ScalarEvolutionAliasAnalysis.cpp
 SRCS_MIN+=	Analysis/ScalarEvolutionExpander.cpp
 SRCS_MIN+=	Analysis/ScalarEvolutionNormalization.cpp
 SRCS_MIN+=	Analysis/ScopedNoAliasAA.cpp
-SRCS_MIN+=	Analysis/SparsePropagation.cpp
 SRCS_MIN+=	Analysis/TargetLibraryInfo.cpp
 SRCS_MIN+=	Analysis/TargetTransformInfo.cpp
 SRCS_MIN+=	Analysis/Trace.cpp
 SRCS_MIN+=	Analysis/TypeBasedAliasAnalysis.cpp
 SRCS_MIN+=	Analysis/TypeMetadataUtils.cpp
+SRCS_MIN+=	Analysis/ValueLattice.cpp
+SRCS_MIN+=	Analysis/ValueLatticeUtils.cpp
 SRCS_MIN+=	Analysis/ValueTracking.cpp
 SRCS_MIN+=	Analysis/VectorUtils.cpp
 SRCS_MIN+=	AsmParser/LLLexer.cpp
@@ -138,7 +140,6 @@ SRCS_MIN+=	CodeGen/AsmPrinter/OcamlGCPrinter.cpp
 SRCS_MIN+=	CodeGen/AsmPrinter/WinException.cpp
 SRCS_MIN+=	CodeGen/AtomicExpandPass.cpp
 SRCS_MIN+=	CodeGen/BasicTargetTransformInfo.cpp
-SRCS_MIN+=	CodeGen/BranchCoalescing.cpp
 SRCS_MIN+=	CodeGen/BranchFolding.cpp
 SRCS_MIN+=	CodeGen/BranchRelaxation.cpp
 SRCS_MIN+=	CodeGen/BuiltinGCs.cpp
@@ -146,7 +147,6 @@ SRCS_MIN+=	CodeGen/CalcSpillWeights.cpp
 SRCS_MIN+=	CodeGen/CallingConvLower.cpp
 SRCS_MIN+=	CodeGen/CodeGen.cpp
 SRCS_MIN+=	CodeGen/CodeGenPrepare.cpp
-SRCS_MIN+=	CodeGen/CountingFunctionInserter.cpp
 SRCS_MIN+=	CodeGen/CriticalAntiDepBreaker.cpp
 SRCS_MIN+=	CodeGen/DFAPacketizer.cpp
 SRCS_MIN+=	CodeGen/DeadMachineInstructionElim.cpp
@@ -156,6 +156,7 @@ SRCS_MIN+=	CodeGen/EarlyIfConversion.cpp
 SRCS_MIN+=	CodeGen/EdgeBundles.cpp
 SRCS_MIN+=	CodeGen/ExecutionDepsFix.cpp
 SRCS_MIN+=	CodeGen/ExpandISelPseudos.cpp
+SRCS_MIN+=	CodeGen/ExpandMemCmp.cpp
 SRCS_MIN+=	CodeGen/ExpandPostRAPseudos.cpp
 SRCS_MIN+=	CodeGen/ExpandReductions.cpp
 SRCS_MIN+=	CodeGen/FEntryInserter.cpp
@@ -193,7 +194,7 @@ SRCS_MIN+=	CodeGen/LexicalScopes.cpp
 SRCS_MIN+=	CodeGen/LiveDebugValues.cpp
 SRCS_MIN+=	CodeGen/LiveDebugVariables.cpp
 SRCS_MIN+=	CodeGen/LiveInterval.cpp
-SRCS_MIN+=	CodeGen/LiveIntervalAnalysis.cpp
+SRCS_MIN+=	CodeGen/LiveIntervals.cpp
 SRCS_MIN+=	CodeGen/LiveIntervalUnion.cpp
 SRCS_MIN+=	CodeGen/LivePhysRegs.cpp
 SRCS_MIN+=	CodeGen/LiveRangeCalc.cpp
@@ -206,6 +207,7 @@ SRCS_MIN+=	CodeGen/LiveVariables.cpp
 SRCS_MIN+=	CodeGen/LocalStackSlotAllocation.cpp
 SRCS_MIN+=	CodeGen/LowLevelType.cpp
 SRCS_MIN+=	CodeGen/LowerEmuTLS.cpp
+SRCS_MIN+=	CodeGen/MIRCanonicalizerPass.cpp
 SRCS_EXT+=	CodeGen/MIRParser/MILexer.cpp
 SRCS_EXT+=	CodeGen/MIRParser/MIParser.cpp
 SRCS_EXT+=	CodeGen/MIRParser/MIRParser.cpp
@@ -230,6 +232,7 @@ SRCS_MIN+=	CodeGen/MachineLICM.cpp
 SRCS_MIN+=	CodeGen/MachineLoopInfo.cpp
 SRCS_MIN+=	CodeGen/MachineModuleInfo.cpp
 SRCS_MIN+=	CodeGen/MachineModuleInfoImpls.cpp
+SRCS_MIN+=	CodeGen/MachineOperand.cpp
 SRCS_MIN+=	CodeGen/MachineOptimizationRemarkEmitter.cpp
 SRCS_MIN+=	CodeGen/MachineOutliner.cpp
 SRCS_MIN+=	CodeGen/MachinePassRegistry.cpp
@@ -333,6 +336,7 @@ SRCS_MIN+=	DebugInfo/CodeView/CVSymbolVisitor.cpp
 SRCS_MIN+=	DebugInfo/CodeView/CVTypeVisitor.cpp
 SRCS_MIN+=	DebugInfo/CodeView/CodeViewError.cpp
 SRCS_MIN+=	DebugInfo/CodeView/CodeViewRecordIO.cpp
+SRCS_MIN+=	DebugInfo/CodeView/ContinuationRecordBuilder.cpp
 SRCS_EXT+=	DebugInfo/CodeView/DebugChecksumsSubsection.cpp
 SRCS_EXT+=	DebugInfo/CodeView/DebugCrossExSubsection.cpp
 SRCS_EXT+=	DebugInfo/CodeView/DebugCrossImpSubsection.cpp
@@ -347,19 +351,21 @@ SRCS_EXT+=	DebugInfo/CodeView/DebugSymbolRVASubsection.cpp
 SRCS_EXT+=	DebugInfo/CodeView/DebugSymbolsSubsection.cpp
 SRCS_EXT+=	DebugInfo/CodeView/EnumTables.cpp
 SRCS_MIN+=	DebugInfo/CodeView/Formatters.cpp
+SRCS_MIN+=	DebugInfo/CodeView/GlobalTypeTableBuilder.cpp
 SRCS_EXT+=	DebugInfo/CodeView/LazyRandomTypeCollection.cpp
 SRCS_MIN+=	DebugInfo/CodeView/Line.cpp
+SRCS_MIN+=	DebugInfo/CodeView/RecordName.cpp
 SRCS_MIN+=	DebugInfo/CodeView/RecordSerialization.cpp
+SRCS_MIN+=	DebugInfo/CodeView/SimpleTypeSerializer.cpp
 SRCS_EXT+=	DebugInfo/CodeView/StringsAndChecksums.cpp
 SRCS_MIN+=	DebugInfo/CodeView/SymbolDumper.cpp
 SRCS_MIN+=	DebugInfo/CodeView/SymbolRecordMapping.cpp
 SRCS_EXT+=	DebugInfo/CodeView/SymbolSerializer.cpp
 SRCS_MIN+=	DebugInfo/CodeView/TypeDumpVisitor.cpp
+SRCS_MIN+=	DebugInfo/CodeView/TypeHashing.cpp
 SRCS_MIN+=	DebugInfo/CodeView/TypeIndex.cpp
 SRCS_MIN+=	DebugInfo/CodeView/TypeIndexDiscovery.cpp
-SRCS_MIN+=	DebugInfo/CodeView/TypeName.cpp
 SRCS_MIN+=	DebugInfo/CodeView/TypeRecordMapping.cpp
-SRCS_MIN+=	DebugInfo/CodeView/TypeSerializer.cpp
 SRCS_MIN+=	DebugInfo/CodeView/TypeStreamMerger.cpp
 SRCS_MIN+=	DebugInfo/CodeView/TypeTableCollection.cpp
 SRCS_MIW+=	DebugInfo/DWARF/DWARFAbbreviationDeclaration.cpp
@@ -397,7 +403,6 @@ SRCS_EXT+=	DebugInfo/PDB/Native/DbiModuleList.cpp
 SRCS_EXT+=	DebugInfo/PDB/Native/DbiStream.cpp
 SRCS_EXT+=	DebugInfo/PDB/Native/DbiStreamBuilder.cpp
 SRCS_EXT+=	DebugInfo/PDB/Native/EnumTables.cpp
-SRCS_EXT+=	DebugInfo/PDB/Native/GSI.cpp
 SRCS_EXT+=	DebugInfo/PDB/Native/GlobalsStream.cpp
 SRCS_EXT+=	DebugInfo/PDB/Native/Hash.cpp
 SRCS_EXT+=	DebugInfo/PDB/Native/HashTable.cpp
@@ -416,7 +421,6 @@ SRCS_EXT+=	DebugInfo/PDB/Native/PDBFileBuilder.cpp
 SRCS_EXT+=	DebugInfo/PDB/Native/PDBStringTable.cpp
 SRCS_EXT+=	DebugInfo/PDB/Native/PDBStringTableBuilder.cpp
 SRCS_EXT+=	DebugInfo/PDB/Native/PublicsStream.cpp
-SRCS_EXT+=	DebugInfo/PDB/Native/PublicsStreamBuilder.cpp
 SRCS_EXT+=	DebugInfo/PDB/Native/RawError.cpp
 SRCS_EXT+=	DebugInfo/PDB/Native/SymbolStream.cpp
 SRCS_EXT+=	DebugInfo/PDB/Native/TpiHashing.cpp
@@ -503,11 +507,11 @@ SRCS_MIN+=	IR/DataLayout.cpp
 SRCS_MIN+=	IR/DebugInfo.cpp
 SRCS_MIN+=	IR/DebugInfoMetadata.cpp
 SRCS_MIN+=	IR/DebugLoc.cpp
+SRCS_MIN+=	IR/DiagnosticHandler.cpp
 SRCS_MIN+=	IR/DiagnosticInfo.cpp
 SRCS_MIN+=	IR/DiagnosticPrinter.cpp
 SRCS_MIN+=	IR/Dominators.cpp
 SRCS_MIN+=	IR/Function.cpp
-SRCS_MIN+=	IR/GCOV.cpp
 SRCS_MIN+=	IR/GVMaterializer.cpp
 SRCS_MIN+=	IR/Globals.cpp
 SRCS_MIN+=	IR/IRBuilder.cpp
@@ -561,6 +565,7 @@ SRCS_MIN+=	MC/MCAsmInfoELF.cpp
 SRCS_MIN+=	MC/MCAsmStreamer.cpp
 SRCS_MIN+=	MC/MCAssembler.cpp
 SRCS_MIN+=	MC/MCCodeEmitter.cpp
+SRCS_MIN+=	MC/MCCodePadder.cpp
 SRCS_MIN+=	MC/MCCodeView.cpp
 SRCS_MIN+=	MC/MCContext.cpp
 SRCS_XDL+=	MC/MCDisassembler/Disassembler.cpp
@@ -675,6 +680,7 @@ SRCS_MIN+=	Support/BranchProbability.cpp
 SRCS_EXT+=	Support/COM.cpp
 SRCS_MIN+=	Support/CachePruning.cpp
 SRCS_MIN+=	Support/Chrono.cpp
+SRCS_MIN+=	Support/CodeGenCoverage.cpp
 SRCS_MIN+=	Support/CommandLine.cpp
 SRCS_MIN+=	Support/Compression.cpp
 SRCS_MIN+=	Support/ConvertUTF.cpp
@@ -701,6 +707,7 @@ SRCS_MIN+=	Support/Host.cpp
 SRCS_MIN+=	Support/IntEqClasses.cpp
 SRCS_MIN+=	Support/IntervalMap.cpp
 SRCS_MIN+=	Support/JamCRC.cpp
+SRCS_MIN+=	Support/KnownBits.cpp
 SRCS_MIN+=	Support/LEB128.cpp
 SRCS_MIN+=	Support/LineIterator.cpp
 SRCS_MIN+=	Support/Locale.cpp
@@ -797,13 +804,13 @@ SRCS_MIN+=	Target/AArch64/AArch64PromoteConstant.cpp
 SRCS_MIN+=	Target/AArch64/AArch64RedundantCopyElimination.cpp
 SRCS_MIN+=	Target/AArch64/AArch64RegisterBankInfo.cpp
 SRCS_MIN+=	Target/AArch64/AArch64RegisterInfo.cpp
+SRCS_MIN+=	Target/AArch64/AArch64SIMDInstrOpt.cpp
 SRCS_MIN+=	Target/AArch64/AArch64SelectionDAGInfo.cpp
 SRCS_MIN+=	Target/AArch64/AArch64StorePairSuppress.cpp
 SRCS_MIN+=	Target/AArch64/AArch64Subtarget.cpp
 SRCS_MIN+=	Target/AArch64/AArch64TargetMachine.cpp
 SRCS_MIN+=	Target/AArch64/AArch64TargetObjectFile.cpp
 SRCS_MIN+=	Target/AArch64/AArch64TargetTransformInfo.cpp
-SRCS_MIN+=	Target/AArch64/AArch64VectorByElementOpt.cpp
 SRCS_MIN+=	Target/AArch64/AsmParser/AArch64AsmParser.cpp
 SRCS_XDW+=	Target/AArch64/Disassembler/AArch64Disassembler.cpp
 SRCS_XDW+=	Target/AArch64/Disassembler/AArch64ExternalSymbolizer.cpp
@@ -874,6 +881,7 @@ SRCS_MIN+=	Target/ARM/Thumb2ITBlockPass.cpp
 SRCS_MIN+=	Target/ARM/Thumb2InstrInfo.cpp
 SRCS_MIN+=	Target/ARM/Thumb2SizeReduction.cpp
 SRCS_MIN+=	Target/ARM/ThumbRegisterInfo.cpp
+SRCS_MIN+=	Target/ARM/Utils/ARMBaseInfo.cpp
 SRCS_MIN+=	Target/Mips/AsmParser/MipsAsmParser.cpp
 SRCS_XDW+=	Target/Mips/Disassembler/MipsDisassembler.cpp
 SRCS_MIN+=	Target/Mips/InstPrinter/MipsInstPrinter.cpp
@@ -937,6 +945,7 @@ SRCS_MIN+=	Target/PowerPC/MCTargetDesc/PPCMachObjectWriter.cpp
 SRCS_MIN+=	Target/PowerPC/MCTargetDesc/PPCPredicates.cpp
 SRCS_MIN+=	Target/PowerPC/PPCAsmPrinter.cpp
 SRCS_MIN+=	Target/PowerPC/PPCBoolRetToInt.cpp
+SRCS_MIN+=	Target/PowerPC/PPCBranchCoalescing.cpp
 SRCS_MIN+=	Target/PowerPC/PPCBranchSelector.cpp
 SRCS_MIN+=	Target/PowerPC/PPCCCState.cpp
 SRCS_MIN+=	Target/PowerPC/PPCCTRLoops.cpp
@@ -952,7 +961,9 @@ SRCS_MIN+=	Target/PowerPC/PPCLoopPreIncPrep.cpp
 SRCS_MIN+=	Target/PowerPC/PPCMCInstLower.cpp
 SRCS_MIN+=	Target/PowerPC/PPCMIPeephole.cpp
 SRCS_MIN+=	Target/PowerPC/PPCMachineFunctionInfo.cpp
+SRCS_MIN+=	Target/PowerPC/PPCPreEmitPeephole.cpp
 SRCS_MIN+=	Target/PowerPC/PPCQPXLoadSplat.cpp
+SRCS_MIN+=	Target/PowerPC/PPCReduceCRLogicals.cpp
 SRCS_MIN+=	Target/PowerPC/PPCRegisterInfo.cpp
 SRCS_MIN+=	Target/PowerPC/PPCSubtarget.cpp
 SRCS_MIN+=	Target/PowerPC/PPCTLSDynamicCall.cpp
@@ -1008,6 +1019,7 @@ SRCS_MIN+=	Target/X86/MCTargetDesc/X86MCTargetDesc.cpp
 SRCS_MIN+=	Target/X86/MCTargetDesc/X86MachObjectWriter.cpp
 SRCS_MIN+=	Target/X86/MCTargetDesc/X86WinCOFFObjectWriter.cpp
 SRCS_MIN+=	Target/X86/MCTargetDesc/X86WinCOFFStreamer.cpp
+SRCS_MIN+=	Target/X86/MCTargetDesc/X86WinCOFFTargetStreamer.cpp
 SRCS_MIN+=	Target/X86/TargetInfo/X86TargetInfo.cpp
 SRCS_MIN+=	Target/X86/Utils/X86ShuffleDecode.cpp
 SRCS_MIN+=	Target/X86/X86AsmPrinter.cpp
@@ -1015,6 +1027,7 @@ SRCS_MIN+=	Target/X86/X86CallFrameOptimization.cpp
 SRCS_MIN+=	Target/X86/X86CallLowering.cpp
 SRCS_MIN+=	Target/X86/X86CallingConv.cpp
 SRCS_MIN+=	Target/X86/X86CmovConversion.cpp
+SRCS_MIN+=	Target/X86/X86DomainReassignment.cpp
 SRCS_MIN+=	Target/X86/X86EvexToVex.cpp
 SRCS_MIN+=	Target/X86/X86ExpandPseudo.cpp
 SRCS_MIN+=	Target/X86/X86FastISel.cpp
@@ -1057,6 +1070,7 @@ SRCS_MIN+=	Transforms/Coroutines/Coroutines.cpp
 SRCS_MIN+=	Transforms/IPO/AlwaysInliner.cpp
 SRCS_MIN+=	Transforms/IPO/ArgumentPromotion.cpp
 SRCS_MIN+=	Transforms/IPO/BarrierNoopPass.cpp
+SRCS_MIN+=	Transforms/IPO/CalledValuePropagation.cpp
 SRCS_MIN+=	Transforms/IPO/ConstantMerge.cpp
 SRCS_MIN+=	Transforms/IPO/CrossDSOCFI.cpp
 SRCS_MIN+=	Transforms/IPO/DeadArgumentElimination.cpp
@@ -1103,6 +1117,7 @@ SRCS_MIN+=	Transforms/Instrumentation/BoundsChecking.cpp
 SRCS_MIN+=	Transforms/Instrumentation/DataFlowSanitizer.cpp
 SRCS_MIN+=	Transforms/Instrumentation/EfficiencySanitizer.cpp
 SRCS_MIN+=	Transforms/Instrumentation/GCOVProfiling.cpp
+SRCS_MIN+=	Transforms/Instrumentation/HWAddressSanitizer.cpp
 SRCS_MIN+=	Transforms/Instrumentation/IndirectCallPromotion.cpp
 SRCS_MIN+=	Transforms/Instrumentation/InstrProfiling.cpp
 SRCS_MIN+=	Transforms/Instrumentation/Instrumentation.cpp
@@ -1123,11 +1138,13 @@ SRCS_MIN+=	Transforms/ObjCARC/PtrState.cpp
 SRCS_MIN+=	Transforms/Scalar/ADCE.cpp
 SRCS_MIN+=	Transforms/Scalar/AlignmentFromAssumptions.cpp
 SRCS_MIN+=	Transforms/Scalar/BDCE.cpp
+SRCS_MIN+=	Transforms/Scalar/CallSiteSplitting.cpp
 SRCS_MIN+=	Transforms/Scalar/ConstantHoisting.cpp
 SRCS_MIN+=	Transforms/Scalar/ConstantProp.cpp
 SRCS_MIN+=	Transforms/Scalar/CorrelatedValuePropagation.cpp
 SRCS_MIN+=	Transforms/Scalar/DCE.cpp
 SRCS_MIN+=	Transforms/Scalar/DeadStoreElimination.cpp
+SRCS_MIN+=	Transforms/Scalar/DivRemPairs.cpp
 SRCS_MIN+=	Transforms/Scalar/EarlyCSE.cpp
 SRCS_MIN+=	Transforms/Scalar/FlattenCFGPass.cpp
 SRCS_MIN+=	Transforms/Scalar/Float2Int.cpp
@@ -1163,6 +1180,7 @@ SRCS_MIN+=	Transforms/Scalar/LowerAtomic.cpp
 SRCS_MIN+=	Transforms/Scalar/LowerExpectIntrinsic.cpp
 SRCS_MIN+=	Transforms/Scalar/LowerGuardIntrinsic.cpp
 SRCS_MIN+=	Transforms/Scalar/MemCpyOptimizer.cpp
+SRCS_MIN+=	Transforms/Scalar/MergeICmps.cpp
 SRCS_MIN+=	Transforms/Scalar/MergedLoadStoreMotion.cpp
 SRCS_MIN+=	Transforms/Scalar/NaryReassociate.cpp
 SRCS_MIN+=	Transforms/Scalar/NewGVN.cpp
@@ -1179,6 +1197,7 @@ SRCS_MIN+=	Transforms/Scalar/SeparateConstOffsetFromGEP.cpp
 SRCS_MIN+=	Transforms/Scalar/SimpleLoopUnswitch.cpp
 SRCS_MIN+=	Transforms/Scalar/SimplifyCFGPass.cpp
 SRCS_MIN+=	Transforms/Scalar/Sink.cpp
+SRCS_MIN+=	Transforms/Scalar/SpeculateAroundPHIs.cpp
 SRCS_MIN+=	Transforms/Scalar/SpeculativeExecution.cpp
 SRCS_MIN+=	Transforms/Scalar/StraightLineStrengthReduce.cpp
 SRCS_MIN+=	Transforms/Scalar/StructurizeCFG.cpp
@@ -1189,12 +1208,13 @@ SRCS_MIN+=	Transforms/Utils/BasicBlockUtils.cpp
 SRCS_MIN+=	Transforms/Utils/BreakCriticalEdges.cpp
 SRCS_MIN+=	Transforms/Utils/BuildLibCalls.cpp
 SRCS_MIN+=	Transforms/Utils/BypassSlowDivision.cpp
+SRCS_MIN+=	Transforms/Utils/CallPromotionUtils.cpp
 SRCS_MIN+=	Transforms/Utils/CloneFunction.cpp
 SRCS_MIN+=	Transforms/Utils/CloneModule.cpp
-SRCS_MIN+=	Transforms/Utils/CmpInstAnalysis.cpp
 SRCS_MIN+=	Transforms/Utils/CodeExtractor.cpp
 SRCS_MIN+=	Transforms/Utils/CtorUtils.cpp
 SRCS_MIN+=	Transforms/Utils/DemoteRegToStack.cpp
+SRCS_MIN+=	Transforms/Utils/EntryExitInstrumenter.cpp
 SRCS_MIN+=	Transforms/Utils/EscapeEnumerator.cpp
 SRCS_MIN+=	Transforms/Utils/Evaluator.cpp
 SRCS_MIN+=	Transforms/Utils/FlattenCFG.cpp
@@ -1240,6 +1260,7 @@ SRCS_MIN+=	Transforms/Utils/ValueMapper.cpp
 SRCS_MIN+=	Transforms/Vectorize/LoadStoreVectorizer.cpp
 SRCS_MIN+=	Transforms/Vectorize/LoopVectorize.cpp
 SRCS_MIN+=	Transforms/Vectorize/SLPVectorizer.cpp
+SRCS_MIN+=	Transforms/Vectorize/VPlan.cpp
 SRCS_EXT+=	Transforms/Vectorize/Vectorize.cpp
 SRCS_EXT+=	XRay/InstrumentationMap.cpp
 
@@ -1332,7 +1353,8 @@ beforebuild:
 	RegisterBank/-gen-register-bank \
 	RegisterInfo/-gen-register-info \
 	SubtargetInfo/-gen-subtarget \
-	SystemOperands/-gen-searchable-tables
+	SystemOperands/-gen-searchable-tables \
+	SystemRegister/-gen-searchable-tables
 ${arch:T}Gen${hdr:H}.inc: ${LLVM_SRCS}/lib/Target/${arch:H}/${arch:T}.td
 	${LLVM_TBLGEN} ${hdr:T:C/,/ /g} \
 	    -I ${LLVM_SRCS}/include -I ${LLVM_SRCS}/lib/Target/${arch:H} \
@@ -1368,6 +1390,7 @@ TGHDRS+=	ARMGenMCPseudoLowering.inc
 TGHDRS+=	ARMGenRegisterBank.inc
 TGHDRS+=	ARMGenRegisterInfo.inc
 TGHDRS+=	ARMGenSubtargetInfo.inc
+TGHDRS+=	ARMGenSystemRegister.inc
 TGHDRS+=	MipsGenAsmMatcher.inc
 TGHDRS+=	MipsGenAsmWriter.inc
 TGHDRS+=	MipsGenCallingConv.inc
diff --git a/lib/clang/libllvmminimal/Makefile b/lib/clang/libllvmminimal/Makefile
index 804d856da130..df730a7fba08 100644
--- a/lib/clang/libllvmminimal/Makefile
+++ b/lib/clang/libllvmminimal/Makefile
@@ -9,6 +9,7 @@ SRCDIR=		lib
 SRCS+=		Support/APFloat.cpp
 SRCS+=		Support/APInt.cpp
 SRCS+=		Support/Atomic.cpp
+SRCS+=		Support/CodeGenCoverage.cpp
 SRCS+=		Support/CommandLine.cpp
 SRCS+=		Support/ConvertUTF.cpp
 SRCS+=		Support/ConvertUTFWrapper.cpp
diff --git a/usr.bin/clang/clang-tblgen/Makefile b/usr.bin/clang/clang-tblgen/Makefile
index b341aa22b7f4..9fed46ffcf9d 100644
--- a/usr.bin/clang/clang-tblgen/Makefile
+++ b/usr.bin/clang/clang-tblgen/Makefile
@@ -9,6 +9,7 @@ SRCS+=		ClangAttrEmitter.cpp
 SRCS+=		ClangCommentCommandInfoEmitter.cpp
 SRCS+=		ClangCommentHTMLNamedCharacterReferenceEmitter.cpp
 SRCS+=		ClangCommentHTMLTagsEmitter.cpp
+SRCS+=		ClangDataCollectorsEmitter.cpp
 SRCS+=		ClangDiagnosticsEmitter.cpp
 SRCS+=		ClangOptionDocEmitter.cpp
 SRCS+=		ClangSACheckersEmitter.cpp
diff --git a/usr.bin/clang/llvm-tblgen/Makefile b/usr.bin/clang/llvm-tblgen/Makefile
index 58c15a37d065..51dc8e7f3e75 100644
--- a/usr.bin/clang/llvm-tblgen/Makefile
+++ b/usr.bin/clang/llvm-tblgen/Makefile
@@ -11,6 +11,7 @@ SRCS+=		CTagsEmitter.cpp
 SRCS+=		CallingConvEmitter.cpp
 SRCS+=		CodeEmitterGen.cpp
 SRCS+=		CodeGenDAGPatterns.cpp
+SRCS+=		CodeGenHwModes.cpp
 SRCS+=		CodeGenInstruction.cpp
 SRCS+=		CodeGenMapTable.cpp
 SRCS+=		CodeGenRegisters.cpp
@@ -26,6 +27,8 @@ SRCS+=		DisassemblerEmitter.cpp
 SRCS+=		FastISelEmitter.cpp
 SRCS+=		FixedLenDecoderEmitter.cpp
 SRCS+=		GlobalISelEmitter.cpp
+SRCS+=		InfoByHwMode.cpp
+SRCS+=		InstrDocsEmitter.cpp
 SRCS+=		InstrInfoEmitter.cpp
 SRCS+=		IntrinsicEmitter.cpp
 SRCS+=		OptParserEmitter.cpp
@@ -39,6 +42,7 @@ SRCS+=		TableGen.cpp
 SRCS+=		Types.cpp
 SRCS+=		X86DisassemblerTables.cpp
 SRCS+=		X86EVEX2VEXTablesEmitter.cpp
+SRCS+=		X86FoldTablesEmitter.cpp
 SRCS+=		X86ModRMFilters.cpp
 SRCS+=		X86RecognizableInstr.cpp