diff --git a/lib/clang/libllvm/Makefile b/lib/clang/libllvm/Makefile
index 06338dd4d68d..38e58e976c5f 100644
--- a/lib/clang/libllvm/Makefile
+++ b/lib/clang/libllvm/Makefile
@@ -127,6 +127,7 @@ SRCS_MIN+=	BinaryFormat/Dwarf.cpp
 SRCS_MIN+=	BinaryFormat/Magic.cpp
 SRCS_MIN+=	BinaryFormat/Wasm.cpp
 SRCS_MIN+=	Bitcode/Reader/BitReader.cpp
+SRCS_EXT+=	Bitcode/Reader/BitcodeAnalyzer.cpp
 SRCS_MIN+=	Bitcode/Reader/BitcodeReader.cpp
 SRCS_MIN+=	Bitcode/Reader/MetadataLoader.cpp
 SRCS_MIN+=	Bitcode/Reader/ValueList.cpp
@@ -157,6 +158,7 @@ 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_EXT+=	CodeGen/AsmPrinter/ErlangGCPrinter.cpp
 SRCS_MIN+=	CodeGen/AsmPrinter/OcamlGCPrinter.cpp
 SRCS_MIN+=	CodeGen/AsmPrinter/WasmException.cpp
 SRCS_MIN+=	CodeGen/AsmPrinter/WinCFGuard.cpp
@@ -166,6 +168,7 @@ SRCS_MIN+=	CodeGen/BasicTargetTransformInfo.cpp
 SRCS_MIN+=	CodeGen/BranchFolding.cpp
 SRCS_MIN+=	CodeGen/BranchRelaxation.cpp
 SRCS_MIN+=	CodeGen/BreakFalseDeps.cpp
+SRCS_EXT+=	CodeGen/BuiltinGCs.cpp
 SRCS_MIN+=	CodeGen/CFIInstrInserter.cpp
 SRCS_MIN+=	CodeGen/CalcSpillWeights.cpp
 SRCS_MIN+=	CodeGen/CallingConvLower.cpp
@@ -439,6 +442,7 @@ 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_EXT+=	DebugInfo/MSF/MSFError.cpp
 SRCS_MIN+=	DebugInfo/MSF/MappedBlockStream.cpp
 SRCS_EXT+=	DebugInfo/PDB/GenericError.cpp
 SRCS_EXT+=	DebugInfo/PDB/IPDBSourceFile.cpp
@@ -454,10 +458,12 @@ SRCS_EXT+=	DebugInfo/PDB/Native/Hash.cpp
 SRCS_EXT+=	DebugInfo/PDB/Native/HashTable.cpp
 SRCS_EXT+=	DebugInfo/PDB/Native/InfoStream.cpp
 SRCS_EXT+=	DebugInfo/PDB/Native/InfoStreamBuilder.cpp
+SRCS_EXT+=	DebugInfo/PDB/Native/InjectedSourceStream.cpp
 SRCS_EXT+=	DebugInfo/PDB/Native/ModuleDebugStream.cpp
 SRCS_EXT+=	DebugInfo/PDB/Native/NamedStreamMap.cpp
 SRCS_EXT+=	DebugInfo/PDB/Native/NativeCompilandSymbol.cpp
 SRCS_EXT+=	DebugInfo/PDB/Native/NativeEnumGlobals.cpp
+SRCS_EXT+=	DebugInfo/PDB/Native/NativeEnumInjectedSources.cpp
 SRCS_EXT+=	DebugInfo/PDB/Native/NativeEnumModules.cpp
 SRCS_EXT+=	DebugInfo/PDB/Native/NativeEnumTypes.cpp
 SRCS_EXT+=	DebugInfo/PDB/Native/NativeExeSymbol.cpp
@@ -536,6 +542,7 @@ 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/CompileUtils.cpp
 SRCS_EXT+=	ExecutionEngine/Orc/Core.cpp
 SRCS_EXT+=	ExecutionEngine/Orc/ExecutionUtils.cpp
 SRCS_EXT+=	ExecutionEngine/Orc/IRCompileLayer.cpp
@@ -717,6 +724,7 @@ SRCS_EXT+=	MCA/Stages/DispatchStage.cpp
 SRCS_EXT+=	MCA/Stages/EntryStage.cpp
 SRCS_EXT+=	MCA/Stages/ExecuteStage.cpp
 SRCS_EXT+=	MCA/Stages/InstructionTables.cpp
+SRCS_EXT+=	MCA/Stages/MicroOpQueueStage.cpp
 SRCS_EXT+=	MCA/Stages/RetireStage.cpp
 SRCS_EXT+=	MCA/Stages/Stage.cpp
 SRCS_EXT+=	MCA/Support.cpp
diff --git a/usr.bin/clang/llvm-mca/Makefile b/usr.bin/clang/llvm-mca/Makefile
index 13b9dcd145a3..e0a39efc7363 100644
--- a/usr.bin/clang/llvm-mca/Makefile
+++ b/usr.bin/clang/llvm-mca/Makefile
@@ -6,6 +6,7 @@ SRCDIR=		tools/llvm-mca
 SRCS+=		CodeRegion.cpp
 SRCS+=		CodeRegionGenerator.cpp
 SRCS+=		PipelinePrinter.cpp
+SRCS+=		Views/BottleneckAnalysis.cpp
 SRCS+=		Views/DispatchStatistics.cpp
 SRCS+=		Views/InstructionInfoView.cpp
 SRCS+=		Views/RegisterFileStatistics.cpp
diff --git a/usr.bin/clang/llvm-objcopy/Makefile b/usr.bin/clang/llvm-objcopy/Makefile
index af0c87bcc4ca..497e8d7eb939 100644
--- a/usr.bin/clang/llvm-objcopy/Makefile
+++ b/usr.bin/clang/llvm-objcopy/Makefile
@@ -12,6 +12,10 @@ SRCS+=		COFF/Writer.cpp
 SRCS+=		CopyConfig.cpp
 SRCS+=		ELF/ELFObjcopy.cpp
 SRCS+=		ELF/Object.cpp
+SRCS+=		MachO/MachOObjcopy.cpp
+SRCS+=		MachO/MachOReader.cpp
+SRCS+=		MachO/MachOWriter.cpp
+SRCS+=		MachO/Object.cpp
 SRCS+=		llvm-objcopy.cpp
 
 .include "${SRCTOP}/lib/clang/llvm.pre.mk"
@@ -42,6 +46,7 @@ LDADD+=		${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a
 
 PACKAGE=	clang
 
+LIBADD+=	execinfo
 LIBADD+=	ncursesw
 LIBADD+=	pthread
 LIBADD+=	z
diff --git a/usr.bin/clang/llvm-pdbutil/Makefile b/usr.bin/clang/llvm-pdbutil/Makefile
index 51d988553f12..1e8b7605f908 100644
--- a/usr.bin/clang/llvm-pdbutil/Makefile
+++ b/usr.bin/clang/llvm-pdbutil/Makefile
@@ -23,6 +23,7 @@ SRCS+=		PrettyTypeDumper.cpp
 SRCS+=		PrettyTypedefDumper.cpp
 SRCS+=		PrettyVariableDumper.cpp
 SRCS+=		StreamUtil.cpp
+SRCS+=		TypeReferenceTracker.cpp
 SRCS+=		YAMLOutputStyle.cpp
 SRCS+=		llvm-pdbutil.cpp