Update build blue to make WITH_CLANG_EXTRAS and WITH_CLANG_FULL work.

lib/clang/libclang/Makefile

@@ -246,6 +246,7 @@ SRCS_MIN+=	CodeGen/SanitizerMetadata.cpp
 SRCS_MIN+=	CodeGen/SwiftCallingConv.cpp
 SRCS_MIN+=	CodeGen/TargetInfo.cpp
 SRCS_MIN+=	CodeGen/VarBypassDetector.cpp
+SRCS_FUL+=	CrossTU/CrossTranslationUnit.cpp
 SRCS_MIN+=	Driver/Action.cpp
 SRCS_MIN+=	Driver/Compilation.cpp
 SRCS_MIN+=	Driver/Distro.cpp
@@ -479,6 +480,7 @@ SRCS_FUL+=	StaticAnalyzer/Checkers/BasicObjCFoundationChecks.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/BlockInCriticalSectionChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/BoolAssignmentChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/BuiltinFunctionChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/GCDAntipatternChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/CStringChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/CStringSyntaxChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/CXXSelfAssignmentChecker.cpp
@@ -506,6 +508,7 @@ SRCS_FUL+=	StaticAnalyzer/Checkers/FixedAddressChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/GTestChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/GenericTaintChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/IdenticalExprChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/InnerPointerChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/IteratorChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/IvarInvalidationChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/LLVMConventionsChecker.cpp
@@ -519,6 +522,7 @@ SRCS_FUL+=	StaticAnalyzer/Checkers/MallocChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/MallocOverflowSecurityChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/MallocSizeofChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/MisusedMovedObjectChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/MmapWriteExecChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/NSAutoreleasePoolChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/NSErrorChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/NoReturnFunctionChecker.cpp
@@ -527,6 +531,7 @@ SRCS_FUL+=	StaticAnalyzer/Checkers/NonnullGlobalConstantsChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/NullabilityChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/NumberObjectConversionChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/ObjCAtSyncChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/ObjCAutoreleaseWriteChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/ObjCContainersASTChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/ObjCContainersChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/ObjCMissingSuperCallChecker.cpp
@@ -541,6 +546,7 @@ SRCS_FUL+=	StaticAnalyzer/Checkers/PthreadLockChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/RetainCountChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/ReturnPointerRangeChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/ReturnUndefChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/RunLoopAutoreleaseLeakChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/SimpleStreamChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/StackAddrEscapeChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/StdLibraryFunctionsChecker.cpp
@@ -548,11 +554,13 @@ SRCS_FUL+=	StaticAnalyzer/Checkers/StreamChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/TaintTesterChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/TestAfterDivZeroChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/TraversalChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/TrustNonnullChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/UndefBranchChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/UndefCapturedBlockVarChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/UndefResultChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/UndefinedArraySubscriptChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/UndefinedAssignmentChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/UninitializedObjectChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/UnixAPIChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/UnreachableCodeChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/VLASizeChecker.cpp
@@ -602,6 +610,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/WorkList.cpp
 SRCS_FUL+=	StaticAnalyzer/Core/Z3ConstraintManager.cpp
 SRCS_FUL+=	StaticAnalyzer/Frontend/AnalysisConsumer.cpp
 SRCS_FUL+=	StaticAnalyzer/Frontend/CheckerRegistration.cpp
@@ -615,6 +624,8 @@ 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
 SRCS_MIN+=	Tooling/Refactoring.cpp
 SRCS_MIN+=	Tooling/RefactoringCallbacks.cpp

lib/clang/libllvm/Makefile

@@ -397,6 +397,7 @@ 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/DWARFCompileUnit.cpp
 SRCS_MIW+=	DebugInfo/DWARF/DWARFContext.cpp
 SRCS_MIW+=	DebugInfo/DWARF/DWARFDataExtractor.cpp
@@ -410,10 +411,12 @@ SRCS_MIW+=	DebugInfo/DWARF/DWARFDebugLoc.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
 SRCS_MIW+=	DebugInfo/DWARF/DWARFDie.cpp
 SRCS_MIW+=	DebugInfo/DWARF/DWARFExpression.cpp
 SRCS_MIW+=	DebugInfo/DWARF/DWARFFormValue.cpp
 SRCS_MIW+=	DebugInfo/DWARF/DWARFGdbIndex.cpp
+SRCS_MIW+=	DebugInfo/DWARF/DWARFListTable.cpp
 SRCS_MIW+=	DebugInfo/DWARF/DWARFTypeUnit.cpp
 SRCS_MIW+=	DebugInfo/DWARF/DWARFUnit.cpp
 SRCS_MIW+=	DebugInfo/DWARF/DWARFUnitIndex.cpp
@@ -505,14 +508,22 @@ SRCS_XDB+=	ExecutionEngine/Interpreter/Execution.cpp
 SRCS_XDB+=	ExecutionEngine/Interpreter/ExternalFunctions.cpp
 SRCS_XDB+=	ExecutionEngine/Interpreter/Interpreter.cpp
 SRCS_XDB+=	ExecutionEngine/MCJIT/MCJIT.cpp
+SRCS_EXT+=	ExecutionEngine/Orc/CompileOnDemandLayer.cpp
+SRCS_EXT+=	ExecutionEngine/Orc/Core.cpp
 SRCS_EXT+=	ExecutionEngine/Orc/ExecutionUtils.cpp
+SRCS_EXT+=	ExecutionEngine/Orc/IRCompileLayer.cpp
+SRCS_EXT+=	ExecutionEngine/Orc/IRTransformLayer.cpp
 SRCS_EXT+=	ExecutionEngine/Orc/IndirectionUtils.cpp
+SRCS_EXT+=	ExecutionEngine/Orc/LLJIT.cpp
+SRCS_EXT+=	ExecutionEngine/Orc/Layer.cpp
+SRCS_EXT+=	ExecutionEngine/Orc/Legacy.cpp
 SRCS_EXT+=	ExecutionEngine/Orc/NullResolver.cpp
 SRCS_EXT+=	ExecutionEngine/Orc/OrcABISupport.cpp
 SRCS_EXT+=	ExecutionEngine/Orc/OrcCBindings.cpp
 SRCS_EXT+=	ExecutionEngine/Orc/OrcError.cpp
 SRCS_EXT+=	ExecutionEngine/Orc/OrcMCJITReplacement.cpp
 SRCS_EXT+=	ExecutionEngine/Orc/RPCUtils.cpp
+SRCS_EXT+=	ExecutionEngine/Orc/RTDyldObjectLinkingLayer.cpp
 SRCS_XDB+=	ExecutionEngine/RuntimeDyld/JITSymbol.cpp
 SRCS_XDB+=	ExecutionEngine/RuntimeDyld/RTDyldMemoryManager.cpp
 SRCS_XDB+=	ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
@@ -686,6 +697,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+=	ProfileData/Coverage/CoverageMapping.cpp
 SRCS_MIN+=	ProfileData/Coverage/CoverageMappingReader.cpp
 SRCS_MIN+=	ProfileData/Coverage/CoverageMappingWriter.cpp
@@ -794,6 +806,7 @@ SRCS_MIN+=	Support/Unicode.cpp
 SRCS_MIN+=	Support/UnicodeCaseFold.cpp
 SRCS_MIN+=	Support/Valgrind.cpp
 SRCS_MIN+=	Support/VersionTuple.cpp
+SRCS_MIW+=	Support/WithColor.cpp
 SRCS_MIN+=	Support/YAMLParser.cpp
 SRCS_MIN+=	Support/YAMLTraits.cpp
 SRCS_MIN+=	Support/circular_raw_ostream.cpp
@@ -1135,6 +1148,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_EXT+=	Transforms/IPO/BlockExtractor.cpp
 SRCS_MIN+=	Transforms/IPO/CalledValuePropagation.cpp
 SRCS_MIN+=	Transforms/IPO/ConstantMerge.cpp
 SRCS_MIN+=	Transforms/IPO/CrossDSOCFI.cpp
@@ -1337,6 +1351,7 @@ SRCS_MIN+=	Transforms/Vectorize/VPlanHCFGBuilder.cpp
 SRCS_MIN+=	Transforms/Vectorize/VPlanVerifier.cpp
 SRCS_EXT+=	Transforms/Vectorize/Vectorize.cpp
 SRCS_EXT+=	XRay/InstrumentationMap.cpp
+SRCS_EXT+=	XRay/Trace.cpp
 
 SRCS_ALL+=	${SRCS_MIN}
 .if !defined(TOOLS_PREFIX) || ${MK_LLD_BOOTSTRAP} != "no"

tools/build/mk/OptionalObsoleteFiles.inc

@@ -1490,6 +1490,7 @@ OLD_FILES+=usr/bin/llvm-link
 OLD_FILES+=usr/bin/llvm-lto
 OLD_FILES+=usr/bin/llvm-lto2
 OLD_FILES+=usr/bin/llvm-mc
+OLD_FILES+=usr/bin/llvm-mca
 OLD_FILES+=usr/bin/llvm-modextract
 OLD_FILES+=usr/bin/llvm-nm
 OLD_FILES+=usr/bin/llvm-objcopy

usr.bin/clang/Makefile

@@ -27,6 +27,7 @@ SUBDIR+=	llvm-link
 SUBDIR+=	llvm-lto
 SUBDIR+=	llvm-lto2
 SUBDIR+=	llvm-mc
+SUBDIR+=	llvm-mca
 SUBDIR+=	llvm-modextract
 SUBDIR+=	llvm-nm
 SUBDIR+=	llvm-objcopy

usr.bin/clang/llvm-mca/Makefile

@@ -0,0 +1,39 @@
+# $FreeBSD$
+
+PROG_CXX=	llvm-mca
+MAN=
+
+SRCDIR=		tools/llvm-mca
+SRCS+=		CodeRegion.cpp
+SRCS+=		Context.cpp
+SRCS+=		DispatchStage.cpp
+SRCS+=		DispatchStatistics.cpp
+SRCS+=		ExecuteStage.cpp
+SRCS+=		FetchStage.cpp
+SRCS+=		HWEventListener.cpp
+SRCS+=		HardwareUnit.cpp
+SRCS+=		InstrBuilder.cpp
+SRCS+=		Instruction.cpp
+SRCS+=		InstructionInfoView.cpp
+SRCS+=		InstructionTables.cpp
+SRCS+=		LSUnit.cpp
+SRCS+=		Pipeline.cpp
+SRCS+=		PipelinePrinter.cpp
+SRCS+=		RegisterFile.cpp
+SRCS+=		RegisterFileStatistics.cpp
+SRCS+=		ResourcePressureView.cpp
+SRCS+=		RetireControlUnit.cpp
+SRCS+=		RetireControlUnitStatistics.cpp
+SRCS+=		RetireStage.cpp
+SRCS+=		Scheduler.cpp
+SRCS+=		SchedulerStatistics.cpp
+SRCS+=		Stage.cpp
+SRCS+=		SummaryView.cpp
+SRCS+=		Support.cpp
+SRCS+=		TimelineView.cpp
+SRCS+=		View.cpp
+SRCS+=		llvm-mca.cpp
+
+LIBADD+=	z
+
+.include "../llvm.prog.mk"

usr.bin/clang/llvm-objcopy/Makefile

@@ -7,4 +7,34 @@ SRCDIR=		tools/llvm-objcopy
 SRCS+=		Object.cpp
 SRCS+=		llvm-objcopy.cpp
 
-.include "../llvm.prog.mk"
+.include "${SRCTOP}/lib/clang/llvm.pre.mk"
+
+CFLAGS+=	-I${.OBJDIR}
+
+.include "${SRCTOP}/lib/clang/llvm.build.mk"
+
+.for hdr in ObjcopyOpts StripOpts
+${hdr}.inc: ${LLVM_SRCS}/${SRCDIR}/${hdr}.td
+	${LLVM_TBLGEN} -gen-opt-parser-defs \
+	    -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} \
+	    ${LLVM_SRCS}/${SRCDIR}/${hdr}.td
+TGHDRS+=	${hdr}.inc
+.endfor
+
+DEPENDFILES+=	${TGHDRS:C/$/.d/}
+DPSRCS+=	${TGHDRS}
+CLEANFILES+=	${TGHDRS} ${TGHDRS:C/$/.d/}
+
+LIBDEPS+=	llvm
+
+.for lib in ${LIBDEPS}
+DPADD+=		${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a
+LDADD+=		${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a
+.endfor
+
+PACKAGE=	clang
+
+LIBADD+=	ncursesw
+LIBADD+=	pthread
+
+.include <bsd.prog.mk>

usr.bin/clang/llvm-pdbutil/Makefile

@@ -6,6 +6,7 @@ SRCDIR=		tools/llvm-pdbutil
 SRCS+=		Analyze.cpp
 SRCS+=		BytesOutputStyle.cpp
 SRCS+=		DumpOutputStyle.cpp
+SRCS+=		ExplainOutputStyle.cpp
 SRCS+=		FormatUtil.cpp
 SRCS+=		InputFile.cpp
 SRCS+=		LinePrinter.cpp

usr.bin/clang/llvm-xray/Makefile

@@ -4,10 +4,16 @@ PROG_CXX=	llvm-xray
 MAN=
 
 SRCDIR=		tools/llvm-xray
-SRCS+=		func-id-helper.cc
-SRCS+=		llvm-xray.cc
-SRCS+=		xray-extract.cc
-SRCS+=		xray-registry.cc
+SRCS+=		func-id-helper.cpp
+SRCS+=		llvm-xray.cpp
+SRCS+=		xray-account.cpp
+SRCS+=		xray-color-helper.cpp
+SRCS+=		xray-converter.cpp
+SRCS+=		xray-extract.cpp
+SRCS+=		xray-graph-diff.cpp
+SRCS+=		xray-graph.cpp
+SRCS+=		xray-registry.cpp
+SRCS+=		xray-stacks.cpp
 
 LIBADD+=	z
 

usr.bin/clang/opt/Makefile

@@ -5,6 +5,7 @@ PROG_CXX=	opt
 SRCDIR=		tools/opt
 SRCS+=		AnalysisWrappers.cpp
 SRCS+=		BreakpointPrinter.cpp
+SRCS+=		Debugify.cpp
 SRCS+=		GraphPrinters.cpp
 SRCS+=		NewPMDriver.cpp
 SRCS+=		PassPrinters.cpp