Update build infrastructure for LLDB 3.8

19 files changed, 159 insertions, 50 deletions

diff --git a/lib/clang/Makefile b/lib/clang/Makefile
index 42f190a..71e5202 100644
--- a/lib/clang/Makefile
+++ b/lib/clang/Makefile
@@ -143,12 +143,16 @@ SUBDIR+=liblldb \
 	liblldbPluginDisassemblerLLVM \
 	liblldbPluginDynamicLoaderStatic \
 	liblldbPluginDynamicLoaderPosixDYLD \
+	liblldbPluginExpressionParserClang \
+	liblldbPluginExpressionParserGo \
 	liblldbPluginInstructionARM \
 	liblldbPluginInstructionARM64 \
 	liblldbPluginInstructionMIPS \
 	liblldbPluginInstructionMIPS64 \
 	liblldbPluginInstrumentationRuntimeAddressSanitizer \
 	liblldbPluginJITLoaderGDB \
+	liblldbPluginLanguageCPlusPlus \
+	liblldbPluginLanguageObjC \
 	liblldbPluginMemoryHistoryASan \
 	liblldbPluginObjectContainerBSDArchive \
 	liblldbPluginObjectFileELF \
@@ -160,6 +164,7 @@ SUBDIR+=liblldb \
 	liblldbPluginProcessGDBRemote \
 	liblldbPluginProcessPOSIX \
 	liblldbPluginProcessUtility \
+	liblldbPluginScriptInterpreterNone \
 	liblldbPluginSymbolFileDWARF \
 	liblldbPluginSymbolFileSymtab \
 	liblldbPluginSymbolVendorELF \
diff --git a/lib/clang/liblldbCore/Makefile b/lib/clang/liblldbCore/Makefile
index 86bff4d..2c81bd4 100644
--- a/lib/clang/liblldbCore/Makefile
+++ b/lib/clang/liblldbCore/Makefile
@@ -35,7 +35,6 @@ SRCS=	Address.cpp \
 	FormatEntity.cpp \
 	History.cpp \
 	IOHandler.cpp \
-	Language.cpp \
 	Listener.cpp \
 	Log.cpp \
 	Logging.cpp \
@@ -69,6 +68,7 @@ SRCS=	Address.cpp \
 	ValueObjectCast.cpp \
 	ValueObjectChild.cpp \
 	ValueObjectConstResult.cpp \
+	ValueObjectConstResultCast.cpp \
 	ValueObjectConstResultChild.cpp \
 	ValueObjectConstResultImpl.cpp \
 	ValueObjectDynamicValue.cpp \
diff --git a/lib/clang/liblldbDataFormatters/Makefile b/lib/clang/liblldbDataFormatters/Makefile
index 8814697..f3b4168 100644
--- a/lib/clang/liblldbDataFormatters/Makefile
+++ b/lib/clang/liblldbDataFormatters/Makefile
@@ -5,24 +5,14 @@
 LIB=	lldbDataFormatters
 
 SRCDIR=	tools/lldb/source/DataFormatters
-SRCS=	CF.cpp \
-	Cocoa.cpp \
-	CXXFormatterFunctions.cpp \
+SRCS=	CXXFunctionPointer.cpp \
 	DataVisualization.cpp \
+	DumpValueObjectOptions.cpp \
 	FormatCache.cpp \
 	FormatClasses.cpp \
 	FormatManager.cpp \
-	LibCxx.cpp \
-	LibCxxInitializerList.cpp \
-	LibCxxList.cpp \
-	LibCxxMap.cpp \
-	LibCxxUnorderedMap.cpp \
-	LibCxxVector.cpp \
-	LibStdcpp.cpp \
-	NSArray.cpp \
-	NSDictionary.cpp \
-	NSIndexPath.cpp \
-	NSSet.cpp \
+	FormattersHelpers.cpp \
+	LanguageCategory.cpp \
 	StringPrinter.cpp \
 	TypeCategory.cpp \
 	TypeCategoryMap.cpp \
diff --git a/lib/clang/liblldbExpression/Makefile b/lib/clang/liblldbExpression/Makefile
index d2d822b..af6635d 100644
--- a/lib/clang/liblldbExpression/Makefile
+++ b/lib/clang/liblldbExpression/Makefile
@@ -5,28 +5,23 @@
 LIB=	lldbExpression
 
 SRCDIR=	tools/lldb/source/Expression
-SRCS=	ASTDumper.cpp \
-	ASTResultSynthesizer.cpp \
-	ASTStructExtractor.cpp \
-	ClangASTSource.cpp \
-	ClangExpressionDeclMap.cpp \
-	ClangExpressionParser.cpp \
-	ClangExpressionVariable.cpp \
-	ClangFunction.cpp \
-	ClangModulesDeclVendor.cpp \
-	ClangPersistentVariables.cpp \
-	ClangUserExpression.cpp \
-	ClangUtilityFunction.cpp \
-	DWARFExpression.cpp \
+SRCS=	DWARFExpression.cpp \
+	Expression.cpp \
 	ExpressionSourceCode.cpp \
+	ExpressionVariable.cpp \
+	FunctionCaller.cpp \
 	IRDynamicChecks.cpp \
 	IRExecutionUnit.cpp \
-	IRForTarget.cpp \
 	IRInterpreter.cpp \
 	IRMemoryMap.cpp \
-	Materializer.cpp
+	LLVMUserExpression.cpp \
+	Materializer.cpp \
+	REPL.cpp \
+	UserExpression.cpp \
+	UtilityFunction.cpp
 
-TGHDRS=	DiagnosticCommonKinds \
+TGHDRS=	Attributes \
+	DiagnosticCommonKinds \
 	DeclNodes \
 	StmtNodes \
 	CommentCommandList \
diff --git a/lib/clang/liblldbHostCommon/Makefile b/lib/clang/liblldbHostCommon/Makefile
index f463c9c..706ea1f 100644
--- a/lib/clang/liblldbHostCommon/Makefile
+++ b/lib/clang/liblldbHostCommon/Makefile
@@ -10,6 +10,7 @@ SRCS=	Condition.cpp \
 	File.cpp \
 	FileSpec.cpp \
 	FileSystem.cpp \
+	GetOptInc.cpp \
 	Host.cpp \
 	HostInfoBase.cpp \
 	HostNativeThreadBase.cpp \
@@ -28,11 +29,13 @@ SRCS=	Condition.cpp \
 	SoftwareBreakpoint.cpp \
 	StringConvert.cpp \
 	Symbols.cpp \
+	TCPSocket.cpp \
 	Terminal.cpp \
 	ThisThread.cpp \
 	ThreadLauncher.cpp \
 	TimeValue.cpp \
-	XML.cpp
+	XML.cpp \
+	UDPSocket.cpp
 
 TGHDRS=	AttrList \
 	Attrs \
diff --git a/lib/clang/liblldbHostPOSIX/Makefile b/lib/clang/liblldbHostPOSIX/Makefile
index a46dbca..d6e275c 100644
--- a/lib/clang/liblldbHostPOSIX/Makefile
+++ b/lib/clang/liblldbHostPOSIX/Makefile
@@ -6,6 +6,7 @@ LIB=	lldbHostPOSIX
 
 SRCDIR=	tools/lldb/source/Host/posix
 SRCS=	ConnectionFileDescriptorPosix.cpp \
+	DomainSocket.cpp \
 	FileSystem.cpp \
 	HostInfoPosix.cpp \
 	HostProcessPosix.cpp \
diff --git a/lib/clang/liblldbInitialization/Makefile b/lib/clang/liblldbInitialization/Makefile
index 9507b6e..15f7af9 100644
--- a/lib/clang/liblldbInitialization/Makefile
+++ b/lib/clang/liblldbInitialization/Makefile
@@ -9,11 +9,9 @@ SRCS=	SystemInitializer.cpp \
 	SystemInitializerCommon.cpp \
 	SystemLifetimeManager.cpp
 	
-#TGHDRS=	AttrList \
-#	Attrs \
-#	DiagnosticCommonKinds \
-#	DeclNodes \
-#	StmtNodes \
-#	CommentCommandList
+TGHDRS=	CommentCommandList \
+	DeclNodes \
+	DiagnosticCommonKinds \
+	StmtNodes
 
 .include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbInterpreter/Makefile b/lib/clang/liblldbInterpreter/Makefile
index 2ef5d6e..cf7d28e 100644
--- a/lib/clang/liblldbInterpreter/Makefile
+++ b/lib/clang/liblldbInterpreter/Makefile
@@ -47,10 +47,7 @@ SRCS=	Args.cpp \
 	OptionGroupWatchpoint.cpp \
 	Options.cpp \
 	Property.cpp \
-	PythonDataObjects.cpp \
-	ScriptInterpreter.cpp \
-	ScriptInterpreterNone.cpp \
-	ScriptInterpreterPython.cpp
+	ScriptInterpreter.cpp
 
 TGHDRS=	AttrList \
 	Attrs \
diff --git a/lib/clang/liblldbPluginExpressionParserClang/Makefile b/lib/clang/liblldbPluginExpressionParserClang/Makefile
new file mode 100644
index 0000000..2f27613
--- /dev/null
+++ b/lib/clang/liblldbPluginExpressionParserClang/Makefile
@@ -0,0 +1,34 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+LIB=	lldbPluginExpressionParserClang
+
+SRCDIR=	tools/lldb/source/Plugins/ExpressionParser/Clang
+SRCS=	ASTDumper.cpp \
+	ASTResultSynthesizer.cpp \
+	ASTStructExtractor.cpp \
+	ClangASTSource.cpp \
+	ClangExpressionDeclMap.cpp \
+	ClangExpressionParser.cpp \
+	ClangExpressionVariable.cpp \
+	ClangFunctionCaller.cpp \
+	ClangModulesDeclVendor.cpp \
+	ClangPersistentVariables.cpp \
+	ClangUserExpression.cpp \
+	ClangUtilityFunction.cpp \
+	IRForTarget.cpp
+
+TGHDRS=	Attributes \
+	AttrList \
+	AttrParsedAttrList \
+	Attrs \
+	CommentCommandList \
+	DeclNodes \
+	DiagnosticCommonKinds \
+	DiagnosticFrontendKinds \
+	DiagnosticSemaKinds \
+	Intrinsics \
+	StmtNodes
+
+.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbPluginExpressionParserGo/Makefile b/lib/clang/liblldbPluginExpressionParserGo/Makefile
new file mode 100644
index 0000000..79612f9
--- /dev/null
+++ b/lib/clang/liblldbPluginExpressionParserGo/Makefile
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+LIB=	lldbPluginExpressionParserGo
+
+SRCDIR=	tools/lldb/source/Plugins/ExpressionParser/Go
+SRCS=	GoLexer.cpp \
+	GoParser.cpp \
+	GoUserExpression.cpp
+
+.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbPluginLanguageCPlusPlus/Makefile b/lib/clang/liblldbPluginLanguageCPlusPlus/Makefile
new file mode 100644
index 0000000..6382609
--- /dev/null
+++ b/lib/clang/liblldbPluginLanguageCPlusPlus/Makefile
@@ -0,0 +1,23 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+LIB=	lldbPluginLanguageCPlusPlus
+
+SRCDIR=	tools/lldb/source/Plugins/Language/CPlusPlus/
+SRCS=	CPlusPlusLanguage.cpp \
+	CxxStringTypes.cpp \
+	LibCxx.cpp \
+	LibCxxInitializerList.cpp \
+	LibCxxList.cpp \
+	LibCxxMap.cpp \
+	LibCxxUnorderedMap.cpp \
+	LibCxxVector.cpp \
+	LibStdcpp.cpp
+
+TGHDRS=	CommentCommandList \
+	DeclNodes \
+	DiagnosticCommonKinds \
+	StmtNodes
+
+.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbPluginLanguageObjC/Makefile b/lib/clang/liblldbPluginLanguageObjC/Makefile
new file mode 100644
index 0000000..8653e75
--- /dev/null
+++ b/lib/clang/liblldbPluginLanguageObjC/Makefile
@@ -0,0 +1,27 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+LIB=	lldbPluginLanguageObjC
+
+SRCDIR=	tools/lldb/source/Plugins/Language/ObjC/
+SRCS=	CF.cpp \
+	Cocoa.cpp \
+	CoreMedia.cpp \
+	NSArray.cpp \
+	NSDictionary.cpp \
+	NSError.cpp \
+	NSException.cpp \
+	NSIndexPath.cpp \
+	NSSet.cpp \
+	NSString.cpp \
+	ObjCLanguage.cpp
+
+TGHDRS=	AttrList \
+	Attrs \
+	CommentCommandList \
+	DeclNodes \
+	DiagnosticCommonKinds \
+	StmtNodes
+
+.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbPluginProcessFreeBSD/Makefile b/lib/clang/liblldbPluginProcessFreeBSD/Makefile
index 2af488b..d9444ee 100644
--- a/lib/clang/liblldbPluginProcessFreeBSD/Makefile
+++ b/lib/clang/liblldbPluginProcessFreeBSD/Makefile
@@ -7,14 +7,13 @@ LIB=	lldbPluginProcessFreeBSD
 # include_directories(.)
 CFLAGS+=-I${.CURDIR}/../../../contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD
 CFLAGS+=-I${.CURDIR}/../../../contrib/llvm/tools/lldb/source/Plugins/Process/POSIX
+CFLAGS+=-I${.CURDIR}/../../../contrib/llvm/tools/lldb/source/Plugins/Process/Utility
 
 SRCDIR=	tools/lldb/source/Plugins/Process/FreeBSD
 SRCS=	FreeBSDThread.cpp \
 	ProcessFreeBSD.cpp \
 	ProcessMonitor.cpp \
 	POSIXStopInfo.cpp \
-	POSIXThread.cpp \
-	ProcessPOSIX.cpp \
 	RegisterContextPOSIXProcessMonitor_arm.cpp \
 	RegisterContextPOSIXProcessMonitor_arm64.cpp \
 	RegisterContextPOSIXProcessMonitor_mips64.cpp \
diff --git a/lib/clang/liblldbPluginProcessUtility/Makefile b/lib/clang/liblldbPluginProcessUtility/Makefile
index ee11668..4a5e340 100644
--- a/lib/clang/liblldbPluginProcessUtility/Makefile
+++ b/lib/clang/liblldbPluginProcessUtility/Makefile
@@ -13,6 +13,7 @@ SRCS=	DynamicRegisterInfo.cpp \
 	InferiorCallPOSIX.cpp \
 	LinuxSignals.cpp \
 	MipsLinuxSignals.cpp \
+	NetBSDSignals.cpp \
 	RegisterContextDarwin_arm.cpp \
 	RegisterContextDarwin_arm64.cpp \
 	RegisterContextDarwin_i386.cpp \
diff --git a/lib/clang/liblldbPluginScriptInterpreterNone/Makefile b/lib/clang/liblldbPluginScriptInterpreterNone/Makefile
new file mode 100644
index 0000000..d837539
--- /dev/null
+++ b/lib/clang/liblldbPluginScriptInterpreterNone/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+LIB=	lldbPluginScriptInterpreterNone
+
+SRCDIR=	tools/lldb/source/Plugins/ScriptInterpreter/None
+SRCS=	ScriptInterpreterNone.cpp
+
+.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbPluginSymbolFileDWARF/Makefile b/lib/clang/liblldbPluginSymbolFileDWARF/Makefile
index 5b8dbfd..0d2409e 100644
--- a/lib/clang/liblldbPluginSymbolFileDWARF/Makefile
+++ b/lib/clang/liblldbPluginSymbolFileDWARF/Makefile
@@ -5,7 +5,11 @@
 LIB=	lldbPluginSymbolFileDWARF
 
 SRCDIR=	tools/lldb/source/Plugins/SymbolFile/DWARF
-SRCS=	DWARFAbbreviationDeclaration.cpp \
+SRCS=	DIERef.cpp \
+	DWARFAbbreviationDeclaration.cpp \
+	DWARFASTParserClang.cpp \
+	DWARFASTParserGo.cpp \
+	DWARFAttribute.cpp \
 	DWARFCompileUnit.cpp \
 	DWARFDataExtractor.cpp \
 	DWARFDebugAbbrev.cpp \
@@ -13,6 +17,7 @@ SRCS=	DWARFAbbreviationDeclaration.cpp \
 	DWARFDebugArangeSet.cpp \
 	DWARFDebugInfo.cpp \
 	DWARFDebugInfoEntry.cpp \
+	DWARFDebugMacro.cpp \
 	DWARFDebugLine.cpp \
 	DWARFDebugMacinfo.cpp \
 	DWARFDebugMacinfoEntry.cpp \
@@ -21,13 +26,14 @@ SRCS=	DWARFAbbreviationDeclaration.cpp \
 	DWARFDebugRanges.cpp \
 	DWARFDeclContext.cpp \
 	DWARFDefines.cpp \
+	DWARFDIE.cpp \
 	DWARFDIECollection.cpp \
 	DWARFFormValue.cpp \
-	DWARFLocationDescription.cpp \
-	DWARFLocationList.cpp \
 	LogChannelDWARF.cpp \
+	HashedNameToDIE.cpp \
 	NameToDIE.cpp \
 	SymbolFileDWARF.cpp \
+	SymbolFileDWARFDwo.cpp \
 	SymbolFileDWARFDebugMap.cpp \
 	UniqueDWARFASTType.cpp
 
diff --git a/lib/clang/liblldbSymbol/Makefile b/lib/clang/liblldbSymbol/Makefile
index 82c11ff..0cc7a75 100644
--- a/lib/clang/liblldbSymbol/Makefile
+++ b/lib/clang/liblldbSymbol/Makefile
@@ -5,19 +5,23 @@
 LIB=	lldbSymbol
 
 SRCDIR=	tools/lldb/source/Symbol
-SRCS=	Block.cpp \
+SRCS=	ArmUnwindInfo.cpp \
+	Block.cpp \
 	ClangASTContext.cpp \
 	ClangASTImporter.cpp \
-	ClangASTType.cpp \
 	ClangExternalASTSourceCallbacks.cpp \
 	ClangExternalASTSourceCommon.cpp \
-	ClangNamespaceDecl.cpp \
+	CompilerDecl.cpp \
+	CompilerDeclContext.cpp \
+	CompilerType.cpp \
 	CompactUnwindInfo.cpp \
+	DebugMacros.cpp \
 	CompileUnit.cpp \
 	Declaration.cpp \
 	DWARFCallFrameInfo.cpp \
 	Function.cpp \
 	FuncUnwinders.cpp \
+	GoASTContext.cpp \
 	LineEntry.cpp \
 	LineTable.cpp \
 	ObjectFile.cpp \
@@ -28,6 +32,8 @@ SRCS=	Block.cpp \
 	Symtab.cpp \
 	Type.cpp \
 	TypeList.cpp \
+	TypeMap.cpp \
+	TypeSystem.cpp \
 	UnwindPlan.cpp \
 	UnwindTable.cpp \
 	Variable.cpp \
diff --git a/lib/clang/liblldbTarget/Makefile b/lib/clang/liblldbTarget/Makefile
index 110dfe9..9bad46e 100644
--- a/lib/clang/liblldbTarget/Makefile
+++ b/lib/clang/liblldbTarget/Makefile
@@ -15,6 +15,7 @@ SRCS=	ABI.cpp \
 	InstrumentationRuntimeStopInfo.cpp \
 	JITLoader.cpp \
 	JITLoaderList.cpp \
+	Language.cpp \
 	LanguageRuntime.cpp \
 	Memory.cpp \
 	MemoryHistory.cpp \
diff --git a/lib/clang/liblldbUtility/Makefile b/lib/clang/liblldbUtility/Makefile
index 918cfab..6e2345c 100644
--- a/lib/clang/liblldbUtility/Makefile
+++ b/lib/clang/liblldbUtility/Makefile
@@ -20,6 +20,7 @@ SRCS=	ARM64_DWARF_Registers.cpp \
 	StringExtractor.cpp \
 	StringExtractorGDBRemote.cpp \
 	StringLexer.cpp \
+	TaskPool.cpp \
 	TimeSpecTimeout.cpp \
 	UriParser.cpp