diff --git a/lib/clang/libllvm/Makefile b/lib/clang/libllvm/Makefile
index 2741136dd82d..473dbcb9c991 100644
--- a/lib/clang/libllvm/Makefile
+++ b/lib/clang/libllvm/Makefile
@@ -855,7 +855,6 @@ SRCS_MIN+=	Support/ManagedStatic.cpp
 SRCS_MIN+=	Support/MathExtras.cpp
 SRCS_XDL+=	Support/Memory.cpp
 SRCS_MIN+=	Support/MemoryBuffer.cpp
-SRCS_MIN+=	Support/Mutex.cpp
 SRCS_MIN+=	Support/NativeFormatting.cpp
 SRCS_MIN+=	Support/Optional.cpp
 SRCS_LLD+=	Support/Parallel.cpp
diff --git a/lib/clang/libllvmminimal/Makefile b/lib/clang/libllvmminimal/Makefile
index 1a5c5bff863d..2ebf0f3506be 100644
--- a/lib/clang/libllvmminimal/Makefile
+++ b/lib/clang/libllvmminimal/Makefile
@@ -31,7 +31,6 @@ SRCS+=		Support/LowLevelType.cpp
 SRCS+=		Support/MD5.cpp
 SRCS+=		Support/ManagedStatic.cpp
 SRCS+=		Support/MemoryBuffer.cpp
-SRCS+=		Support/Mutex.cpp
 SRCS+=		Support/NativeFormatting.cpp
 SRCS+=		Support/Path.cpp
 SRCS+=		Support/PrettyStackTrace.cpp
@@ -54,6 +53,7 @@ SRCS+=		Support/ToolOutputFile.cpp
 SRCS+=		Support/Triple.cpp
 SRCS+=		Support/Twine.cpp
 SRCS+=		Support/Unicode.cpp
+SRCS+=		Support/VirtualFileSystem.cpp
 SRCS+=		Support/Watchdog.cpp
 SRCS+=		Support/WithColor.cpp
 SRCS+=		Support/circular_raw_ostream.cpp
diff --git a/usr.bin/clang/clang-tblgen/Makefile b/usr.bin/clang/clang-tblgen/Makefile
index b28e937c1f24..ce30af05ac5f 100644
--- a/usr.bin/clang/clang-tblgen/Makefile
+++ b/usr.bin/clang/clang-tblgen/Makefile
@@ -4,16 +4,21 @@ PROG_CXX=	clang-tblgen
 MAN=
 
 SRCDIR=		clang/utils/TableGen
+SRCS+=		ASTTableGen.cpp
 SRCS+=		ClangASTNodesEmitter.cpp
+SRCS+=		ClangASTPropertiesEmitter.cpp
 SRCS+=		ClangAttrEmitter.cpp
 SRCS+=		ClangCommentCommandInfoEmitter.cpp
 SRCS+=		ClangCommentHTMLNamedCharacterReferenceEmitter.cpp
 SRCS+=		ClangCommentHTMLTagsEmitter.cpp
 SRCS+=		ClangDataCollectorsEmitter.cpp
 SRCS+=		ClangDiagnosticsEmitter.cpp
+SRCS+=		ClangOpcodesEmitter.cpp
 SRCS+=		ClangOpenCLBuiltinEmitter.cpp
 SRCS+=		ClangOptionDocEmitter.cpp
 SRCS+=		ClangSACheckersEmitter.cpp
+SRCS+=		ClangTypeNodesEmitter.cpp
+SRCS+=		MveEmitter.cpp
 SRCS+=		NeonEmitter.cpp
 SRCS+=		TableGen.cpp
 
diff --git a/usr.bin/clang/lldb-tblgen/Makefile b/usr.bin/clang/lldb-tblgen/Makefile
index 5f83ac635310..7a5ea077b293 100644
--- a/usr.bin/clang/lldb-tblgen/Makefile
+++ b/usr.bin/clang/lldb-tblgen/Makefile
@@ -5,6 +5,8 @@ MAN=
 
 SRCDIR=		lldb/utils/TableGen
 SRCS+=		LLDBOptionDefEmitter.cpp
+SRCS+=		LLDBPropertyDefEmitter.cpp
 SRCS+=		LLDBTableGen.cpp
+SRCS+=		LLDBTableGenUtils.cpp
 
 .include "../llvm.prog.mk"
diff --git a/usr.bin/clang/llvm-tblgen/Makefile b/usr.bin/clang/llvm-tblgen/Makefile
index a3be4c4b2ff1..87fa4c2014ef 100644
--- a/usr.bin/clang/llvm-tblgen/Makefile
+++ b/usr.bin/clang/llvm-tblgen/Makefile
@@ -22,17 +22,29 @@ SRCS+=		DAGISelMatcher.cpp
 SRCS+=		DAGISelMatcherEmitter.cpp
 SRCS+=		DAGISelMatcherGen.cpp
 SRCS+=		DAGISelMatcherOpt.cpp
+SRCS+=		DFAEmitter.cpp
 SRCS+=		DFAPacketizerEmitter.cpp
 SRCS+=		DisassemblerEmitter.cpp
 SRCS+=		ExegesisEmitter.cpp
 SRCS+=		FastISelEmitter.cpp
 SRCS+=		FixedLenDecoderEmitter.cpp
+SRCS+=		GICombinerEmitter.cpp
+SRCS+=		GlobalISel/CodeExpander.cpp
+SRCS+=		GlobalISel/GIMatchDag.cpp
+SRCS+=		GlobalISel/GIMatchDagEdge.cpp
+SRCS+=		GlobalISel/GIMatchDagInstr.cpp
+SRCS+=		GlobalISel/GIMatchDagOperands.cpp
+SRCS+=		GlobalISel/GIMatchDagPredicate.cpp
+SRCS+=		GlobalISel/GIMatchDagPredicateDependencyEdge.cpp
+SRCS+=		GlobalISel/GIMatchTree.cpp
 SRCS+=		GlobalISelEmitter.cpp
 SRCS+=		InfoByHwMode.cpp
 SRCS+=		InstrDocsEmitter.cpp
 SRCS+=		InstrInfoEmitter.cpp
 SRCS+=		IntrinsicEmitter.cpp
+SRCS+=		OptEmitter.cpp
 SRCS+=		OptParserEmitter.cpp
+SRCS+=		OptRSTEmitter.cpp
 SRCS+=		PredicateExpander.cpp
 SRCS+=		PseudoLoweringEmitter.cpp
 SRCS+=		RISCVCompressInstEmitter.cpp