From 1d195d9a3aace2e9b88187b4586f16083f236ee4 Mon Sep 17 00:00:00 2001
From: dim <dim@FreeBSD.org>
Date: Fri, 23 Aug 2019 22:17:36 +0000
Subject: [PATCH] Update build glue for a minimal build of the clang
 executable.

---
 lib/clang/libclang/Makefile         |  24 ++++---
 lib/clang/libllvm/Makefile          | 101 ++++++++++++++++------------
 lib/clang/libllvmminimal/Makefile   |   5 +-
 lib/clang/llvm.build.mk             |   4 +-
 usr.bin/clang/clang-tblgen/Makefile |   1 +
 usr.bin/clang/clang.prog.mk         |   1 +
 usr.bin/clang/llvm.prog.mk          |   1 +
 7 files changed, 82 insertions(+), 55 deletions(-)

diff --git a/lib/clang/libclang/Makefile b/lib/clang/libclang/Makefile
index c38f5c7f4ca7..8d9b5ef93022 100644
--- a/lib/clang/libclang/Makefile
+++ b/lib/clang/libclang/Makefile
@@ -80,6 +80,7 @@ SRCS_MIN+=	AST/FormatString.cpp
 SRCS_MIN+=	AST/InheritViz.cpp
 SRCS_MIN+=	AST/ItaniumCXXABI.cpp
 SRCS_MIN+=	AST/ItaniumMangle.cpp
+SRCS_MIN+=	AST/JSONNodeDumper.cpp
 SRCS_MIN+=	AST/Mangle.cpp
 SRCS_MIN+=	AST/MicrosoftCXXABI.cpp
 SRCS_MIN+=	AST/MicrosoftMangle.cpp
@@ -115,9 +116,7 @@ SRCS_MIN+=	AST/VTableBuilder.cpp
 SRCS_MIN+=	ASTMatchers/ASTMatchFinder.cpp
 SRCS_MIN+=	ASTMatchers/ASTMatchersInternal.cpp
 SRCS_MIN+=	ASTMatchers/Dynamic/Diagnostics.cpp
-SRCS_MIN+=	ASTMatchers/Dynamic/Parser.cpp
 SRCS_MIN+=	ASTMatchers/Dynamic/Registry.cpp
-SRCS_MIN+=	ASTMatchers/Dynamic/VariantValue.cpp
 SRCS_MIN+=	Analysis/AnalysisDeclContext.cpp
 SRCS_MIN+=	Analysis/BodyFarm.cpp
 SRCS_MIN+=	Analysis/CFG.cpp
@@ -130,6 +129,7 @@ SRCS_FUL+=	Analysis/CodeInjector.cpp
 SRCS_MIN+=	Analysis/Consumed.cpp
 SRCS_MIN+=	Analysis/ConstructionContext.cpp
 SRCS_FUL+=	Analysis/Dominators.cpp
+SRCS_MIN+=	Analysis/ExprMutationAnalyzer.cpp
 SRCS_MIN+=	Analysis/LiveVariables.cpp
 SRCS_MIN+=	Analysis/ObjCNoReturn.cpp
 SRCS_MIN+=	Analysis/PostOrderCFGView.cpp
@@ -137,7 +137,6 @@ SRCS_FUL+=	Analysis/ProgramPoint.cpp
 SRCS_MIN+=	Analysis/ReachableCode.cpp
 SRCS_MIN+=	Analysis/ThreadSafety.cpp
 SRCS_MIN+=	Analysis/ThreadSafetyCommon.cpp
-SRCS_MIN+=	Analysis/ThreadSafetyLogical.cpp
 SRCS_MIN+=	Analysis/ThreadSafetyTIL.cpp
 SRCS_MIN+=	Analysis/UninitializedValues.cpp
 SRCS_MIN+=	Basic/Attributes.cpp
@@ -153,7 +152,6 @@ SRCS_MIN+=	Basic/FileSystemStatCache.cpp
 SRCS_MIN+=	Basic/FixedPoint.cpp
 SRCS_MIN+=	Basic/IdentifierTable.cpp
 SRCS_MIN+=	Basic/LangOptions.cpp
-SRCS_MIN+=	Basic/MemoryBufferCache.cpp
 SRCS_MIN+=	Basic/Module.cpp
 SRCS_MIN+=	Basic/ObjCRuntime.cpp
 SRCS_MIN+=	Basic/OpenMPKinds.cpp
@@ -230,7 +228,6 @@ SRCS_MIN+=	CodeGen/CGStmt.cpp
 SRCS_MIN+=	CodeGen/CGStmtOpenMP.cpp
 SRCS_MIN+=	CodeGen/CGVTT.cpp
 SRCS_MIN+=	CodeGen/CGVTables.cpp
-SRCS_MIN+=	CodeGen/CodeGenABITypes.cpp
 SRCS_MIN+=	CodeGen/CodeGenAction.cpp
 SRCS_MIN+=	CodeGen/CodeGenFunction.cpp
 SRCS_MIN+=	CodeGen/CodeGenModule.cpp
@@ -244,6 +241,7 @@ SRCS_MIN+=	CodeGen/MacroPPCallbacks.cpp
 SRCS_MIN+=	CodeGen/MicrosoftCXXABI.cpp
 SRCS_MIN+=	CodeGen/ModuleBuilder.cpp
 SRCS_MIN+=	CodeGen/ObjectFilePCHContainerOperations.cpp
+SRCS_MIN+=	CodeGen/PatternInit.cpp
 SRCS_MIN+=	CodeGen/SanitizerMetadata.cpp
 SRCS_MIN+=	CodeGen/SwiftCallingConv.cpp
 SRCS_MIN+=	CodeGen/TargetInfo.cpp
@@ -298,6 +296,7 @@ SRCS_MIN+=	Driver/ToolChains/Myriad.cpp
 SRCS_MIN+=	Driver/ToolChains/NaCl.cpp
 SRCS_MIN+=	Driver/ToolChains/NetBSD.cpp
 SRCS_MIN+=	Driver/ToolChains/OpenBSD.cpp
+SRCS_MIN+=	Driver/ToolChains/PPCLinux.cpp
 SRCS_MIN+=	Driver/ToolChains/PS4CPU.cpp
 SRCS_MIN+=	Driver/ToolChains/RISCVToolchain.cpp
 SRCS_MIN+=	Driver/ToolChains/Solaris.cpp
@@ -341,6 +340,7 @@ SRCS_MIN+=	Frontend/FrontendTiming.cpp
 SRCS_MIN+=	Frontend/HeaderIncludeGen.cpp
 SRCS_MIN+=	Frontend/InitHeaderSearch.cpp
 SRCS_MIN+=	Frontend/InitPreprocessor.cpp
+SRCS_MIN+=	Frontend/InterfaceStubFunctionsConsumer.cpp
 SRCS_MIN+=	Frontend/LangStandards.cpp
 SRCS_MIN+=	Frontend/LayoutOverrideSource.cpp
 SRCS_MIN+=	Frontend/LogDiagnosticPrinter.cpp
@@ -362,7 +362,6 @@ SRCS_MIN+=	Frontend/TextDiagnosticBuffer.cpp
 SRCS_MIN+=	Frontend/TextDiagnosticPrinter.cpp
 SRCS_MIN+=	Frontend/VerifyDiagnosticConsumer.cpp
 SRCS_MIN+=	FrontendTool/ExecuteCompilerInvocation.cpp
-SRCS_MIN+=	Index/CodegenNameGenerator.cpp
 SRCS_MIN+=	Index/CommentToXML.cpp
 SRCS_MIN+=	Index/IndexBody.cpp
 SRCS_MIN+=	Index/IndexDecl.cpp
@@ -371,6 +370,7 @@ SRCS_MIN+=	Index/IndexTypeSourceInfo.cpp
 SRCS_MIN+=	Index/IndexingAction.cpp
 SRCS_MIN+=	Index/IndexingContext.cpp
 SRCS_MIN+=	Index/USRGeneration.cpp
+SRCS_MIN+=	Lex/DependencyDirectivesSourceMinimizer.cpp
 SRCS_MIN+=	Lex/HeaderMap.cpp
 SRCS_MIN+=	Lex/HeaderSearch.cpp
 SRCS_MIN+=	Lex/Lexer.cpp
@@ -445,6 +445,7 @@ SRCS_MIN+=	Sema/SemaFixItUtils.cpp
 SRCS_MIN+=	Sema/SemaInit.cpp
 SRCS_MIN+=	Sema/SemaLambda.cpp
 SRCS_MIN+=	Sema/SemaLookup.cpp
+SRCS_MIN+=	Sema/SemaModule.cpp
 SRCS_MIN+=	Sema/SemaObjCProperty.cpp
 SRCS_MIN+=	Sema/SemaOpenMP.cpp
 SRCS_MIN+=	Sema/SemaOverload.cpp
@@ -468,6 +469,7 @@ SRCS_MIN+=	Serialization/ASTWriterDecl.cpp
 SRCS_MIN+=	Serialization/ASTWriterStmt.cpp
 SRCS_MIN+=	Serialization/GeneratePCH.cpp
 SRCS_MIN+=	Serialization/GlobalModuleIndex.cpp
+SRCS_MIN+=	Serialization/InMemoryModuleCache.cpp
 SRCS_MIN+=	Serialization/Module.cpp
 SRCS_MIN+=	Serialization/ModuleFileExtension.cpp
 SRCS_MIN+=	Serialization/ModuleManager.cpp
@@ -604,7 +606,6 @@ SRCS_FUL+=	StaticAnalyzer/Core/ProgramState.cpp
 SRCS_FUL+=	StaticAnalyzer/Core/RangeConstraintManager.cpp
 SRCS_FUL+=	StaticAnalyzer/Core/RangedConstraintManager.cpp
 SRCS_FUL+=	StaticAnalyzer/Core/RegionStore.cpp
-SRCS_FUL+=	StaticAnalyzer/Core/RetainSummaryManager.cpp
 SRCS_FUL+=	StaticAnalyzer/Core/SValBuilder.cpp
 SRCS_FUL+=	StaticAnalyzer/Core/SVals.cpp
 SRCS_FUL+=	StaticAnalyzer/Core/SarifDiagnostics.cpp
@@ -613,9 +614,7 @@ SRCS_FUL+=	StaticAnalyzer/Core/SimpleSValBuilder.cpp
 SRCS_FUL+=	StaticAnalyzer/Core/Store.cpp
 SRCS_FUL+=	StaticAnalyzer/Core/SubEngine.cpp
 SRCS_FUL+=	StaticAnalyzer/Core/SymbolManager.cpp
-SRCS_FUL+=	StaticAnalyzer/Core/TaintManager.cpp
 SRCS_FUL+=	StaticAnalyzer/Core/WorkList.cpp
-SRCS_FUL+=	StaticAnalyzer/Core/Z3ConstraintManager.cpp
 SRCS_FUL+=	StaticAnalyzer/Frontend/AnalysisConsumer.cpp
 SRCS_FUL+=	StaticAnalyzer/Frontend/CheckerRegistration.cpp
 SRCS_FUL+=	StaticAnalyzer/Frontend/CheckerRegistry.cpp
@@ -628,7 +627,6 @@ SRCS_MIN+=	Tooling/CompilationDatabase.cpp
 SRCS_MIN+=	Tooling/Core/Lookup.cpp
 SRCS_EXT+=	Tooling/Core/Replacement.cpp
 SRCS_MIN+=	Tooling/FileMatchTrie.cpp
-SRCS_MIN+=	Tooling/FixIt.cpp
 SRCS_EXT+=	Tooling/Inclusions/HeaderIncludes.cpp
 SRCS_EXT+=	Tooling/Inclusions/IncludeStyle.cpp
 SRCS_MIN+=	Tooling/JSONCompilationDatabase.cpp
@@ -864,6 +862,12 @@ clang/StaticAnalyzer/Checkers/Checkers.inc: \
 	    ${CLANG_SRCS}/include/clang/StaticAnalyzer/Checkers/Checkers.td
 TGHDRS+=	clang/StaticAnalyzer/Checkers/Checkers.inc
 
+OpenCLBuiltins.inc: ${CLANG_SRCS}/lib/Sema/OpenCLBuiltins.td
+	${CLANG_TBLGEN} -gen-clang-opencl-builtins \
+	    -d ${.TARGET:C/$/.d/} -o ${.TARGET} \
+	    ${CLANG_SRCS}/lib/Sema/OpenCLBuiltins.td
+TGHDRS+=	OpenCLBuiltins.inc
+
 DEPENDFILES+=	${TGHDRS:C/$/.d/}
 DPSRCS+=	${TGHDRS}
 CLEANFILES+=	${TGHDRS} ${TGHDRS:C/$/.d/}
diff --git a/lib/clang/libllvm/Makefile b/lib/clang/libllvm/Makefile
index e4804230c113..f273b945732c 100644
--- a/lib/clang/libllvm/Makefile
+++ b/lib/clang/libllvm/Makefile
@@ -54,6 +54,7 @@ SRCS_MIN+=	Analysis/DemandedBits.cpp
 SRCS_MIN+=	Analysis/DependenceAnalysis.cpp
 SRCS_MIN+=	Analysis/DivergenceAnalysis.cpp
 SRCS_MIN+=	Analysis/DomPrinter.cpp
+SRCS_MIN+=	Analysis/DomTreeUpdater.cpp
 SRCS_MIN+=	Analysis/DominanceFrontier.cpp
 SRCS_MIN+=	Analysis/EHPersonalities.cpp
 SRCS_MIN+=	Analysis/GlobalsModRef.cpp
@@ -67,7 +68,6 @@ SRCS_MIN+=	Analysis/InstructionPrecedenceTracking.cpp
 SRCS_MIN+=	Analysis/InstructionSimplify.cpp
 SRCS_MIN+=	Analysis/Interval.cpp
 SRCS_MIN+=	Analysis/IntervalPartition.cpp
-SRCS_MIN+=	Analysis/IteratedDominanceFrontier.cpp
 SRCS_MIN+=	Analysis/LazyBlockFrequencyInfo.cpp
 SRCS_MIN+=	Analysis/LazyBranchProbabilityInfo.cpp
 SRCS_MIN+=	Analysis/LazyCallGraph.cpp
@@ -114,7 +114,6 @@ SRCS_MIN+=	Analysis/SyncDependenceAnalysis.cpp
 SRCS_MIN+=	Analysis/SyntheticCountsUtils.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
@@ -129,13 +128,12 @@ SRCS_MIN+=	BinaryFormat/Magic.cpp
 SRCS_MIN+=	BinaryFormat/Wasm.cpp
 SRCS_MIN+=	Bitcode/Reader/BitReader.cpp
 SRCS_MIN+=	Bitcode/Reader/BitcodeReader.cpp
-SRCS_MIN+=	Bitcode/Reader/BitstreamReader.cpp
 SRCS_MIN+=	Bitcode/Reader/MetadataLoader.cpp
 SRCS_MIN+=	Bitcode/Reader/ValueList.cpp
-SRCS_MIN+=	Bitcode/Writer/BitWriter.cpp
 SRCS_MIN+=	Bitcode/Writer/BitcodeWriter.cpp
 SRCS_MIN+=	Bitcode/Writer/BitcodeWriterPass.cpp
 SRCS_MIN+=	Bitcode/Writer/ValueEnumerator.cpp
+SRCS_MIN+=	Bitstream/Reader/BitstreamReader.cpp
 SRCS_MIN+=	CodeGen/AggressiveAntiDepBreaker.cpp
 SRCS_MIN+=	CodeGen/AllocationOrder.cpp
 SRCS_MIN+=	CodeGen/Analysis.cpp
@@ -159,7 +157,6 @@ SRCS_MIN+=	CodeGen/AsmPrinter/DwarfFile.cpp
 SRCS_MIN+=	CodeGen/AsmPrinter/DwarfStringPool.cpp
 SRCS_MIN+=	CodeGen/AsmPrinter/DwarfUnit.cpp
 SRCS_MIN+=	CodeGen/AsmPrinter/EHStreamer.cpp
-SRCS_MIN+=	CodeGen/AsmPrinter/ErlangGCPrinter.cpp
 SRCS_MIN+=	CodeGen/AsmPrinter/OcamlGCPrinter.cpp
 SRCS_MIN+=	CodeGen/AsmPrinter/WasmException.cpp
 SRCS_MIN+=	CodeGen/AsmPrinter/WinCFGuard.cpp
@@ -169,7 +166,6 @@ SRCS_MIN+=	CodeGen/BasicTargetTransformInfo.cpp
 SRCS_MIN+=	CodeGen/BranchFolding.cpp
 SRCS_MIN+=	CodeGen/BranchRelaxation.cpp
 SRCS_MIN+=	CodeGen/BreakFalseDeps.cpp
-SRCS_MIN+=	CodeGen/BuiltinGCs.cpp
 SRCS_MIN+=	CodeGen/CFIInstrInserter.cpp
 SRCS_MIN+=	CodeGen/CalcSpillWeights.cpp
 SRCS_MIN+=	CodeGen/CallingConvLower.cpp
@@ -183,12 +179,12 @@ SRCS_MIN+=	CodeGen/DwarfEHPrepare.cpp
 SRCS_MIN+=	CodeGen/EarlyIfConversion.cpp
 SRCS_MIN+=	CodeGen/EdgeBundles.cpp
 SRCS_MIN+=	CodeGen/ExecutionDomainFix.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
 SRCS_MIN+=	CodeGen/FaultMaps.cpp
+SRCS_MIN+=	CodeGen/FinalizeISel.cpp
 SRCS_MIN+=	CodeGen/FuncletLayout.cpp
 SRCS_MIN+=	CodeGen/GCMetadata.cpp
 SRCS_MIN+=	CodeGen/GCMetadataPrinter.cpp
@@ -216,6 +212,7 @@ SRCS_MIN+=	CodeGen/GlobalISel/RegisterBank.cpp
 SRCS_MIN+=	CodeGen/GlobalISel/RegisterBankInfo.cpp
 SRCS_MIN+=	CodeGen/GlobalISel/Utils.cpp
 SRCS_MIN+=	CodeGen/GlobalMerge.cpp
+SRCS_MIN+=	CodeGen/HardwareLoops.cpp
 SRCS_MIN+=	CodeGen/IfConversion.cpp
 SRCS_MIN+=	CodeGen/ImplicitNullChecks.cpp
 SRCS_MIN+=	CodeGen/IndirectBrExpandPass.cpp
@@ -354,6 +351,8 @@ SRCS_MIN+=	CodeGen/StackMapLivenessAnalysis.cpp
 SRCS_MIN+=	CodeGen/StackMaps.cpp
 SRCS_MIN+=	CodeGen/StackProtector.cpp
 SRCS_MIN+=	CodeGen/StackSlotColoring.cpp
+SRCS_MIN+=	CodeGen/SwiftErrorValueTracking.cpp
+SRCS_MIN+=	CodeGen/SwitchLoweringUtils.cpp
 SRCS_MIN+=	CodeGen/TailDuplication.cpp
 SRCS_MIN+=	CodeGen/TailDuplicator.cpp
 SRCS_MIN+=	CodeGen/TargetFrameLoweringImpl.cpp
@@ -413,19 +412,19 @@ SRCS_MIN+=	DebugInfo/CodeView/TypeStreamMerger.cpp
 SRCS_MIN+=	DebugInfo/CodeView/TypeTableCollection.cpp
 SRCS_MIW+=	DebugInfo/DWARF/DWARFAbbreviationDeclaration.cpp
 SRCS_MIW+=	DebugInfo/DWARF/DWARFAcceleratorTable.cpp
-SRCS_MIW+=	DebugInfo/DWARF/DWARFAddressRange.cpp
+#SRCS_MIW+=	DebugInfo/DWARF/DWARFAddressRange.cpp
 SRCS_MIW+=	DebugInfo/DWARF/DWARFCompileUnit.cpp
 SRCS_MIW+=	DebugInfo/DWARF/DWARFContext.cpp
-SRCS_MIW+=	DebugInfo/DWARF/DWARFDataExtractor.cpp
+#SRCS_MIW+=	DebugInfo/DWARF/DWARFDataExtractor.cpp
 SRCS_MIW+=	DebugInfo/DWARF/DWARFDebugAbbrev.cpp
 SRCS_MIW+=	DebugInfo/DWARF/DWARFDebugAddr.cpp
-SRCS_MIW+=	DebugInfo/DWARF/DWARFDebugArangeSet.cpp
+#SRCS_MIW+=	DebugInfo/DWARF/DWARFDebugArangeSet.cpp
 SRCS_MIW+=	DebugInfo/DWARF/DWARFDebugAranges.cpp
 SRCS_MIW+=	DebugInfo/DWARF/DWARFDebugFrame.cpp
-SRCS_MIW+=	DebugInfo/DWARF/DWARFDebugInfoEntry.cpp
+#SRCS_MIW+=	DebugInfo/DWARF/DWARFDebugInfoEntry.cpp
 SRCS_MIW+=	DebugInfo/DWARF/DWARFDebugLine.cpp
 SRCS_MIW+=	DebugInfo/DWARF/DWARFDebugLoc.cpp
-SRCS_MIW+=	DebugInfo/DWARF/DWARFDebugMacro.cpp
+#SRCS_MIW+=	DebugInfo/DWARF/DWARFDebugMacro.cpp
 SRCS_MIW+=	DebugInfo/DWARF/DWARFDebugPubTable.cpp
 SRCS_MIW+=	DebugInfo/DWARF/DWARFDebugRangeList.cpp
 SRCS_MIW+=	DebugInfo/DWARF/DWARFDebugRnglists.cpp
@@ -440,7 +439,6 @@ SRCS_MIW+=	DebugInfo/DWARF/DWARFUnitIndex.cpp
 SRCS_MIW+=	DebugInfo/DWARF/DWARFVerifier.cpp
 SRCS_MIN+=	DebugInfo/MSF/MSFBuilder.cpp
 SRCS_MIN+=	DebugInfo/MSF/MSFCommon.cpp
-SRCS_MIN+=	DebugInfo/MSF/MSFError.cpp
 SRCS_MIN+=	DebugInfo/MSF/MappedBlockStream.cpp
 SRCS_EXT+=	DebugInfo/PDB/GenericError.cpp
 SRCS_EXT+=	DebugInfo/PDB/IPDBSourceFile.cpp
@@ -523,12 +521,12 @@ SRCS_EXT+=	DebugInfo/PDB/PDBSymbolTypeVTableShape.cpp
 SRCS_EXT+=	DebugInfo/PDB/PDBSymbolUnknown.cpp
 SRCS_EXT+=	DebugInfo/PDB/PDBSymbolUsingNamespace.cpp
 SRCS_EXT+=	DebugInfo/PDB/UDTLayout.cpp
-SRCS_MIW+=	DebugInfo/Symbolize/DIPrinter.cpp
+#SRCS_MIW+=	DebugInfo/Symbolize/DIPrinter.cpp
 SRCS_MIW+=	DebugInfo/Symbolize/SymbolizableObjectFile.cpp
 SRCS_MIW+=	DebugInfo/Symbolize/Symbolize.cpp
 SRCS_MIN+=	Demangle/ItaniumDemangle.cpp
-SRCS_MIW+=	Demangle/MicrosoftDemangle.cpp
-SRCS_MIW+=	Demangle/MicrosoftDemangleNodes.cpp
+#SRCS_MIW+=	Demangle/MicrosoftDemangle.cpp
+#SRCS_MIW+=	Demangle/MicrosoftDemangleNodes.cpp
 SRCS_XDB+=	ExecutionEngine/ExecutionEngine.cpp
 SRCS_XDB+=	ExecutionEngine/ExecutionEngineBindings.cpp
 SRCS_XDB+=	ExecutionEngine/GDBRegistrationListener.cpp
@@ -565,6 +563,7 @@ SRCS_XDB+=	ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.cpp
 SRCS_XDB+=	ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldELFMips.cpp
 SRCS_XDB+=	ExecutionEngine/SectionMemoryManager.cpp
 SRCS_XDB+=	ExecutionEngine/TargetSelect.cpp
+SRCS_MIN+=	IR/AbstractCallSite.cpp
 SRCS_MIN+=	IR/AsmWriter.cpp
 SRCS_MIN+=	IR/Attributes.cpp
 SRCS_MIN+=	IR/AutoUpgrade.cpp
@@ -582,7 +581,6 @@ SRCS_MIN+=	IR/DebugLoc.cpp
 SRCS_MIN+=	IR/DiagnosticHandler.cpp
 SRCS_MIN+=	IR/DiagnosticInfo.cpp
 SRCS_MIN+=	IR/DiagnosticPrinter.cpp
-SRCS_MIN+=	IR/DomTreeUpdater.cpp
 SRCS_MIN+=	IR/Dominators.cpp
 SRCS_MIN+=	IR/Function.cpp
 SRCS_MIN+=	IR/GVMaterializer.cpp
@@ -609,6 +607,7 @@ SRCS_MIN+=	IR/PassManager.cpp
 SRCS_MIN+=	IR/PassRegistry.cpp
 SRCS_MIN+=	IR/PassTimingInfo.cpp
 SRCS_MIN+=	IR/ProfileSummary.cpp
+SRCS_MIN+=	IR/RemarkStreamer.cpp
 SRCS_MIN+=	IR/SafepointIRVerifier.cpp
 SRCS_MIN+=	IR/Statepoint.cpp
 SRCS_MIN+=	IR/Type.cpp
@@ -637,6 +636,7 @@ SRCS_MIN+=	MC/MCAsmInfo.cpp
 SRCS_MIN+=	MC/MCAsmInfoCOFF.cpp
 SRCS_MIN+=	MC/MCAsmInfoDarwin.cpp
 SRCS_MIN+=	MC/MCAsmInfoELF.cpp
+SRCS_MIN+=	MC/MCAsmInfoXCOFF.cpp
 SRCS_MIN+=	MC/MCAsmMacro.cpp
 SRCS_MIN+=	MC/MCAsmStreamer.cpp
 SRCS_MIN+=	MC/MCAssembler.cpp
@@ -682,6 +682,7 @@ SRCS_MIN+=	MC/MCSectionCOFF.cpp
 SRCS_MIN+=	MC/MCSectionELF.cpp
 SRCS_MIN+=	MC/MCSectionMachO.cpp
 SRCS_MIN+=	MC/MCSectionWasm.cpp
+SRCS_MIN+=	MC/MCSectionXCOFF.cpp
 SRCS_MIN+=	MC/MCStreamer.cpp
 SRCS_MIN+=	MC/MCSubtargetInfo.cpp
 SRCS_MIN+=	MC/MCSymbol.cpp
@@ -692,11 +693,14 @@ SRCS_MIN+=	MC/MCWasmStreamer.cpp
 SRCS_MIN+=	MC/MCWin64EH.cpp
 SRCS_MIN+=	MC/MCWinCOFFStreamer.cpp
 SRCS_MIN+=	MC/MCWinEH.cpp
+SRCS_MIN+=	MC/MCXCOFFStreamer.cpp
+SRCS_MIN+=	MC/MCXCOFFObjectTargetWriter.cpp
 SRCS_MIN+=	MC/MachObjectWriter.cpp
 SRCS_MIN+=	MC/StringTableBuilder.cpp
 SRCS_MIN+=	MC/SubtargetFeature.cpp
 SRCS_MIN+=	MC/WasmObjectWriter.cpp
 SRCS_MIN+=	MC/WinCOFFObjectWriter.cpp
+SRCS_MIN+=	MC/XCOFFObjectWriter.cpp
 SRCS_EXT+=	MCA/Context.cpp
 SRCS_EXT+=	MCA/HWEventListener.cpp
 SRCS_EXT+=	MCA/HardwareUnits/HardwareUnit.cpp
@@ -719,7 +723,6 @@ SRCS_MIN+=	Object/Archive.cpp
 SRCS_MIN+=	Object/ArchiveWriter.cpp
 SRCS_MIN+=	Object/Binary.cpp
 SRCS_MIN+=	Object/COFFImportFile.cpp
-SRCS_MIN+=	Object/COFFModuleDefinition.cpp
 SRCS_MIN+=	Object/COFFObjectFile.cpp
 SRCS_MIN+=	Object/Decompressor.cpp
 SRCS_MIN+=	Object/ELF.cpp
@@ -728,15 +731,14 @@ SRCS_MIN+=	Object/Error.cpp
 SRCS_MIN+=	Object/IRObjectFile.cpp
 SRCS_MIN+=	Object/IRSymtab.cpp
 SRCS_MIN+=	Object/MachOObjectFile.cpp
-SRCS_MIN+=	Object/MachOUniversal.cpp
 SRCS_MIN+=	Object/ModuleSymbolTable.cpp
 SRCS_EXT+=	Object/Object.cpp
 SRCS_MIN+=	Object/ObjectFile.cpp
 SRCS_MIN+=	Object/RecordStreamer.cpp
-SRCS_MIW+=	Object/SymbolSize.cpp
 SRCS_MIN+=	Object/SymbolicFile.cpp
 SRCS_MIN+=	Object/WasmObjectFile.cpp
 SRCS_MIN+=	Object/WindowsResource.cpp
+SRCS_MIN+=	Object/XCOFFObjectFile.cpp
 SRCS_MIN+=	ObjectYAML/COFFYAML.cpp
 SRCS_EXT+=	ObjectYAML/CodeViewYAMLDebugSections.cpp
 SRCS_EXT+=	ObjectYAML/CodeViewYAMLSymbols.cpp
@@ -750,7 +752,7 @@ SRCS_MIN+=	Option/ArgList.cpp
 SRCS_MIN+=	Option/OptTable.cpp
 SRCS_MIN+=	Option/Option.cpp
 SRCS_MIN+=	Passes/PassBuilder.cpp
-SRCS_EXT+=	Passes/PassPlugin.cpp
+SRCS_MIN+=	Passes/PassPlugin.cpp
 SRCS_EXT+=	Passes/StandardInstrumentations.cpp
 SRCS_MIN+=	ProfileData/Coverage/CoverageMapping.cpp
 SRCS_MIN+=	ProfileData/Coverage/CoverageMappingReader.cpp
@@ -763,6 +765,9 @@ SRCS_MIN+=	ProfileData/ProfileSummaryBuilder.cpp
 SRCS_MIN+=	ProfileData/SampleProf.cpp
 SRCS_MIN+=	ProfileData/SampleProfReader.cpp
 SRCS_MIN+=	ProfileData/SampleProfWriter.cpp
+SRCS_MIN+=	Remarks/RemarkFormat.cpp
+SRCS_MIN+=	Remarks/RemarkStringTable.cpp
+SRCS_MIN+=	Remarks/YAMLRemarkSerializer.cpp
 SRCS_MIN+=	Support/AArch64TargetParser.cpp
 SRCS_MIN+=	Support/APFloat.cpp
 SRCS_MIN+=	Support/APInt.cpp
@@ -771,7 +776,6 @@ SRCS_MIN+=	Support/ARMAttributeParser.cpp
 SRCS_MIN+=	Support/ARMBuildAttrs.cpp
 SRCS_MIN+=	Support/ARMTargetParser.cpp
 SRCS_MIN+=	Support/Allocator.cpp
-SRCS_MIN+=	Support/Atomic.cpp
 SRCS_MIN+=	Support/BinaryStreamError.cpp
 SRCS_MIN+=	Support/BinaryStreamReader.cpp
 SRCS_MIN+=	Support/BinaryStreamRef.cpp
@@ -779,7 +783,6 @@ SRCS_MIN+=	Support/BinaryStreamWriter.cpp
 SRCS_MIN+=	Support/BlockFrequency.cpp
 SRCS_MIN+=	Support/BranchProbability.cpp
 SRCS_MIN+=	Support/BuryPointer.cpp
-SRCS_MIW+=	Support/COM.cpp
 SRCS_MIN+=	Support/CachePruning.cpp
 SRCS_MIN+=	Support/Chrono.cpp
 SRCS_MIN+=	Support/CodeGenCoverage.cpp
@@ -826,8 +829,8 @@ SRCS_XDL+=	Support/Memory.cpp
 SRCS_MIN+=	Support/MemoryBuffer.cpp
 SRCS_MIN+=	Support/Mutex.cpp
 SRCS_MIN+=	Support/NativeFormatting.cpp
-SRCS_MIN+=	Support/Options.cpp
-SRCS_LLD+=	Support/Parallel.cpp
+SRCS_MIN+=	Support/Optional.cpp
+#SRCS_LLD+=	Support/Parallel.cpp
 SRCS_MIN+=	Support/Path.cpp
 SRCS_MIN+=	Support/PluginLoader.cpp
 SRCS_MIN+=	Support/PrettyStackTrace.cpp
@@ -840,6 +843,7 @@ SRCS_MIN+=	Support/SHA1.cpp
 SRCS_MIN+=	Support/ScaledNumber.cpp
 SRCS_MIN+=	Support/ScopedPrinter.cpp
 SRCS_MIN+=	Support/Signals.cpp
+SRCS_MIN+=	Support/Signposts.cpp
 SRCS_MIN+=	Support/SmallPtrSet.cpp
 SRCS_MIN+=	Support/SmallVector.cpp
 SRCS_MIN+=	Support/SourceMgr.cpp
@@ -855,8 +859,8 @@ SRCS_LLD+=	Support/TarWriter.cpp
 SRCS_MIN+=	Support/TargetParser.cpp
 SRCS_MIN+=	Support/TargetRegistry.cpp
 SRCS_MIN+=	Support/ThreadLocal.cpp
-SRCS_MIN+=	Support/ThreadPool.cpp
 SRCS_MIN+=	Support/Threading.cpp
+SRCS_MIN+=	Support/TimeProfiler.cpp
 SRCS_MIN+=	Support/Timer.cpp
 SRCS_MIN+=	Support/ToolOutputFile.cpp
 SRCS_MIN+=	Support/TrigramIndex.cpp
@@ -867,6 +871,7 @@ SRCS_MIN+=	Support/UnicodeCaseFold.cpp
 SRCS_MIN+=	Support/Valgrind.cpp
 SRCS_MIN+=	Support/VirtualFileSystem.cpp
 SRCS_MIN+=	Support/VersionTuple.cpp
+SRCS_MIN+=	Support/Watchdog.cpp
 SRCS_MIN+=	Support/WithColor.cpp
 SRCS_MIN+=	Support/YAMLParser.cpp
 SRCS_MIN+=	Support/YAMLTraits.cpp
@@ -895,6 +900,7 @@ SRCS_MIN+=	Target/AArch64/AArch64AdvSIMDScalarPass.cpp
 SRCS_MIN+=	Target/AArch64/AArch64AsmPrinter.cpp
 SRCS_MIN+=	Target/AArch64/AArch64BranchTargets.cpp
 SRCS_MIN+=	Target/AArch64/AArch64CallLowering.cpp
+SRCS_MIN+=	Target/AArch64/AArch64CallingConvention.cpp
 SRCS_MIN+=	Target/AArch64/AArch64CleanupLocalDynamicTLSPass.cpp
 SRCS_MIN+=	Target/AArch64/AArch64CollectLOH.cpp
 SRCS_MIN+=	Target/AArch64/AArch64CompressJumpTables.cpp
@@ -902,6 +908,7 @@ SRCS_MIN+=	Target/AArch64/AArch64CondBrTuning.cpp
 SRCS_MIN+=	Target/AArch64/AArch64ConditionOptimizer.cpp
 SRCS_MIN+=	Target/AArch64/AArch64ConditionalCompares.cpp
 SRCS_MIN+=	Target/AArch64/AArch64DeadRegisterDefinitionsPass.cpp
+SRCS_MIN+=	Target/AArch64/AArch64ExpandImm.cpp
 SRCS_MIN+=	Target/AArch64/AArch64ExpandPseudoInsts.cpp
 SRCS_MIN+=	Target/AArch64/AArch64FalkorHWPFFix.cpp
 SRCS_MIN+=	Target/AArch64/AArch64FastISel.cpp
@@ -923,6 +930,7 @@ SRCS_MIN+=	Target/AArch64/AArch64RegisterInfo.cpp
 SRCS_MIN+=	Target/AArch64/AArch64SIMDInstrOpt.cpp
 SRCS_MIN+=	Target/AArch64/AArch64SelectionDAGInfo.cpp
 SRCS_MIN+=	Target/AArch64/AArch64SpeculationHardening.cpp
+SRCS_MIN+=	Target/AArch64/AArch64StackTagging.cpp
 SRCS_MIN+=	Target/AArch64/AArch64StorePairSuppress.cpp
 SRCS_MIN+=	Target/AArch64/AArch64Subtarget.cpp
 SRCS_MIN+=	Target/AArch64/AArch64TargetMachine.cpp
@@ -931,10 +939,10 @@ SRCS_MIN+=	Target/AArch64/AArch64TargetTransformInfo.cpp
 SRCS_MIN+=	Target/AArch64/AsmParser/AArch64AsmParser.cpp
 SRCS_XDW+=	Target/AArch64/Disassembler/AArch64Disassembler.cpp
 SRCS_XDW+=	Target/AArch64/Disassembler/AArch64ExternalSymbolizer.cpp
-SRCS_MIN+=	Target/AArch64/InstPrinter/AArch64InstPrinter.cpp
 SRCS_MIN+=	Target/AArch64/MCTargetDesc/AArch64AsmBackend.cpp
 SRCS_MIN+=	Target/AArch64/MCTargetDesc/AArch64ELFObjectWriter.cpp
 SRCS_MIN+=	Target/AArch64/MCTargetDesc/AArch64ELFStreamer.cpp
+SRCS_MIN+=	Target/AArch64/MCTargetDesc/AArch64InstPrinter.cpp
 SRCS_MIN+=	Target/AArch64/MCTargetDesc/AArch64MCAsmInfo.cpp
 SRCS_MIN+=	Target/AArch64/MCTargetDesc/AArch64MCCodeEmitter.cpp
 SRCS_MIN+=	Target/AArch64/MCTargetDesc/AArch64MCExpr.cpp
@@ -951,9 +959,10 @@ SRCS_MIN+=	Target/ARM/A15SDOptimizer.cpp
 SRCS_MIN+=	Target/ARM/ARMAsmPrinter.cpp
 SRCS_MIN+=	Target/ARM/ARMBaseInstrInfo.cpp
 SRCS_MIN+=	Target/ARM/ARMBaseRegisterInfo.cpp
+SRCS_MIN+=	Target/ARM/ARMBasicBlockInfo.cpp
 SRCS_MIN+=	Target/ARM/ARMCallLowering.cpp
+SRCS_MIN+=	Target/ARM/ARMCallingConv.cpp
 SRCS_MIN+=	Target/ARM/ARMCodeGenPrepare.cpp
-SRCS_MIN+=	Target/ARM/ARMComputeBlockSize.cpp
 SRCS_MIN+=	Target/ARM/ARMConstantIslandPass.cpp
 SRCS_MIN+=	Target/ARM/ARMConstantPoolValue.cpp
 SRCS_MIN+=	Target/ARM/ARMExpandPseudoInsts.cpp
@@ -966,6 +975,7 @@ SRCS_MIN+=	Target/ARM/ARMInstrInfo.cpp
 SRCS_MIN+=	Target/ARM/ARMInstructionSelector.cpp
 SRCS_MIN+=	Target/ARM/ARMLegalizerInfo.cpp
 SRCS_MIN+=	Target/ARM/ARMLoadStoreOptimizer.cpp
+SRCS_MIN+=	Target/ARM/ARMLowOverheadLoops.cpp
 SRCS_MIN+=	Target/ARM/ARMMCInstLower.cpp
 SRCS_MIN+=	Target/ARM/ARMMachineFunctionInfo.cpp
 SRCS_MIN+=	Target/ARM/ARMMacroFusion.cpp
@@ -980,10 +990,10 @@ SRCS_MIN+=	Target/ARM/ARMTargetObjectFile.cpp
 SRCS_MIN+=	Target/ARM/ARMTargetTransformInfo.cpp
 SRCS_MIN+=	Target/ARM/AsmParser/ARMAsmParser.cpp
 SRCS_MIN+=	Target/ARM/Disassembler/ARMDisassembler.cpp
-SRCS_MIN+=	Target/ARM/InstPrinter/ARMInstPrinter.cpp
 SRCS_MIN+=	Target/ARM/MCTargetDesc/ARMAsmBackend.cpp
 SRCS_MIN+=	Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp
 SRCS_MIN+=	Target/ARM/MCTargetDesc/ARMELFStreamer.cpp
+SRCS_MIN+=	Target/ARM/MCTargetDesc/ARMInstPrinter.cpp
 SRCS_MIN+=	Target/ARM/MCTargetDesc/ARMMCAsmInfo.cpp
 SRCS_MIN+=	Target/ARM/MCTargetDesc/ARMMCCodeEmitter.cpp
 SRCS_MIN+=	Target/ARM/MCTargetDesc/ARMMCExpr.cpp
@@ -1020,9 +1030,9 @@ SRCS_MIN+=	Target/BPF/BPFSubtarget.cpp
 SRCS_MIN+=	Target/BPF/BPFTargetMachine.cpp
 SRCS_MIN+=	Target/BPF/BTFDebug.cpp
 SRCS_MIN+=	Target/BPF/Disassembler/BPFDisassembler.cpp
-SRCS_MIN+=	Target/BPF/InstPrinter/BPFInstPrinter.cpp
 SRCS_MIN+=	Target/BPF/MCTargetDesc/BPFAsmBackend.cpp
 SRCS_MIN+=	Target/BPF/MCTargetDesc/BPFELFObjectWriter.cpp
+SRCS_MIN+=	Target/BPF/MCTargetDesc/BPFInstPrinter.cpp
 SRCS_MIN+=	Target/BPF/MCTargetDesc/BPFMCCodeEmitter.cpp
 SRCS_MIN+=	Target/BPF/MCTargetDesc/BPFMCTargetDesc.cpp
 SRCS_MIN+=	Target/BPF/TargetInfo/BPFTargetInfo.cpp
@@ -1030,12 +1040,12 @@ SRCS_MIN+=	Target/BPF/TargetInfo/BPFTargetInfo.cpp
 .if ${MK_LLVM_TARGET_MIPS} != "no"
 SRCS_MIN+=	Target/Mips/AsmParser/MipsAsmParser.cpp
 SRCS_XDW+=	Target/Mips/Disassembler/MipsDisassembler.cpp
-SRCS_MIN+=	Target/Mips/InstPrinter/MipsInstPrinter.cpp
 SRCS_MIN+=	Target/Mips/MCTargetDesc/MipsABIFlagsSection.cpp
 SRCS_MIN+=	Target/Mips/MCTargetDesc/MipsABIInfo.cpp
 SRCS_MIN+=	Target/Mips/MCTargetDesc/MipsAsmBackend.cpp
 SRCS_MIN+=	Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp
 SRCS_MIN+=	Target/Mips/MCTargetDesc/MipsELFStreamer.cpp
+SRCS_MIN+=	Target/Mips/MCTargetDesc/MipsInstPrinter.cpp
 SRCS_MIN+=	Target/Mips/MCTargetDesc/MipsMCAsmInfo.cpp
 SRCS_MIN+=	Target/Mips/MCTargetDesc/MipsMCCodeEmitter.cpp
 SRCS_MIN+=	Target/Mips/MCTargetDesc/MipsMCExpr.cpp
@@ -1087,21 +1097,23 @@ SRCS_MIN+=	Target/Mips/TargetInfo/MipsTargetInfo.cpp
 .if ${MK_LLVM_TARGET_POWERPC} != "no"
 SRCS_MIN+=	Target/PowerPC/AsmParser/PPCAsmParser.cpp
 SRCS_MIN+=	Target/PowerPC/Disassembler/PPCDisassembler.cpp
-SRCS_MIN+=	Target/PowerPC/InstPrinter/PPCInstPrinter.cpp
 SRCS_MIN+=	Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp
 SRCS_MIN+=	Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp
+SRCS_MIN+=	Target/PowerPC/MCTargetDesc/PPCInstPrinter.cpp
 SRCS_MIN+=	Target/PowerPC/MCTargetDesc/PPCMCAsmInfo.cpp
 SRCS_MIN+=	Target/PowerPC/MCTargetDesc/PPCMCCodeEmitter.cpp
 SRCS_MIN+=	Target/PowerPC/MCTargetDesc/PPCMCExpr.cpp
 SRCS_MIN+=	Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.cpp
 SRCS_MIN+=	Target/PowerPC/MCTargetDesc/PPCMachObjectWriter.cpp
 SRCS_MIN+=	Target/PowerPC/MCTargetDesc/PPCPredicates.cpp
+SRCS_MIN+=	Target/PowerPC/MCTargetDesc/PPCXCOFFObjectWriter.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
+SRCS_MIN+=	Target/PowerPC/PPCCallingConv.cpp
 SRCS_MIN+=	Target/PowerPC/PPCEarlyReturn.cpp
 SRCS_MIN+=	Target/PowerPC/PPCExpandISEL.cpp
 SRCS_MIN+=	Target/PowerPC/PPCFastISel.cpp
@@ -1114,6 +1126,7 @@ 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/PPCMachineScheduler.cpp
 SRCS_MIN+=	Target/PowerPC/PPCPreEmitPeephole.cpp
 SRCS_MIN+=	Target/PowerPC/PPCQPXLoadSplat.cpp
 SRCS_MIN+=	Target/PowerPC/PPCReduceCRLogicals.cpp
@@ -1132,10 +1145,10 @@ SRCS_MIN+=	Target/PowerPC/TargetInfo/PowerPCTargetInfo.cpp
 .if ${MK_LLVM_TARGET_RISCV} != "no"
 SRCS_MIN+=	Target/RISCV/AsmParser/RISCVAsmParser.cpp
 SRCS_MIN+=	Target/RISCV/Disassembler/RISCVDisassembler.cpp
-SRCS_MIN+=	Target/RISCV/InstPrinter/RISCVInstPrinter.cpp
 SRCS_MIN+=	Target/RISCV/MCTargetDesc/RISCVAsmBackend.cpp
 SRCS_MIN+=	Target/RISCV/MCTargetDesc/RISCVELFObjectWriter.cpp
 SRCS_MIN+=	Target/RISCV/MCTargetDesc/RISCVELFStreamer.cpp
+SRCS_MIN+=	Target/RISCV/MCTargetDesc/RISCVInstPrinter.cpp
 SRCS_MIN+=	Target/RISCV/MCTargetDesc/RISCVMCAsmInfo.cpp
 SRCS_MIN+=	Target/RISCV/MCTargetDesc/RISCVMCCodeEmitter.cpp
 SRCS_MIN+=	Target/RISCV/MCTargetDesc/RISCVMCExpr.cpp
@@ -1161,10 +1174,10 @@ SRCS_MIN+=	Target/RISCV/Utils/RISCVMatInt.cpp
 SRCS_MIN+=	Target/Sparc/AsmParser/SparcAsmParser.cpp
 SRCS_MIN+=	Target/Sparc/DelaySlotFiller.cpp
 SRCS_XDW+=	Target/Sparc/Disassembler/SparcDisassembler.cpp
-SRCS_MIN+=	Target/Sparc/InstPrinter/SparcInstPrinter.cpp
 SRCS_MIN+=	Target/Sparc/LeonPasses.cpp
 SRCS_MIN+=	Target/Sparc/MCTargetDesc/SparcAsmBackend.cpp
 SRCS_MIN+=	Target/Sparc/MCTargetDesc/SparcELFObjectWriter.cpp
+SRCS_MIN+=	Target/Sparc/MCTargetDesc/SparcInstPrinter.cpp
 SRCS_MIN+=	Target/Sparc/MCTargetDesc/SparcMCAsmInfo.cpp
 SRCS_MIN+=	Target/Sparc/MCTargetDesc/SparcMCCodeEmitter.cpp
 SRCS_MIN+=	Target/Sparc/MCTargetDesc/SparcMCExpr.cpp
@@ -1184,21 +1197,19 @@ SRCS_MIN+=	Target/Sparc/SparcTargetObjectFile.cpp
 SRCS_MIN+=	Target/Sparc/TargetInfo/SparcTargetInfo.cpp
 .endif # MK_LLVM_TARGET_SPARC
 SRCS_MIN+=	Target/Target.cpp
-SRCS_MIN+=	Target/TargetIntrinsicInfo.cpp
 SRCS_MIN+=	Target/TargetLoweringObjectFile.cpp
 SRCS_MIN+=	Target/TargetMachine.cpp
 SRCS_MIN+=	Target/TargetMachineC.cpp
 .if ${MK_LLVM_TARGET_X86} != "no"
-SRCS_MIN+=	Target/X86/AsmParser/X86AsmInstrumentation.cpp
 SRCS_MIN+=	Target/X86/AsmParser/X86AsmParser.cpp
 SRCS_XDW+=	Target/X86/Disassembler/X86Disassembler.cpp
 SRCS_XDW+=	Target/X86/Disassembler/X86DisassemblerDecoder.cpp
-SRCS_MIN+=	Target/X86/InstPrinter/X86ATTInstPrinter.cpp
-SRCS_MIN+=	Target/X86/InstPrinter/X86InstComments.cpp
-SRCS_MIN+=	Target/X86/InstPrinter/X86InstPrinterCommon.cpp
-SRCS_MIN+=	Target/X86/InstPrinter/X86IntelInstPrinter.cpp
+SRCS_MIN+=	Target/X86/MCTargetDesc/X86ATTInstPrinter.cpp
 SRCS_MIN+=	Target/X86/MCTargetDesc/X86AsmBackend.cpp
 SRCS_MIN+=	Target/X86/MCTargetDesc/X86ELFObjectWriter.cpp
+SRCS_MIN+=	Target/X86/MCTargetDesc/X86InstComments.cpp
+SRCS_MIN+=	Target/X86/MCTargetDesc/X86InstPrinterCommon.cpp
+SRCS_MIN+=	Target/X86/MCTargetDesc/X86IntelInstPrinter.cpp
 SRCS_MIN+=	Target/X86/MCTargetDesc/X86MCAsmInfo.cpp
 SRCS_MIN+=	Target/X86/MCTargetDesc/X86MCCodeEmitter.cpp
 SRCS_MIN+=	Target/X86/MCTargetDesc/X86MCTargetDesc.cpp
@@ -1208,7 +1219,6 @@ 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/ShadowCallStack.cpp
 SRCS_MIN+=	Target/X86/X86AsmPrinter.cpp
 SRCS_MIN+=	Target/X86/X86AvoidStoreForwardingBlocks.cpp
 SRCS_MIN+=	Target/X86/X86CallFrameOptimization.cpp
@@ -1268,6 +1278,7 @@ SRCS_MIN+=	Transforms/Coroutines/CoroSplit.cpp
 SRCS_MIN+=	Transforms/Coroutines/Coroutines.cpp
 SRCS_MIN+=	Transforms/IPO/AlwaysInliner.cpp
 SRCS_MIN+=	Transforms/IPO/ArgumentPromotion.cpp
+SRCS_MIN+=	Transforms/IPO/Attributor.cpp
 SRCS_MIN+=	Transforms/IPO/BarrierNoopPass.cpp
 SRCS_EXT+=	Transforms/IPO/BlockExtractor.cpp
 SRCS_MIN+=	Transforms/IPO/CalledValuePropagation.cpp
@@ -1304,6 +1315,7 @@ SRCS_MIN+=	Transforms/IPO/ThinLTOBitcodeWriter.cpp
 SRCS_MIN+=	Transforms/IPO/WholeProgramDevirt.cpp
 SRCS_MIN+=	Transforms/InstCombine/InstCombineAddSub.cpp
 SRCS_MIN+=	Transforms/InstCombine/InstCombineAndOrXor.cpp
+SRCS_MIN+=	Transforms/InstCombine/InstCombineAtomicRMW.cpp
 SRCS_MIN+=	Transforms/InstCombine/InstCombineCalls.cpp
 SRCS_MIN+=	Transforms/InstCombine/InstCombineCasts.cpp
 SRCS_MIN+=	Transforms/InstCombine/InstCombineCompares.cpp
@@ -1320,15 +1332,16 @@ SRCS_MIN+=	Transforms/Instrumentation/BoundsChecking.cpp
 SRCS_MIN+=	Transforms/Instrumentation/CGProfile.cpp
 SRCS_MIN+=	Transforms/Instrumentation/ControlHeightReduction.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/InstrOrderFile.cpp
 SRCS_MIN+=	Transforms/Instrumentation/InstrProfiling.cpp
 SRCS_MIN+=	Transforms/Instrumentation/Instrumentation.cpp
 SRCS_MIN+=	Transforms/Instrumentation/MemorySanitizer.cpp
 SRCS_MIN+=	Transforms/Instrumentation/PGOInstrumentation.cpp
 SRCS_MIN+=	Transforms/Instrumentation/PGOMemOPSizeOpt.cpp
+SRCS_MIN+=	Transforms/Instrumentation/PoisonChecking.cpp
 SRCS_MIN+=	Transforms/Instrumentation/SanitizerCoverage.cpp
 SRCS_MIN+=	Transforms/Instrumentation/ThreadSanitizer.cpp
 SRCS_MIN+=	Transforms/ObjCARC/DependencyAnalysis.cpp
@@ -1368,6 +1381,7 @@ SRCS_MIN+=	Transforms/Scalar/LoopAccessAnalysisPrinter.cpp
 SRCS_MIN+=	Transforms/Scalar/LoopDataPrefetch.cpp
 SRCS_MIN+=	Transforms/Scalar/LoopDeletion.cpp
 SRCS_MIN+=	Transforms/Scalar/LoopDistribute.cpp
+SRCS_MIN+=	Transforms/Scalar/LoopFuse.cpp
 SRCS_MIN+=	Transforms/Scalar/LoopIdiomRecognize.cpp
 SRCS_MIN+=	Transforms/Scalar/LoopInstSimplify.cpp
 SRCS_MIN+=	Transforms/Scalar/LoopInterchange.cpp
@@ -1386,6 +1400,7 @@ SRCS_MIN+=	Transforms/Scalar/LoopVersioningLICM.cpp
 SRCS_MIN+=	Transforms/Scalar/LowerAtomic.cpp
 SRCS_MIN+=	Transforms/Scalar/LowerExpectIntrinsic.cpp
 SRCS_MIN+=	Transforms/Scalar/LowerGuardIntrinsic.cpp
+SRCS_MIN+=	Transforms/Scalar/LowerWidenableCondition.cpp
 SRCS_MIN+=	Transforms/Scalar/MakeGuardsExplicit.cpp
 SRCS_MIN+=	Transforms/Scalar/MemCpyOptimizer.cpp
 SRCS_MIN+=	Transforms/Scalar/MergeICmps.cpp
@@ -1460,6 +1475,7 @@ SRCS_MIN+=	Transforms/Utils/SanitizerStats.cpp
 SRCS_MIN+=	Transforms/Utils/SimplifyCFG.cpp
 SRCS_MIN+=	Transforms/Utils/SimplifyIndVar.cpp
 SRCS_MIN+=	Transforms/Utils/SimplifyLibCalls.cpp
+SRCS_MIN+=	Transforms/Utils/SizeOpts.cpp
 SRCS_MIN+=	Transforms/Utils/SplitModule.cpp
 SRCS_MIN+=	Transforms/Utils/StripGCRelocates.cpp
 SRCS_MIN+=	Transforms/Utils/StripNonLineTableDebugInfo.cpp
@@ -1475,6 +1491,7 @@ SRCS_MIN+=	Transforms/Vectorize/SLPVectorizer.cpp
 SRCS_MIN+=	Transforms/Vectorize/VPlan.cpp
 SRCS_MIN+=	Transforms/Vectorize/VPlanHCFGBuilder.cpp
 SRCS_MIN+=	Transforms/Vectorize/VPlanHCFGTransforms.cpp
+SRCS_MIN+=	Transforms/Vectorize/VPlanPredicator.cpp
 SRCS_MIN+=	Transforms/Vectorize/VPlanVerifier.cpp
 SRCS_EXT+=	Transforms/Vectorize/Vectorize.cpp
 SRCS_EXT+=	XRay/BlockIndexer.cpp
diff --git a/lib/clang/libllvmminimal/Makefile b/lib/clang/libllvmminimal/Makefile
index 0b4c40c157ce..161578dbf561 100644
--- a/lib/clang/libllvmminimal/Makefile
+++ b/lib/clang/libllvmminimal/Makefile
@@ -6,10 +6,11 @@ LIB=		llvmminimal
 INTERNALLIB=
 
 SRCDIR=		lib
+SRCS+=		Demangle/ItaniumDemangle.cpp
 SRCS+=		Support/APFloat.cpp
 SRCS+=		Support/APInt.cpp
 SRCS+=		Support/ARMTargetParser.cpp
-SRCS+=		Support/Atomic.cpp
+#SRCS+=		Support/Atomic.cpp
 SRCS+=		Support/CodeGenCoverage.cpp
 SRCS+=		Support/CommandLine.cpp
 SRCS+=		Support/ConvertUTF.cpp
@@ -38,6 +39,7 @@ SRCS+=		Support/Process.cpp
 SRCS+=		Support/Program.cpp
 SRCS+=		Support/Regex.cpp
 SRCS+=		Support/Signals.cpp
+SRCS+=		Support/Signposts.cpp
 SRCS+=		Support/SmallPtrSet.cpp
 SRCS+=		Support/SmallVector.cpp
 SRCS+=		Support/SourceMgr.cpp
@@ -52,6 +54,7 @@ SRCS+=		Support/ToolOutputFile.cpp
 SRCS+=		Support/Triple.cpp
 SRCS+=		Support/Twine.cpp
 SRCS+=		Support/Unicode.cpp
+SRCS+=		Support/Watchdog.cpp
 SRCS+=		Support/WithColor.cpp
 SRCS+=		Support/circular_raw_ostream.cpp
 SRCS+=		Support/raw_ostream.cpp
diff --git a/lib/clang/llvm.build.mk b/lib/clang/llvm.build.mk
index 24be5647e777..52ba285d8f25 100644
--- a/lib/clang/llvm.build.mk
+++ b/lib/clang/llvm.build.mk
@@ -14,9 +14,9 @@
 
 CFLAGS+=	-I${SRCTOP}/lib/clang/include
 CFLAGS+=	-I${LLVM_SRCS}/include
-CFLAGS+=	-DLLVM_BUILD_GLOBAL_ISEL
-CFLAGS+=	-D__STDC_LIMIT_MACROS
 CFLAGS+=	-D__STDC_CONSTANT_MACROS
+CFLAGS+=	-D__STDC_FORMAT_MACROS
+CFLAGS+=	-D__STDC_LIMIT_MACROS
 #CFLAGS+=	-DNDEBUG
 
 TARGET_ARCH?=	${MACHINE_ARCH}
diff --git a/usr.bin/clang/clang-tblgen/Makefile b/usr.bin/clang/clang-tblgen/Makefile
index 9fed46ffcf9d..3d24674f0b1f 100644
--- a/usr.bin/clang/clang-tblgen/Makefile
+++ b/usr.bin/clang/clang-tblgen/Makefile
@@ -11,6 +11,7 @@ SRCS+=		ClangCommentHTMLNamedCharacterReferenceEmitter.cpp
 SRCS+=		ClangCommentHTMLTagsEmitter.cpp
 SRCS+=		ClangDataCollectorsEmitter.cpp
 SRCS+=		ClangDiagnosticsEmitter.cpp
+SRCS+=		ClangOpenCLBuiltinEmitter.cpp
 SRCS+=		ClangOptionDocEmitter.cpp
 SRCS+=		ClangSACheckersEmitter.cpp
 SRCS+=		NeonEmitter.cpp
diff --git a/usr.bin/clang/clang.prog.mk b/usr.bin/clang/clang.prog.mk
index 0ceb9e8ece6f..de5cceac7c6b 100644
--- a/usr.bin/clang/clang.prog.mk
+++ b/usr.bin/clang/clang.prog.mk
@@ -17,6 +17,7 @@ LDADD+=		${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a
 
 PACKAGE=	clang
 
+LIBADD+=	execinfo
 LIBADD+=	ncursesw
 LIBADD+=	pthread
 
diff --git a/usr.bin/clang/llvm.prog.mk b/usr.bin/clang/llvm.prog.mk
index 94fe1eec6424..50a4f8a0f3f5 100644
--- a/usr.bin/clang/llvm.prog.mk
+++ b/usr.bin/clang/llvm.prog.mk
@@ -21,6 +21,7 @@ LDADD+=		${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a
 
 PACKAGE=	clang
 
+LIBADD+=	execinfo
 LIBADD+=	ncursesw
 LIBADD+=	pthread