diff --git a/Makefile.inc1 b/Makefile.inc1
index 52af7f143520..982c9814607a 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -2182,6 +2182,10 @@ _clang_tblgen= \
 	lib/clang/libllvmminimal \
 	usr.bin/clang/llvm-tblgen \
 	usr.bin/clang/clang-tblgen
+.if ${MK_LLDB} != "no"
+_clang_tblgen+=	\
+	usr.bin/clang/lldb-tblgen
+.endif
 
 ${_bt}-usr.bin/clang/clang-tblgen: ${_bt}-lib/clang/libllvmminimal
 ${_bt}-usr.bin/clang/llvm-tblgen: ${_bt}-lib/clang/libllvmminimal
diff --git a/lib/clang/liblldb/Makefile b/lib/clang/liblldb/Makefile
index be2306f4519e..a85f4cf2bde5 100644
--- a/lib/clang/liblldb/Makefile
+++ b/lib/clang/liblldb/Makefile
@@ -12,6 +12,7 @@ CFLAGS+=	-I${LLDB_SRCS}/source/Plugins/Process/POSIX
 CFLAGS+=	-I${LLDB_SRCS}/source/Plugins/Process/Utility
 CFLAGS+=	-I${OBJTOP}/lib/clang/libllvm
 CFLAGS+=	-I${OBJTOP}/lib/clang/libclang
+CFLAGS+=	-I${OBJTOP}/lib/clang/liblldb
 CFLAGS+=	-DLLDB_DISABLE_PYTHON
 
 SRCS+=		API/SBAddress.cpp
@@ -19,10 +20,12 @@ SRCS+=		API/SBAttachInfo.cpp
 SRCS+=		API/SBBlock.cpp
 SRCS+=		API/SBBreakpoint.cpp
 SRCS+=		API/SBBreakpointLocation.cpp
+SRCS+=		API/SBBreakpointName.cpp
 SRCS+=		API/SBBreakpointOptionCommon.cpp
 SRCS+=		API/SBBroadcaster.cpp
 SRCS+=		API/SBCommandInterpreter.cpp
 SRCS+=		API/SBCommandReturnObject.cpp
+SRCS+=		API/SBCommunication.cpp
 SRCS+=		API/SBCompileUnit.cpp
 SRCS+=		API/SBData.cpp
 SRCS+=		API/SBDebugger.cpp
@@ -36,7 +39,6 @@ SRCS+=		API/SBFileSpecList.cpp
 SRCS+=		API/SBFrame.cpp
 SRCS+=		API/SBFunction.cpp
 SRCS+=		API/SBHostOS.cpp
-SRCS+=		API/SBInitializerOptions.cpp
 SRCS+=		API/SBInstruction.cpp
 SRCS+=		API/SBInstructionList.cpp
 SRCS+=		API/SBLanguageRuntime.cpp
@@ -52,6 +54,7 @@ SRCS+=		API/SBProcess.cpp
 SRCS+=		API/SBProcessInfo.cpp
 SRCS+=		API/SBQueue.cpp
 SRCS+=		API/SBQueueItem.cpp
+SRCS+=		API/SBReproducer.cpp
 SRCS+=		API/SBSection.cpp
 SRCS+=		API/SBSourceManager.cpp
 SRCS+=		API/SBStream.cpp
@@ -65,6 +68,7 @@ SRCS+=		API/SBThread.cpp
 SRCS+=		API/SBThreadCollection.cpp
 SRCS+=		API/SBThreadPlan.cpp
 SRCS+=		API/SBTrace.cpp
+SRCS+=		API/SBTraceOptions.cpp
 SRCS+=		API/SBType.cpp
 SRCS+=		API/SBTypeCategory.cpp
 SRCS+=		API/SBTypeEnumMember.cpp
@@ -72,6 +76,7 @@ SRCS+=		API/SBTypeFilter.cpp
 SRCS+=		API/SBTypeFormat.cpp
 SRCS+=		API/SBTypeNameSpecifier.cpp
 SRCS+=		API/SBTypeSummary.cpp
+SRCS+=		API/SBTypeSynthetic.cpp
 SRCS+=		API/SBUnixSignals.cpp
 SRCS+=		API/SBValue.cpp
 SRCS+=		API/SBValueList.cpp
@@ -194,10 +199,8 @@ SRCS+=		DataFormatters/VectorType.cpp
 SRCS+=		Expression/DWARFExpression.cpp
 SRCS+=		Expression/DiagnosticManager.cpp
 SRCS+=		Expression/Expression.cpp
-SRCS+=		Expression/ExpressionSourceCode.cpp
 SRCS+=		Expression/ExpressionVariable.cpp
 SRCS+=		Expression/FunctionCaller.cpp
-SRCS+=		Expression/IRDynamicChecks.cpp
 SRCS+=		Expression/IRExecutionUnit.cpp
 SRCS+=		Expression/IRInterpreter.cpp
 SRCS+=		Expression/IRMemoryMap.cpp
@@ -208,6 +211,7 @@ SRCS+=		Expression/UserExpression.cpp
 SRCS+=		Expression/UtilityFunction.cpp
 SRCS+=		Host/common/Editline.cpp
 SRCS+=		Host/common/File.cpp
+SRCS+=		Host/common/FileAction.cpp
 SRCS+=		Host/common/FileCache.cpp
 SRCS+=		Host/common/FileSystem.cpp
 SRCS+=		Host/common/Host.cpp
@@ -221,12 +225,12 @@ SRCS+=		Host/common/MonitoringProcessLauncher.cpp
 SRCS+=		Host/common/NativeWatchpointList.cpp
 SRCS+=		Host/common/OptionParser.cpp
 SRCS+=		Host/common/PipeBase.cpp
+SRCS+=		Host/common/ProcessLaunchInfo.cpp
 SRCS+=		Host/common/ProcessRunLock.cpp
 SRCS+=		Host/common/PseudoTerminal.cpp
 SRCS+=		Host/common/Socket.cpp
 SRCS+=		Host/common/SocketAddress.cpp
 SRCS+=		Host/common/StringConvert.cpp
-SRCS+=		Host/common/Symbols.cpp
 SRCS+=		Host/common/TCPSocket.cpp
 SRCS+=		Host/common/TaskPool.cpp
 SRCS+=		Host/common/Terminal.cpp
@@ -302,16 +306,17 @@ SRCS+=		Plugins/Architecture/Arm/ArchitectureArm.cpp
 SRCS+=		Plugins/Architecture/Mips/ArchitectureMips.cpp
 SRCS+=		Plugins/Architecture/PPC64/ArchitecturePPC64.cpp
 SRCS+=		Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp
-SRCS+=		Plugins/DynamicLoader/POSIX-DYLD/AuxVector.cpp
 SRCS+=		Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.cpp
 SRCS+=		Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp
 SRCS+=		Plugins/DynamicLoader/Static/DynamicLoaderStatic.cpp
 SRCS+=		Plugins/ExpressionParser/Clang/ASTDumper.cpp
 SRCS+=		Plugins/ExpressionParser/Clang/ASTResultSynthesizer.cpp
 SRCS+=		Plugins/ExpressionParser/Clang/ASTStructExtractor.cpp
+SRCS+=		Plugins/ExpressionParser/Clang/ASTUtils.cpp
 SRCS+=		Plugins/ExpressionParser/Clang/ClangASTSource.cpp
 SRCS+=		Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp
 SRCS+=		Plugins/ExpressionParser/Clang/ClangExpressionParser.cpp
+SRCS+=		Plugins/ExpressionParser/Clang/ClangExpressionSourceCode.cpp
 SRCS+=		Plugins/ExpressionParser/Clang/ClangExpressionVariable.cpp
 SRCS+=		Plugins/ExpressionParser/Clang/ClangFunctionCaller.cpp
 SRCS+=		Plugins/ExpressionParser/Clang/ClangHost.cpp
@@ -319,6 +324,7 @@ SRCS+=		Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cpp
 SRCS+=		Plugins/ExpressionParser/Clang/ClangPersistentVariables.cpp
 SRCS+=		Plugins/ExpressionParser/Clang/ClangUserExpression.cpp
 SRCS+=		Plugins/ExpressionParser/Clang/ClangUtilityFunction.cpp
+SRCS+=		Plugins/ExpressionParser/Clang/IRDynamicChecks.cpp
 SRCS+=		Plugins/ExpressionParser/Clang/IRForTarget.cpp
 SRCS+=		Plugins/Instruction/ARM/EmulateInstructionARM.cpp
 SRCS+=		Plugins/Instruction/ARM/EmulationStateARM.cpp
@@ -333,14 +339,22 @@ SRCS+=		Plugins/JITLoader/GDB/JITLoaderGDB.cpp
 SRCS+=		Plugins/Language/CPlusPlus/BlockPointer.cpp
 SRCS+=		Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp
 SRCS+=		Plugins/Language/CPlusPlus/CPlusPlusNameParser.cpp
+SRCS+=		Plugins/Language/CPlusPlus/CxxStringTypes.cpp
 SRCS+=		Plugins/Language/CPlusPlus/LibCxx.cpp
 SRCS+=		Plugins/Language/CPlusPlus/LibCxxAtomic.cpp
+SRCS+=		Plugins/Language/CPlusPlus/LibCxxBitset.cpp
 SRCS+=		Plugins/Language/CPlusPlus/LibCxxInitializerList.cpp
 SRCS+=		Plugins/Language/CPlusPlus/LibCxxList.cpp
 SRCS+=		Plugins/Language/CPlusPlus/LibCxxMap.cpp
+SRCS+=		Plugins/Language/CPlusPlus/LibCxxOptional.cpp
+SRCS+=		Plugins/Language/CPlusPlus/LibCxxQueue.cpp
+SRCS+=		Plugins/Language/CPlusPlus/LibCxxTuple.cpp
 SRCS+=		Plugins/Language/CPlusPlus/LibCxxUnorderedMap.cpp
+SRCS+=		Plugins/Language/CPlusPlus/LibCxxVariant.cpp
 SRCS+=		Plugins/Language/CPlusPlus/LibCxxVector.cpp
 SRCS+=		Plugins/Language/CPlusPlus/LibStdcpp.cpp
+SRCS+=		Plugins/Language/CPlusPlus/LibStdcppTuple.cpp
+SRCS+=		Plugins/Language/CPlusPlus/LibStdcppUniquePointer.cpp
 SRCS+=		Plugins/Language/CPlusPlus/MSVCUndecoratedNameParser.cpp
 SRCS+=		Plugins/Language/ClangCommon/ClangHighlighter.cpp
 SRCS+=		Plugins/Language/ObjC/CF.cpp
@@ -354,11 +368,14 @@ SRCS+=		Plugins/Language/ObjC/NSSet.cpp
 SRCS+=		Plugins/Language/ObjC/NSString.cpp
 SRCS+=		Plugins/Language/ObjC/ObjCLanguage.cpp
 SRCS+=		Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp
+SRCS+=		Plugins/LanguageRuntime/CPlusPlus/CPPLanguageRuntime.cpp
 SRCS+=		Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.cpp
 SRCS+=		Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTrampolineHandler.cpp
 SRCS+=		Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleThreadPlanStepThroughObjCTrampoline.cpp
+SRCS+=		Plugins/LanguageRuntime/ObjC/ObjCLanguageRuntime.cpp
 SRCS+=		Plugins/MemoryHistory/asan/MemoryHistoryASan.cpp
 SRCS+=		Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp
+SRCS+=		Plugins/ObjectFile/Breakpad/BreakpadRecords.cpp
 SRCS+=		Plugins/ObjectFile/Breakpad/ObjectFileBreakpad.cpp
 SRCS+=		Plugins/ObjectFile/ELF/ELFHeader.cpp
 SRCS+=		Plugins/ObjectFile/ELF/ObjectFileELF.cpp
@@ -378,6 +395,7 @@ SRCS+=		Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_x86.cpp
 SRCS+=		Plugins/Process/POSIX/CrashReason.cpp
 SRCS+=		Plugins/Process/POSIX/ProcessMessage.cpp
 SRCS+=		Plugins/Process/POSIX/ProcessPOSIXLog.cpp
+SRCS+=		Plugins/Process/Utility/AuxVector.cpp
 SRCS+=		Plugins/Process/Utility/DynamicRegisterInfo.cpp
 SRCS+=		Plugins/Process/Utility/FreeBSDSignals.cpp
 SRCS+=		Plugins/Process/Utility/GDBRemoteSignals.cpp
@@ -451,8 +469,8 @@ SRCS+=		Plugins/SymbolFile/DWARF/DWARFAbbreviationDeclaration.cpp
 SRCS+=		Plugins/SymbolFile/DWARF/DWARFAttribute.cpp
 SRCS+=		Plugins/SymbolFile/DWARF/DWARFBaseDIE.cpp
 SRCS+=		Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp
+SRCS+=		Plugins/SymbolFile/DWARF/DWARFContext.cpp
 SRCS+=		Plugins/SymbolFile/DWARF/DWARFDIE.cpp
-SRCS+=		Plugins/SymbolFile/DWARF/DWARFDIECollection.cpp
 SRCS+=		Plugins/SymbolFile/DWARF/DWARFDataExtractor.cpp
 SRCS+=		Plugins/SymbolFile/DWARF/DWARFDebugAbbrev.cpp
 SRCS+=		Plugins/SymbolFile/DWARF/DWARFDebugArangeSet.cpp
@@ -466,6 +484,7 @@ SRCS+=		Plugins/SymbolFile/DWARF/DWARFDeclContext.cpp
 SRCS+=		Plugins/SymbolFile/DWARF/DWARFDefines.cpp
 SRCS+=		Plugins/SymbolFile/DWARF/DWARFFormValue.cpp
 SRCS+=		Plugins/SymbolFile/DWARF/DWARFIndex.cpp
+SRCS+=		Plugins/SymbolFile/DWARF/DWARFTypeUnit.cpp
 SRCS+=		Plugins/SymbolFile/DWARF/DWARFUnit.cpp
 SRCS+=		Plugins/SymbolFile/DWARF/HashedNameToDIE.cpp
 SRCS+=		Plugins/SymbolFile/DWARF/LogChannelDWARF.cpp
@@ -494,14 +513,18 @@ SRCS+=		Symbol/CompileUnit.cpp
 SRCS+=		Symbol/CompilerDecl.cpp
 SRCS+=		Symbol/CompilerDeclContext.cpp
 SRCS+=		Symbol/CompilerType.cpp
+SRCS+=		Symbol/CxxModuleHandler.cpp
 SRCS+=		Symbol/DWARFCallFrameInfo.cpp
 SRCS+=		Symbol/DebugMacros.cpp
+SRCS+=		Symbol/DeclVendor.cpp
 SRCS+=		Symbol/Declaration.cpp
 SRCS+=		Symbol/FuncUnwinders.cpp
 SRCS+=		Symbol/Function.cpp
 SRCS+=		Symbol/LineEntry.cpp
 SRCS+=		Symbol/LineTable.cpp
+SRCS+=		Symbol/LocateSymbolFile.cpp
 SRCS+=		Symbol/ObjectFile.cpp
+SRCS+=		Symbol/PostfixExpression.cpp
 SRCS+=		Symbol/Symbol.cpp
 SRCS+=		Symbol/SymbolContext.cpp
 SRCS+=		Symbol/SymbolFile.cpp
@@ -516,9 +539,7 @@ SRCS+=		Symbol/UnwindTable.cpp
 SRCS+=		Symbol/Variable.cpp
 SRCS+=		Symbol/VariableList.cpp
 SRCS+=		Target/ABI.cpp
-SRCS+=		Target/CPPLanguageRuntime.cpp
 SRCS+=		Target/ExecutionContext.cpp
-SRCS+=		Target/FileAction.cpp
 SRCS+=		Target/InstrumentationRuntime.cpp
 SRCS+=		Target/InstrumentationRuntimeStopInfo.cpp
 SRCS+=		Target/JITLoader.cpp
@@ -528,18 +549,16 @@ SRCS+=		Target/LanguageRuntime.cpp
 SRCS+=		Target/Memory.cpp
 SRCS+=		Target/MemoryHistory.cpp
 SRCS+=		Target/ModuleCache.cpp
-SRCS+=		Target/ObjCLanguageRuntime.cpp
 SRCS+=		Target/OperatingSystem.cpp
 SRCS+=		Target/PathMappingList.cpp
 SRCS+=		Target/Platform.cpp
 SRCS+=		Target/Process.cpp
-SRCS+=		Target/ProcessInfo.cpp
-SRCS+=		Target/ProcessLaunchInfo.cpp
 SRCS+=		Target/Queue.cpp
 SRCS+=		Target/QueueItem.cpp
 SRCS+=		Target/QueueList.cpp
 SRCS+=		Target/RegisterContext.cpp
 SRCS+=		Target/RegisterNumber.cpp
+SRCS+=		Target/RemoteAwarePlatform.cpp
 SRCS+=		Target/SectionLoadHistory.cpp
 SRCS+=		Target/SectionLoadList.cpp
 SRCS+=		Target/StackFrame.cpp
@@ -586,6 +605,7 @@ SRCS+=		Utility/DataEncoder.cpp
 SRCS+=		Utility/DataExtractor.cpp
 SRCS+=		Utility/Environment.cpp
 SRCS+=		Utility/Event.cpp
+SRCS+=		Utility/FileCollector.cpp
 SRCS+=		Utility/FileSpec.cpp
 SRCS+=		Utility/IOObject.cpp
 SRCS+=		Utility/JSON.cpp
@@ -594,9 +614,11 @@ SRCS+=		Utility/Listener.cpp
 SRCS+=		Utility/Log.cpp
 SRCS+=		Utility/Logging.cpp
 SRCS+=		Utility/NameMatches.cpp
+SRCS+=		Utility/ProcessInfo.cpp
 SRCS+=		Utility/RegisterValue.cpp
 SRCS+=		Utility/RegularExpression.cpp
 SRCS+=		Utility/Reproducer.cpp
+SRCS+=		Utility/ReproducerInstrumentation.cpp
 SRCS+=		Utility/Scalar.cpp
 SRCS+=		Utility/SelectHelper.cpp
 SRCS+=		Utility/SharingPtr.cpp
@@ -616,10 +638,23 @@ SRCS+=		Utility/Timer.cpp
 SRCS+=		Utility/UUID.cpp
 SRCS+=		Utility/UriParser.cpp
 SRCS+=		Utility/UserID.cpp
+SRCS+=		Utility/UserIDResolver.cpp
 SRCS+=		Utility/VASprintf.cpp
 SRCS+=		Utility/VMRange.cpp
 SRCS+=		lldb.cpp
 
+LLDB_TBLGEN?=	lldb-tblgen
+INCFILE=	CommandOptions.inc
+TDFILE=		${LLDB_SRCS}/source/Commands/Options.td
+GENOPT=		-gen-lldb-option-defs
+${INCFILE}: ${TDFILE}
+	${LLDB_TBLGEN} ${GENOPT} -I ${LLDB_SRCS}/source/Commands \
+	    -d ${.TARGET:C/$/.d/} -o ${.TARGET} ${TDFILE}
+TGHDRS+=	${INCFILE}
+
+DPSRCS+=	${TGHDRS}
+CLEANFILES+=	${TGHDRS} ${TGHDRS:C/$/.d/}
+
 .include "../clang.build.mk"
 
 INTERNALLIB=
diff --git a/usr.bin/clang/lldb/Makefile b/usr.bin/clang/lldb/Makefile
index f3f0b14a56fe..f5f6f54b93b8 100644
--- a/usr.bin/clang/lldb/Makefile
+++ b/usr.bin/clang/lldb/Makefile
@@ -37,6 +37,7 @@ DPSRCS+=	${TGHDRS}
 CLEANFILES+=	${TGHDRS} ${TGHDRS:C/$/.d/}
 
 LIBADD+=	edit
+LIBADD+=	execinfo
 LIBADD+=	panel
 LIBADD+=	ncursesw
 LIBADD+=	pthread