22 files changed, 139 insertions, 26 deletions

diff --git a/lib/clang/Makefile b/lib/clang/Makefile
index f4a96bbee5c3b..e31969d0cdd53 100644
--- a/lib/clang/Makefile
+++ b/lib/clang/Makefile
@@ -112,6 +112,7 @@ SUBDIR+=liblldb \
 	liblldbExpression \
 	liblldbHostCommon \
 	liblldbHostFreeBSD \
+	liblldbHostPOSIX \
 	liblldbInterpreter \
 	liblldbSymbol \
 	liblldbTarget \
@@ -123,8 +124,11 @@ SUBDIR+=liblldb \
 	liblldbPluginDynamicLoaderStatic \
 	liblldbPluginDynamicLoaderPosixDYLD \
 	liblldbPluginInstructionARM \
+	liblldbPluginInstructionARM64 \
+	liblldbPluginJITLoaderGDB \
 	liblldbPluginObjectContainerBSDArchive \
 	liblldbPluginObjectFileELF \
+	liblldbPluginObjectFileJIT \
 	liblldbPluginPlatformFreeBSD \
 	liblldbPluginPlatformGDB \
 	liblldbPluginProcessElfCore \
diff --git a/lib/clang/liblldb/Makefile b/lib/clang/liblldb/Makefile
index cba14e75632f0..1306cdf9c5675 100644
--- a/lib/clang/liblldb/Makefile
+++ b/lib/clang/liblldb/Makefile
@@ -10,7 +10,9 @@ SRCDIR=	tools/lldb/source
 SRCS=	lldb.cpp \
 	lldb-log.cpp
 
-TGHDRS=	DiagnosticCommonKinds \
+TGHDRS=	AttrList \
+	Attrs \
+	DiagnosticCommonKinds \
 	DeclNodes \
 	StmtNodes \
 	CommentCommandList
diff --git a/lib/clang/liblldbAPI/Makefile b/lib/clang/liblldbAPI/Makefile
index d041d092182b5..d05473d34d527 100644
--- a/lib/clang/liblldbAPI/Makefile
+++ b/lib/clang/liblldbAPI/Makefile
@@ -46,16 +46,20 @@ SRCS=	SBAddress.cpp \
 	SBThread.cpp \
 	SBType.cpp \
 	SBTypeCategory.cpp \
+	SBTypeEnumMember.cpp \
 	SBTypeFilter.cpp \
 	SBTypeFormat.cpp \
 	SBTypeNameSpecifier.cpp \
 	SBTypeSummary.cpp \
 	SBTypeSynthetic.cpp \
+	SBUnixSignals.cpp \
 	SBValue.cpp \
 	SBValueList.cpp \
 	SBWatchpoint.cpp
 
-TGHDRS=	DiagnosticCommonKinds \
+TGHDRS=	AttrList \
+	Attrs \
+	DiagnosticCommonKinds \
 	DeclNodes \
 	StmtNodes \
 	CommentCommandList
diff --git a/lib/clang/liblldbBreakpoint/Makefile b/lib/clang/liblldbBreakpoint/Makefile
index 396b0aa6103d6..b6885d83484e8 100644
--- a/lib/clang/liblldbBreakpoint/Makefile
+++ b/lib/clang/liblldbBreakpoint/Makefile
@@ -27,7 +27,9 @@ SRCS=	Breakpoint.cpp \
 	WatchpointList.cpp \
 	WatchpointOptions.cpp
 
-TGHDRS=	DiagnosticCommonKinds \
+TGHDRS=	AttrList \
+	Attrs \
+	DiagnosticCommonKinds \
 	DeclNodes \
 	StmtNodes \
 	CommentCommandList
diff --git a/lib/clang/liblldbCommands/Makefile b/lib/clang/liblldbCommands/Makefile
index f7baf8397a28e..833c8a8379ed2 100644
--- a/lib/clang/liblldbCommands/Makefile
+++ b/lib/clang/liblldbCommands/Makefile
@@ -34,7 +34,9 @@ SRCS=	CommandCompletions.cpp \
 	CommandObjectWatchpoint.cpp \
 	CommandObjectWatchpointCommand.cpp
 
-TGHDRS=	DiagnosticCommonKinds \
+TGHDRS=	AttrList \
+	Attrs \
+	DiagnosticCommonKinds \
 	DeclNodes \
 	StmtNodes \
 	CommentCommandList
diff --git a/lib/clang/liblldbCore/Makefile b/lib/clang/liblldbCore/Makefile
index e0335f4e3a9af..2588285e3f300 100644
--- a/lib/clang/liblldbCore/Makefile
+++ b/lib/clang/liblldbCore/Makefile
@@ -29,6 +29,7 @@ SRCS=	Address.cpp \
 	EmulateInstruction.cpp \
 	Error.cpp \
 	Event.cpp \
+	FastDemangle.cpp \
 	FileLineResolver.cpp \
 	FileSpecList.cpp \
 	History.cpp \
@@ -56,6 +57,7 @@ SRCS=	Address.cpp \
 	StreamGDBRemote.cpp \
 	StreamString.cpp \
 	StringList.cpp \
+	StructuredData.cpp \
 	Timer.cpp \
 	UserID.cpp \
 	UserSettingsController.cpp \
@@ -75,7 +77,9 @@ SRCS=	Address.cpp \
 	ValueObjectVariable.cpp \
 	VMRange.cpp
 
-TGHDRS=	DiagnosticCommonKinds \
+TGHDRS=	AttrList \
+	Attrs \
+	DiagnosticCommonKinds \
 	DeclNodes \
 	StmtNodes \
 	CommentCommandList
diff --git a/lib/clang/liblldbDataFormatters/Makefile b/lib/clang/liblldbDataFormatters/Makefile
index b224215ba90ad..d6ad87dd28bfe 100644
--- a/lib/clang/liblldbDataFormatters/Makefile
+++ b/lib/clang/liblldbDataFormatters/Makefile
@@ -27,7 +27,9 @@ SRCS=	CF.cpp \
 	TypeSynthetic.cpp \
 	ValueObjectPrinter.cpp
 
-TGHDRS=	DiagnosticCommonKinds \
+TGHDRS=	AttrList \
+	Attrs \
+	DiagnosticCommonKinds \
 	DeclNodes \
 	StmtNodes \
 	CommentCommandList
diff --git a/lib/clang/liblldbHostCommon/Makefile b/lib/clang/liblldbHostCommon/Makefile
index f2022bbf11036..3d17b3dd9f70b 100644
--- a/lib/clang/liblldbHostCommon/Makefile
+++ b/lib/clang/liblldbHostCommon/Makefile
@@ -6,20 +6,26 @@ LIB=	lldbHostCommon
 
 SRCDIR=	tools/lldb/source/Host/common
 SRCS=	Condition.cpp \
-	DynamicLibrary.cpp \
 	Editline.cpp \
 	File.cpp \
 	FileSpec.cpp \
 	Host.cpp \
+	HostInfoBase.cpp \
+	IOObject.cpp \
 	Mutex.cpp \
 	OptionParser.cpp \
+	Pipe.cpp \
 	ProcessRunLock.cpp \
+	Socket.cpp \
 	SocketAddress.cpp \
+	SoftwareBreakpoint.cpp \
 	Symbols.cpp \
 	Terminal.cpp \
 	TimeValue.cpp
 
-TGHDRS=	DiagnosticCommonKinds \
+TGHDRS=	AttrList \
+	Attrs \
+	DiagnosticCommonKinds \
 	DeclNodes \
 	StmtNodes \
 	CommentCommandList
diff --git a/lib/clang/liblldbHostFreeBSD/Makefile b/lib/clang/liblldbHostFreeBSD/Makefile
index e07f8ed791f48..bfabe0d6bd2c7 100644
--- a/lib/clang/liblldbHostFreeBSD/Makefile
+++ b/lib/clang/liblldbHostFreeBSD/Makefile
@@ -5,7 +5,8 @@
 LIB=	lldbHostFreeBSD
 
 SRCDIR=	tools/lldb/source/Host/freebsd
-SRCS=	Host.cpp
+SRCS=	Host.cpp \
+	HostInfoFreeBSD.cpp
 
 TGHDRS=	DiagnosticCommonKinds \
 	DeclNodes \
diff --git a/lib/clang/liblldbHostPOSIX/Makefile b/lib/clang/liblldbHostPOSIX/Makefile
new file mode 100644
index 0000000000000..38c879e8fa758
--- /dev/null
+++ b/lib/clang/liblldbHostPOSIX/Makefile
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+LIB=	lldbHostPOSIX
+
+SRCDIR=	tools/lldb/source/Host/posix
+SRCS=	FileSystem.cpp \
+	HostInfoPosix.cpp \
+	HostProcessPosix.cpp
+
+.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbInterpreter/Makefile b/lib/clang/liblldbInterpreter/Makefile
index c560adfe196ad..0cd78e4c83637 100644
--- a/lib/clang/liblldbInterpreter/Makefile
+++ b/lib/clang/liblldbInterpreter/Makefile
@@ -11,6 +11,7 @@ SRCS=	Args.cpp \
 	CommandObject.cpp \
 	CommandObjectRegexCommand.cpp \
 	CommandObjectScript.cpp \
+	CommandOptionValidators.cpp \
 	CommandReturnObject.cpp \
 	OptionGroupArchitecture.cpp \
 	OptionGroupBoolean.cpp \
@@ -48,7 +49,9 @@ SRCS=	Args.cpp \
 	ScriptInterpreterNone.cpp \
 	ScriptInterpreterPython.cpp
 
-TGHDRS=	DiagnosticCommonKinds \
+TGHDRS=	AttrList \
+	Attrs \
+	DiagnosticCommonKinds \
 	DeclNodes \
 	StmtNodes \
 	CommentCommandList
diff --git a/lib/clang/liblldbPluginInstructionARM64/Makefile b/lib/clang/liblldbPluginInstructionARM64/Makefile
new file mode 100644
index 0000000000000..92d976e3dca4d
--- /dev/null
+++ b/lib/clang/liblldbPluginInstructionARM64/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+LIB=	lldbPluginInstructionARM64
+
+SRCDIR=	tools/lldb/source/Plugins/Instruction/ARM64
+SRCS=	EmulateInstructionARM64.cpp
+
+.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbPluginJITLoaderGDB/Makefile b/lib/clang/liblldbPluginJITLoaderGDB/Makefile
new file mode 100644
index 0000000000000..80e84dfbb270f
--- /dev/null
+++ b/lib/clang/liblldbPluginJITLoaderGDB/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+LIB=	lldbPluginJITLoaderGDB
+
+SRCDIR=	tools/lldb/source/Plugins/JITLoader/GDB
+SRCS=	JITLoaderGDB.cpp
+
+TGHDRS=	DiagnosticCommonKinds \
+	DeclNodes \
+	StmtNodes \
+	CommentCommandList
+
+.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbPluginObjectFileJIT/Makefile b/lib/clang/liblldbPluginObjectFileJIT/Makefile
new file mode 100644
index 0000000000000..264035017afaf
--- /dev/null
+++ b/lib/clang/liblldbPluginObjectFileJIT/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+LIB=	lldbPluginObjectFileJIT
+
+SRCDIR=	tools/lldb/source/Plugins/ObjectFile/JIT
+SRCS=	ObjectFileJIT.cpp
+
+TGHDRS=	AttrList \
+	Attrs \
+	DiagnosticCommonKinds \
+	DeclNodes \
+	StmtNodes \
+	CommentCommandList
+
+.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbPluginPlatformFreeBSD/Makefile b/lib/clang/liblldbPluginPlatformFreeBSD/Makefile
index 9be7af37b9b2f..c2eee8abf40cb 100644
--- a/lib/clang/liblldbPluginPlatformFreeBSD/Makefile
+++ b/lib/clang/liblldbPluginPlatformFreeBSD/Makefile
@@ -7,7 +7,9 @@ LIB=	lldbPluginPlatformFreeBSD
 SRCDIR=	tools/lldb/source/Plugins/Platform/FreeBSD
 SRCS=	PlatformFreeBSD.cpp
 
-TGHDRS=	DiagnosticCommonKinds \
+TGHDRS=	AttrList \
+	Attrs \
+	DiagnosticCommonKinds \
 	DeclNodes \
 	StmtNodes \
 	CommentCommandList
diff --git a/lib/clang/liblldbPluginPlatformGDB/Makefile b/lib/clang/liblldbPluginPlatformGDB/Makefile
index 1d8a994984119..714a311bac54e 100644
--- a/lib/clang/liblldbPluginPlatformGDB/Makefile
+++ b/lib/clang/liblldbPluginPlatformGDB/Makefile
@@ -7,7 +7,9 @@ LIB=	lldbPluginPlatformGDB
 SRCDIR=	tools/lldb/source/Plugins/Platform/gdb-server
 SRCS=	PlatformRemoteGDBServer.cpp
 
-TGHDRS=	DiagnosticCommonKinds \
+TGHDRS=	AttrList \
+	Attrs \
+	DiagnosticCommonKinds \
 	DeclNodes \
 	StmtNodes \
 	CommentCommandList
diff --git a/lib/clang/liblldbPluginProcessGDBRemote/Makefile b/lib/clang/liblldbPluginProcessGDBRemote/Makefile
index c76fe8a2a4d28..5bbb40fc96c88 100644
--- a/lib/clang/liblldbPluginProcessGDBRemote/Makefile
+++ b/lib/clang/liblldbPluginProcessGDBRemote/Makefile
@@ -13,7 +13,9 @@ SRCS=	GDBRemoteCommunication.cpp \
 	ProcessGDBRemoteLog.cpp \
 	ThreadGDBRemote.cpp
 
-TGHDRS=	DiagnosticCommonKinds \
+TGHDRS=	AttrList \
+	Attrs \
+	DiagnosticCommonKinds \
 	DeclNodes \
 	StmtNodes \
 	CommentCommandList
diff --git a/lib/clang/liblldbPluginProcessPOSIX/Makefile b/lib/clang/liblldbPluginProcessPOSIX/Makefile
index f681fd343260c..ecd3d049a28d5 100644
--- a/lib/clang/liblldbPluginProcessPOSIX/Makefile
+++ b/lib/clang/liblldbPluginProcessPOSIX/Makefile
@@ -15,17 +15,13 @@ SRCS=	POSIXStopInfo.cpp \
 	ProcessMessage.cpp \
 	ProcessPOSIX.cpp \
 	ProcessPOSIXLog.cpp \
-	RegisterContextFreeBSD_i386.cpp \
-	RegisterContextFreeBSD_mips64.cpp \
-	RegisterContextFreeBSD_x86_64.cpp \
-	RegisterContextLinux_i386.cpp \
-	RegisterContextLinux_x86_64.cpp \
+	RegisterContextPOSIXProcessMonitor_arm64.cpp \
 	RegisterContextPOSIXProcessMonitor_mips64.cpp \
-	RegisterContextPOSIXProcessMonitor_x86.cpp \
-	RegisterContextPOSIX_mips64.cpp \
-	RegisterContextPOSIX_x86.cpp
+	RegisterContextPOSIXProcessMonitor_x86.cpp
 
-TGHDRS=	DiagnosticCommonKinds \
+TGHDRS=	AttrList \
+	Attrs \
+	DiagnosticCommonKinds \
 	DeclNodes \
 	StmtNodes \
 	CommentCommandList
diff --git a/lib/clang/liblldbPluginProcessUtility/Makefile b/lib/clang/liblldbPluginProcessUtility/Makefile
index 1459254681704..1828ed7a99b62 100644
--- a/lib/clang/liblldbPluginProcessUtility/Makefile
+++ b/lib/clang/liblldbPluginProcessUtility/Makefile
@@ -6,27 +6,41 @@ LIB=	lldbPluginProcessUtility
 
 SRCDIR=	tools/lldb/source/Plugins/Process/Utility
 SRCS=	DynamicRegisterInfo.cpp \
+	FreeBSDSignals.cpp \
 	HistoryThread.cpp \
 	HistoryUnwind.cpp \
 	InferiorCallPOSIX.cpp \
+	LinuxSignals.cpp \
 	RegisterContextDarwin_arm.cpp \
+	RegisterContextDarwin_arm64.cpp \
 	RegisterContextDarwin_i386.cpp \
 	RegisterContextDarwin_x86_64.cpp \
 	RegisterContextDummy.cpp \
+	RegisterContextFreeBSD_i386.cpp \
+	RegisterContextFreeBSD_mips64.cpp \
+	RegisterContextFreeBSD_x86_64.cpp \
 	RegisterContextHistory.cpp \
+	RegisterContextLinux_arm64.cpp \
+	RegisterContextLinux_i386.cpp \
+	RegisterContextLinux_x86_64.cpp \
 	RegisterContextLLDB.cpp \
 	RegisterContextMach_arm.cpp \
 	RegisterContextMach_i386.cpp \
 	RegisterContextMach_x86_64.cpp \
 	RegisterContextMacOSXFrameBackchain.cpp \
 	RegisterContextMemory.cpp \
+	RegisterContextPOSIX_arm64.cpp \
+	RegisterContextPOSIX_mips64.cpp \
+	RegisterContextPOSIX_x86.cpp \
 	RegisterContextThreadMemory.cpp \
 	StopInfoMachException.cpp \
 	ThreadMemory.cpp \
 	UnwindLLDB.cpp \
 	UnwindMacOSXFrameBackchain.cpp
 
-TGHDRS=	DiagnosticCommonKinds \
+TGHDRS=	AttrList \
+	Attrs \
+	DiagnosticCommonKinds \
 	DeclNodes \
 	StmtNodes \
 	CommentCommandList
diff --git a/lib/clang/liblldbPluginSymbolFileDWARF/Makefile b/lib/clang/liblldbPluginSymbolFileDWARF/Makefile
index ac23199b67ce2..5b8dbfd574359 100644
--- a/lib/clang/liblldbPluginSymbolFileDWARF/Makefile
+++ b/lib/clang/liblldbPluginSymbolFileDWARF/Makefile
@@ -31,7 +31,9 @@ SRCS=	DWARFAbbreviationDeclaration.cpp \
 	SymbolFileDWARFDebugMap.cpp \
 	UniqueDWARFASTType.cpp
 
-TGHDRS=	DiagnosticCommonKinds \
+TGHDRS=	AttrList \
+	Attrs \
+	DiagnosticCommonKinds \
 	DeclNodes \
 	StmtNodes \
 	CommentCommandList \
diff --git a/lib/clang/liblldbTarget/Makefile b/lib/clang/liblldbTarget/Makefile
index 2e0226d597540..a8fb45729eef5 100644
--- a/lib/clang/liblldbTarget/Makefile
+++ b/lib/clang/liblldbTarget/Makefile
@@ -10,13 +10,20 @@ SRCDIR=	tools/lldb/source/Target
 SRCS=	ABI.cpp \
 	CPPLanguageRuntime.cpp \
 	ExecutionContext.cpp \
+	FileAction.cpp \
+	JITLoader.cpp \
+	JITLoaderList.cpp \
 	LanguageRuntime.cpp \
 	Memory.cpp \
+	NativeRegisterContext.cpp \
+	NativeRegisterContextRegisterInfo.cpp \
 	ObjCLanguageRuntime.cpp \
 	OperatingSystem.cpp \
 	PathMappingList.cpp \
 	Platform.cpp \
 	Process.cpp \
+	ProcessInfo.cpp \
+	ProcessLaunchInfo.cpp \
 	Queue.cpp \
 	QueueItem.cpp \
 	QueueList.cpp \
@@ -51,7 +58,9 @@ SRCS=	ABI.cpp \
 	UnixSignals.cpp \
 	UnwindAssembly.cpp
 
-TGHDRS=	DiagnosticCommonKinds \
+TGHDRS=	AttrList \
+	Attrs \
+	DiagnosticCommonKinds \
 	DeclNodes \
 	StmtNodes \
 	CommentCommandList
diff --git a/lib/clang/liblldbUtility/Makefile b/lib/clang/liblldbUtility/Makefile
index e5723b2fdad9f..c08e384b5b5b2 100644
--- a/lib/clang/liblldbUtility/Makefile
+++ b/lib/clang/liblldbUtility/Makefile
@@ -5,13 +5,15 @@
 LIB=	lldbUtility
 
 SRCDIR=	tools/lldb/source/Utility
-SRCS=	ARM_DWARF_Registers.cpp \
+SRCS=	ARM64_DWARF_Registers.cpp \
+	ARM_DWARF_Registers.cpp \
 	KQueue.cpp \
 	PseudoTerminal.cpp \
 	Range.cpp \
 	SharingPtr.cpp \
 	StringExtractor.cpp \
 	StringExtractorGDBRemote.cpp \
+	StringLexer.cpp \
 	TimeSpecTimeout.cpp
 
 .include "../lldb.lib.mk"