From 731e90c4a337945829f0b9e910c95a241959ec6f Mon Sep 17 00:00:00 2001 From: emaste Date: Mon, 4 Jan 2016 00:02:58 +0000 Subject: [PATCH] Update build infrastructure for LLDB 3.8 --- lib/clang/Makefile | 5 ++++ lib/clang/liblldbCore/Makefile | 2 +- lib/clang/liblldbDataFormatters/Makefile | 18 ++++---------- lib/clang/liblldbExpression/Makefile | 27 +++++++++------------ lib/clang/liblldbHostCommon/Makefile | 5 +++- lib/clang/liblldbHostPOSIX/Makefile | 1 + lib/clang/liblldbInitialization/Makefile | 10 ++++---- lib/clang/liblldbInterpreter/Makefile | 5 +--- .../Makefile | 28 +++++++++------------- lib/clang/liblldbPluginExpressionParserGo/Makefile | 12 ++++++++++ lib/clang/liblldbPluginLanguageCPlusPlus/Makefile | 23 ++++++++++++++++++ lib/clang/liblldbPluginLanguageObjC/Makefile | 27 +++++++++++++++++++++ lib/clang/liblldbPluginProcessFreeBSD/Makefile | 3 +-- lib/clang/liblldbPluginProcessUtility/Makefile | 1 + .../liblldbPluginScriptInterpreterNone/Makefile | 10 ++++++++ lib/clang/liblldbPluginSymbolFileDWARF/Makefile | 12 +++++++--- lib/clang/liblldbSymbol/Makefile | 12 +++++++--- lib/clang/liblldbTarget/Makefile | 1 + lib/clang/liblldbUtility/Makefile | 1 + usr.bin/clang/lldb/Makefile | 6 ++++- 20 files changed, 141 insertions(+), 68 deletions(-) copy lib/clang/{liblldbExpression => liblldbPluginExpressionParserClang}/Makefile (61%) create mode 100644 lib/clang/liblldbPluginExpressionParserGo/Makefile create mode 100644 lib/clang/liblldbPluginLanguageCPlusPlus/Makefile create mode 100644 lib/clang/liblldbPluginLanguageObjC/Makefile create mode 100644 lib/clang/liblldbPluginScriptInterpreterNone/Makefile diff --git a/lib/clang/Makefile b/lib/clang/Makefile index 42f190a09eb..71e52024da2 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 86bff4d26aa..2c81bd4b93c 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 881469729cd..f3b4168f9db 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 d2d822bc7eb..af6635d2a85 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 f463c9c2a2d..706ea1f8f0a 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 a46dbcaf5a4..d6e275c19b8 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 9507b6e8f98..15f7af9b4c5 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 2ef5d6e9a25..cf7d28e381a 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/liblldbExpression/Makefile b/lib/clang/liblldbPluginExpressionParserClang/Makefile similarity index 61% copy from lib/clang/liblldbExpression/Makefile copy to lib/clang/liblldbPluginExpressionParserClang/Makefile index d2d822bc7eb..2f27613cabe 100644 --- a/lib/clang/liblldbExpression/Makefile +++ b/lib/clang/liblldbPluginExpressionParserClang/Makefile @@ -2,9 +2,9 @@ .include -LIB= lldbExpression +LIB= lldbPluginExpressionParserClang -SRCDIR= tools/lldb/source/Expression +SRCDIR= tools/lldb/source/Plugins/ExpressionParser/Clang SRCS= ASTDumper.cpp \ ASTResultSynthesizer.cpp \ ASTStructExtractor.cpp \ @@ -12,29 +12,23 @@ SRCS= ASTDumper.cpp \ ClangExpressionDeclMap.cpp \ ClangExpressionParser.cpp \ ClangExpressionVariable.cpp \ - ClangFunction.cpp \ + ClangFunctionCaller.cpp \ ClangModulesDeclVendor.cpp \ ClangPersistentVariables.cpp \ ClangUserExpression.cpp \ ClangUtilityFunction.cpp \ - DWARFExpression.cpp \ - ExpressionSourceCode.cpp \ - IRDynamicChecks.cpp \ - IRExecutionUnit.cpp \ - IRForTarget.cpp \ - IRInterpreter.cpp \ - IRMemoryMap.cpp \ - Materializer.cpp + IRForTarget.cpp -TGHDRS= DiagnosticCommonKinds \ - DeclNodes \ - StmtNodes \ - CommentCommandList \ +TGHDRS= Attributes \ AttrList \ - Attrs \ AttrParsedAttrList \ + Attrs \ + CommentCommandList \ + DeclNodes \ + DiagnosticCommonKinds \ DiagnosticFrontendKinds \ DiagnosticSemaKinds \ - Intrinsics + Intrinsics \ + StmtNodes .include "../lldb.lib.mk" diff --git a/lib/clang/liblldbPluginExpressionParserGo/Makefile b/lib/clang/liblldbPluginExpressionParserGo/Makefile new file mode 100644 index 00000000000..79612f932b6 --- /dev/null +++ b/lib/clang/liblldbPluginExpressionParserGo/Makefile @@ -0,0 +1,12 @@ +# $FreeBSD$ + +.include + +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 00000000000..6382609eb48 --- /dev/null +++ b/lib/clang/liblldbPluginLanguageCPlusPlus/Makefile @@ -0,0 +1,23 @@ +# $FreeBSD$ + +.include + +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 00000000000..8653e75e3e8 --- /dev/null +++ b/lib/clang/liblldbPluginLanguageObjC/Makefile @@ -0,0 +1,27 @@ +# $FreeBSD$ + +.include + +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 2af488b0be0..d9444eefb98 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 ee11668d109..4a5e340fc46 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 00000000000..d837539b443 --- /dev/null +++ b/lib/clang/liblldbPluginScriptInterpreterNone/Makefile @@ -0,0 +1,10 @@ +# $FreeBSD$ + +.include + +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 5b8dbfd5743..0d2409e70ee 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 82c11ff2521..0cc7a75a505 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 110dfe9d440..9bad46ede63 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 918cfab243f..6e2345c4811 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 diff --git a/usr.bin/clang/lldb/Makefile b/usr.bin/clang/lldb/Makefile index cf4ddf5ceef..2ad02b7bba6 100644 --- a/usr.bin/clang/lldb/Makefile +++ b/usr.bin/clang/lldb/Makefile @@ -46,12 +46,16 @@ LLDB_LIBS=\ lldbPluginABISysV_x86_64 \ lldbPluginCXXItaniumABI \ lldbPluginDisassemblerLLVM \ + lldbPluginExpressionParserClang \ + lldbPluginExpressionParserGo \ lldbPluginInstructionARM \ lldbPluginInstructionARM64 \ lldbPluginInstructionMIPS \ lldbPluginInstructionMIPS64 \ lldbPluginInstrumentationRuntimeAddressSanitizer \ lldbPluginJITLoaderGDB \ + lldbPluginLanguageCPlusPlus \ + lldbPluginLanguageObjC \ lldbPluginSymbolFileDWARF \ lldbPluginSymbolFileSymtab \ lldbPluginDynamicLoaderStatic \ @@ -60,6 +64,7 @@ LLDB_LIBS=\ lldbPluginObjectContainerBSDArchive \ lldbPluginObjectFileELF \ lldbPluginObjectFileJIT \ + lldbPluginScriptInterpreterNone \ lldbPluginSymbolVendorELF \ lldbPluginPlatformFreeBSD \ lldbPluginPlatformGDB \ @@ -146,7 +151,6 @@ LIBDEPS=\ llvmprofiledata \ llvminstcombine \ llvmtransformutils \ - llvmipa \ llvmanalysis \ llvminstrumentation \ llvmx86desc \ -- 2.11.4.GIT