diff --git a/lib/clang/libllvm/Makefile b/lib/clang/libllvm/Makefile
index 642b9fa799fc..c64123bb8d97 100644
--- a/lib/clang/libllvm/Makefile
+++ b/lib/clang/libllvm/Makefile
@@ -564,6 +564,14 @@ SRCS_XDB+=	ExecutionEngine/GDBRegistrationListener.cpp
 SRCS_XDB+=	ExecutionEngine/Interpreter/Execution.cpp
 SRCS_XDB+=	ExecutionEngine/Interpreter/ExternalFunctions.cpp
 SRCS_XDB+=	ExecutionEngine/Interpreter/Interpreter.cpp
+SRCS_EXT+=	ExecutionEngine/JITLink/EHFrameSupport.cpp
+SRCS_EXT+=	ExecutionEngine/JITLink/JITLink.cpp
+SRCS_EXT+=	ExecutionEngine/JITLink/JITLinkGeneric.cpp
+SRCS_EXT+=	ExecutionEngine/JITLink/JITLinkMemoryManager.cpp
+SRCS_EXT+=	ExecutionEngine/JITLink/MachO.cpp
+SRCS_EXT+=	ExecutionEngine/JITLink/MachOLinkGraphBuilder.cpp
+SRCS_EXT+=	ExecutionEngine/JITLink/MachO_arm64.cpp
+SRCS_EXT+=	ExecutionEngine/JITLink/MachO_x86_64.cpp
 SRCS_XDB+=	ExecutionEngine/MCJIT/MCJIT.cpp
 SRCS_EXT+=	ExecutionEngine/Orc/CompileOnDemandLayer.cpp
 SRCS_EXT+=	ExecutionEngine/Orc/CompileUtils.cpp
@@ -578,11 +586,16 @@ SRCS_EXT+=	ExecutionEngine/Orc/Layer.cpp
 SRCS_EXT+=	ExecutionEngine/Orc/LazyReexports.cpp
 SRCS_EXT+=	ExecutionEngine/Orc/Legacy.cpp
 SRCS_EXT+=	ExecutionEngine/Orc/NullResolver.cpp
+SRCS_EXT+=	ExecutionEngine/Orc/ObjectLinkingLayer.cpp
+SRCS_EXT+=	ExecutionEngine/Orc/ObjectTransformLayer.cpp
 SRCS_EXT+=	ExecutionEngine/Orc/OrcABISupport.cpp
 SRCS_EXT+=	ExecutionEngine/Orc/OrcCBindings.cpp
 SRCS_EXT+=	ExecutionEngine/Orc/OrcMCJITReplacement.cpp
 SRCS_EXT+=	ExecutionEngine/Orc/RTDyldObjectLinkingLayer.cpp
+SRCS_EXT+=	ExecutionEngine/Orc/Speculation.cpp
 SRCS_EXT+=	ExecutionEngine/Orc/ThreadSafeModule.cpp
+SRCS_EXT+=	ExecutionEngine/OrcError/OrcError.cpp
+SRCS_EXT+=	ExecutionEngine/OrcError/RPCError.cpp
 SRCS_XDB+=	ExecutionEngine/RuntimeDyld/JITSymbol.cpp
 SRCS_XDB+=	ExecutionEngine/RuntimeDyld/RTDyldMemoryManager.cpp
 SRCS_XDB+=	ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
@@ -733,6 +746,7 @@ SRCS_MIN+=	MC/SubtargetFeature.cpp
 SRCS_MIN+=	MC/WasmObjectWriter.cpp
 SRCS_MIN+=	MC/WinCOFFObjectWriter.cpp
 SRCS_MIN+=	MC/XCOFFObjectWriter.cpp
+SRCS_EXT+=	MCA/CodeEmitter.cpp
 SRCS_EXT+=	MCA/Context.cpp
 SRCS_EXT+=	MCA/HWEventListener.cpp
 SRCS_EXT+=	MCA/HardwareUnits/HardwareUnit.cpp
@@ -1506,6 +1520,7 @@ SRCS_MIN+=	Transforms/Utils/CloneModule.cpp
 SRCS_MIN+=	Transforms/Utils/CodeExtractor.cpp
 SRCS_MIN+=	Transforms/Utils/CodeMoverUtils.cpp
 SRCS_MIN+=	Transforms/Utils/CtorUtils.cpp
+SRCS_EXT+=	Transforms/Utils/Debugify.cpp
 SRCS_MIN+=	Transforms/Utils/DemoteRegToStack.cpp
 SRCS_MIN+=	Transforms/Utils/EntryExitInstrumenter.cpp
 SRCS_MIN+=	Transforms/Utils/EscapeEnumerator.cpp
diff --git a/usr.bin/clang/llvm-objcopy/Makefile b/usr.bin/clang/llvm-objcopy/Makefile
index 7218fd8ae3fe..b7507ad7bbaa 100644
--- a/usr.bin/clang/llvm-objcopy/Makefile
+++ b/usr.bin/clang/llvm-objcopy/Makefile
@@ -10,8 +10,10 @@ SRCS+=		COFF/Object.cpp
 SRCS+=		COFF/Reader.cpp
 SRCS+=		COFF/Writer.cpp
 SRCS+=		CopyConfig.cpp
+SRCS+=		ELF/ELFConfig.cpp
 SRCS+=		ELF/ELFObjcopy.cpp
 SRCS+=		ELF/Object.cpp
+SRCS+=		MachO/MachOLayoutBuilder.cpp
 SRCS+=		MachO/MachOObjcopy.cpp
 SRCS+=		MachO/MachOReader.cpp
 SRCS+=		MachO/MachOWriter.cpp
@@ -25,11 +27,11 @@ CFLAGS+=	-I${LLVM_BASE}/${SRCDIR}
 
 .include "${SRCTOP}/lib/clang/llvm.build.mk"
 
-.for hdr in ObjcopyOpts StripOpts
+.for hdr in InstallNameToolOpts ObjcopyOpts StripOpts
 ${hdr}.inc: ${LLVM_BASE}/${SRCDIR}/${hdr}.td
 	${LLVM_TBLGEN} -gen-opt-parser-defs \
-	    -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} \
-	    ${LLVM_BASE}/${SRCDIR}/${hdr}.td
+	    -I ${LLVM_SRCS}/tools/llvm-objcopy -I ${LLVM_SRCS}/include \
+	    -d ${.TARGET}.d -o ${.TARGET} ${LLVM_BASE}/${SRCDIR}/${hdr}.td
 TGHDRS+=	${hdr}.inc
 .endfor
 
diff --git a/usr.bin/clang/llvm-pdbutil/Makefile b/usr.bin/clang/llvm-pdbutil/Makefile
index 5476361e48c1..ddbfe18ee5ea 100644
--- a/usr.bin/clang/llvm-pdbutil/Makefile
+++ b/usr.bin/clang/llvm-pdbutil/Makefile
@@ -27,4 +27,6 @@ SRCS+=		TypeReferenceTracker.cpp
 SRCS+=		YAMLOutputStyle.cpp
 SRCS+=		llvm-pdbutil.cpp
 
+LIBADD+=	z
+
 .include "../llvm.prog.mk"
diff --git a/usr.bin/clang/opt/Makefile b/usr.bin/clang/opt/Makefile
index b15590fc4cd5..786d152ed804 100644
--- a/usr.bin/clang/opt/Makefile
+++ b/usr.bin/clang/opt/Makefile
@@ -5,7 +5,6 @@ PROG_CXX=	opt
 SRCDIR=		llvm/tools/opt
 SRCS+=		AnalysisWrappers.cpp
 SRCS+=		BreakpointPrinter.cpp
-SRCS+=		Debugify.cpp
 SRCS+=		GraphPrinters.cpp
 SRCS+=		NewPMDriver.cpp
 SRCS+=		PassPrinters.cpp