diff --git a/contrib/llvm/tools/lldb/source/API/SystemInitializerFull.cpp b/contrib/llvm/tools/lldb/source/API/SystemInitializerFull.cpp index acf8ad5e5d8b..f6939617e6a6 100644 --- a/contrib/llvm/tools/lldb/source/API/SystemInitializerFull.cpp +++ b/contrib/llvm/tools/lldb/source/API/SystemInitializerFull.cpp @@ -26,48 +26,62 @@ #include "lldb/Interpreter/CommandInterpreter.h" #include "lldb/Symbol/ClangASTContext.h" #include "lldb/Symbol/GoASTContext.h" -#include "lldb/Symbol/JavaASTContext.h" +//#include "lldb/Symbol/JavaASTContext.h" +//#include "Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.h" +//#include "Plugins/ABI/MacOSX-arm64/ABIMacOSX_arm64.h" +//#include "Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.h" #include "Plugins/ABI/SysV-arm/ABISysV_arm.h" #include "Plugins/ABI/SysV-arm64/ABISysV_arm64.h" +//#include "Plugins/ABI/SysV-hexagon/ABISysV_hexagon.h" #include "Plugins/ABI/SysV-i386/ABISysV_i386.h" #include "Plugins/ABI/SysV-mips/ABISysV_mips.h" #include "Plugins/ABI/SysV-mips64/ABISysV_mips64.h" #include "Plugins/ABI/SysV-ppc/ABISysV_ppc.h" #include "Plugins/ABI/SysV-ppc64/ABISysV_ppc64.h" -#include "Plugins/ABI/SysV-s390x/ABISysV_s390x.h" +//#include "Plugins/ABI/SysV-s390x/ABISysV_s390x.h" #include "Plugins/ABI/SysV-x86_64/ABISysV_x86_64.h" #include "Plugins/Disassembler/llvm/DisassemblerLLVMC.h" -#include "Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.h" +//#include "Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.h" #include "Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.h" #include "Plugins/DynamicLoader/Static/DynamicLoaderStatic.h" -#include "Plugins/DynamicLoader/Windows-DYLD/DynamicLoaderWindowsDYLD.h" +//#include "Plugins/DynamicLoader/Windows-DYLD/DynamicLoaderWindowsDYLD.h" #include "Plugins/Instruction/ARM64/EmulateInstructionARM64.h" #include "Plugins/InstrumentationRuntime/AddressSanitizer/AddressSanitizerRuntime.h" -#include "Plugins/InstrumentationRuntime/ThreadSanitizer/ThreadSanitizerRuntime.h" +//#include "Plugins/InstrumentationRuntime/ThreadSanitizer/ThreadSanitizerRuntime.h" #include "Plugins/JITLoader/GDB/JITLoaderGDB.h" #include "Plugins/Language/CPlusPlus/CPlusPlusLanguage.h" +//#include "Plugins/Language/Go/GoLanguage.h" +//#include "Plugins/Language/Java/JavaLanguage.h" +//#include "Plugins/Language/ObjC/ObjCLanguage.h" +//#include "Plugins/Language/ObjCPlusPlus/ObjCPlusPlusLanguage.h" #include "Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.h" +//#include "Plugins/LanguageRuntime/Go/GoLanguageRuntime.h" +//#include "Plugins/LanguageRuntime/Java/JavaLanguageRuntime.h" +//#include "Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.h" +//#include "Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h" +//#include "Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.h" #include "Plugins/MemoryHistory/asan/MemoryHistoryASan.h" -#include "Plugins/OperatingSystem/Go/OperatingSystemGo.h" -#include "Plugins/OperatingSystem/Python/OperatingSystemPython.h" -#include "Plugins/Platform/Android/PlatformAndroid.h" +//#include "Plugins/OperatingSystem/Go/OperatingSystemGo.h" +//#include "Plugins/OperatingSystem/Python/OperatingSystemPython.h" +//#include "Plugins/Platform/Android/PlatformAndroid.h" #include "Plugins/Platform/FreeBSD/PlatformFreeBSD.h" -#include "Plugins/Platform/Kalimba/PlatformKalimba.h" -#include "Plugins/Platform/Linux/PlatformLinux.h" -#include "Plugins/Platform/MacOSX/PlatformMacOSX.h" -#include "Plugins/Platform/MacOSX/PlatformRemoteiOS.h" -#include "Plugins/Platform/NetBSD/PlatformNetBSD.h" -#include "Plugins/Platform/Windows/PlatformWindows.h" +//#include "Plugins/Platform/Kalimba/PlatformKalimba.h" +//#include "Plugins/Platform/Linux/PlatformLinux.h" +//#include "Plugins/Platform/MacOSX/PlatformMacOSX.h" +//#include "Plugins/Platform/MacOSX/PlatformRemoteiOS.h" +//#include "Plugins/Platform/NetBSD/PlatformNetBSD.h" +//#include "Plugins/Platform/Windows/PlatformWindows.h" #include "Plugins/Platform/gdb-server/PlatformRemoteGDBServer.h" #include "Plugins/Process/elf-core/ProcessElfCore.h" #include "Plugins/Process/gdb-remote/ProcessGDBRemote.h" #include "Plugins/ScriptInterpreter/None/ScriptInterpreterNone.h" #include "Plugins/SymbolFile/DWARF/SymbolFileDWARF.h" #include "Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.h" -#include "Plugins/SymbolFile/PDB/SymbolFilePDB.h" +//#include "Plugins/SymbolFile/PDB/SymbolFilePDB.h" #include "Plugins/SymbolFile/Symtab/SymbolFileSymtab.h" #include "Plugins/SymbolVendor/ELF/SymbolVendorELF.h" +//#include "Plugins/SystemRuntime/MacOSX/SystemRuntimeMacOSX.h" #include "Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.h" #include "Plugins/UnwindAssembly/x86/UnwindAssembly-x86.h" @@ -266,7 +280,7 @@ SystemInitializerFull::Initialize() #ifndef LLDB_DISABLE_PYTHON OperatingSystemPython::Initialize(); #endif - OperatingSystemGo::Initialize(); +// OperatingSystemGo::Initialize(); #if !defined(LLDB_DISABLE_PYTHON) InitializeSWIG(); @@ -278,13 +292,13 @@ SystemInitializerFull::Initialize() #endif platform_freebsd::PlatformFreeBSD::Initialize(); - platform_linux::PlatformLinux::Initialize(); - platform_netbsd::PlatformNetBSD::Initialize(); - PlatformWindows::Initialize(); - PlatformKalimba::Initialize(); - platform_android::PlatformAndroid::Initialize(); - PlatformRemoteiOS::Initialize(); - PlatformMacOSX::Initialize(); +// platform_linux::PlatformLinux::Initialize(); +// platform_netbsd::PlatformNetBSD::Initialize(); +// PlatformWindows::Initialize(); +// PlatformKalimba::Initialize(); +// platform_android::PlatformAndroid::Initialize(); +// PlatformRemoteiOS::Initialize(); +// PlatformMacOSX::Initialize(); #if defined(__APPLE__) PlatformiOSSimulator::Initialize(); PlatformDarwinKernel::Initialize(); @@ -298,17 +312,21 @@ SystemInitializerFull::Initialize() ClangASTContext::Initialize(); GoASTContext::Initialize(); - JavaASTContext::Initialize(); +// JavaASTContext::Initialize(); +// ABIMacOSX_i386::Initialize(); +// ABIMacOSX_arm::Initialize(); +// ABIMacOSX_arm64::Initialize(); ABISysV_arm::Initialize(); ABISysV_arm64::Initialize(); +// ABISysV_hexagon::Initialize(); ABISysV_i386::Initialize(); ABISysV_x86_64::Initialize(); ABISysV_ppc::Initialize(); ABISysV_ppc64::Initialize(); ABISysV_mips::Initialize(); ABISysV_mips64::Initialize(); - ABISysV_s390x::Initialize(); +// ABISysV_s390x::Initialize(); DisassemblerLLVMC::Initialize(); JITLoaderGDB::Initialize(); @@ -318,20 +336,29 @@ SystemInitializerFull::Initialize() #endif MemoryHistoryASan::Initialize(); AddressSanitizerRuntime::Initialize(); - ThreadSanitizerRuntime::Initialize(); +// ThreadSanitizerRuntime::Initialize(); SymbolVendorELF::Initialize(); SymbolFileDWARF::Initialize(); - SymbolFilePDB::Initialize(); +// SymbolFilePDB::Initialize(); SymbolFileSymtab::Initialize(); UnwindAssemblyInstEmulation::Initialize(); UnwindAssembly_x86::Initialize(); EmulateInstructionARM64::Initialize(); SymbolFileDWARFDebugMap::Initialize(); ItaniumABILanguageRuntime::Initialize(); - JavaLanguageRuntime::Initialize(); +// AppleObjCRuntimeV2::Initialize(); +// AppleObjCRuntimeV1::Initialize(); +// SystemRuntimeMacOSX::Initialize(); +// RenderScriptRuntime::Initialize(); +// GoLanguageRuntime::Initialize(); +// JavaLanguageRuntime::Initialize(); CPlusPlusLanguage::Initialize(); +// GoLanguage::Initialize(); +// JavaLanguage::Initialize(); +// ObjCLanguage::Initialize(); +// ObjCPlusPlusLanguage::Initialize(); #if defined(_MSC_VER) ProcessWindowsLive::Initialize(); @@ -355,10 +382,10 @@ SystemInitializerFull::Initialize() platform_gdb_server::PlatformRemoteGDBServer::Initialize(); process_gdb_remote::ProcessGDBRemote::Initialize(); - DynamicLoaderMacOSXDYLD::Initialize(); +// DynamicLoaderMacOSXDYLD::Initialize(); DynamicLoaderPOSIXDYLD::Initialize(); DynamicLoaderStatic::Initialize(); - DynamicLoaderWindowsDYLD::Initialize(); +// DynamicLoaderWindowsDYLD::Initialize(); // Scan for any system or user LLDB plug-ins PluginManager::Initialize(); @@ -414,17 +441,21 @@ SystemInitializerFull::Terminate() ClangASTContext::Terminate(); GoASTContext::Terminate(); - JavaASTContext::Terminate(); +// JavaASTContext::Terminate(); +// ABIMacOSX_i386::Terminate(); +// ABIMacOSX_arm::Terminate(); +// ABIMacOSX_arm64::Terminate(); ABISysV_arm::Terminate(); ABISysV_arm64::Terminate(); +// ABISysV_hexagon::Terminate(); ABISysV_i386::Terminate(); ABISysV_x86_64::Terminate(); ABISysV_ppc::Terminate(); ABISysV_ppc64::Terminate(); ABISysV_mips::Terminate(); ABISysV_mips64::Terminate(); - ABISysV_s390x::Terminate(); +// ABISysV_s390x::Terminate(); DisassemblerLLVMC::Terminate(); JITLoaderGDB::Terminate(); @@ -434,19 +465,27 @@ SystemInitializerFull::Terminate() #endif MemoryHistoryASan::Terminate(); AddressSanitizerRuntime::Terminate(); - ThreadSanitizerRuntime::Terminate(); +// ThreadSanitizerRuntime::Terminate(); SymbolVendorELF::Terminate(); SymbolFileDWARF::Terminate(); - SymbolFilePDB::Terminate(); +// SymbolFilePDB::Terminate(); SymbolFileSymtab::Terminate(); UnwindAssembly_x86::Terminate(); UnwindAssemblyInstEmulation::Terminate(); EmulateInstructionARM64::Terminate(); SymbolFileDWARFDebugMap::Terminate(); ItaniumABILanguageRuntime::Terminate(); - JavaLanguageRuntime::Terminate(); +// AppleObjCRuntimeV2::Terminate(); +// AppleObjCRuntimeV1::Terminate(); +// SystemRuntimeMacOSX::Terminate(); +// RenderScriptRuntime::Terminate(); +// JavaLanguageRuntime::Terminate(); CPlusPlusLanguage::Terminate(); +// GoLanguage::Terminate(); +// JavaLanguage::Terminate(); +// ObjCLanguage::Terminate(); +// ObjCPlusPlusLanguage::Terminate(); #if defined(__APPLE__) DynamicLoaderDarwinKernel::Terminate(); @@ -466,24 +505,24 @@ SystemInitializerFull::Terminate() platform_gdb_server::PlatformRemoteGDBServer::Terminate(); process_gdb_remote::ProcessGDBRemote::Terminate(); - DynamicLoaderMacOSXDYLD::Terminate(); +// DynamicLoaderMacOSXDYLD::Terminate(); DynamicLoaderPOSIXDYLD::Terminate(); DynamicLoaderStatic::Terminate(); - DynamicLoaderWindowsDYLD::Terminate(); +// DynamicLoaderWindowsDYLD::Terminate(); #ifndef LLDB_DISABLE_PYTHON OperatingSystemPython::Terminate(); #endif - OperatingSystemGo::Terminate(); +// OperatingSystemGo::Terminate(); platform_freebsd::PlatformFreeBSD::Terminate(); - platform_linux::PlatformLinux::Terminate(); - platform_netbsd::PlatformNetBSD::Terminate(); - PlatformWindows::Terminate(); - PlatformKalimba::Terminate(); - platform_android::PlatformAndroid::Terminate(); - PlatformMacOSX::Terminate(); - PlatformRemoteiOS::Terminate(); +// platform_linux::PlatformLinux::Terminate(); +// platform_netbsd::PlatformNetBSD::Terminate(); +// PlatformWindows::Terminate(); +// PlatformKalimba::Terminate(); +// platform_android::PlatformAndroid::Terminate(); +// PlatformMacOSX::Terminate(); +// PlatformRemoteiOS::Terminate(); #if defined(__APPLE__) PlatformiOSSimulator::Terminate(); PlatformDarwinKernel::Terminate(); diff --git a/contrib/llvm/tools/lldb/source/Initialization/SystemInitializerCommon.cpp b/contrib/llvm/tools/lldb/source/Initialization/SystemInitializerCommon.cpp index d41dedbf3bf8..76cac2e8b4ee 100644 --- a/contrib/llvm/tools/lldb/source/Initialization/SystemInitializerCommon.cpp +++ b/contrib/llvm/tools/lldb/source/Initialization/SystemInitializerCommon.cpp @@ -17,7 +17,9 @@ #include "Plugins/Instruction/MIPS/EmulateInstructionMIPS.h" #include "Plugins/Instruction/MIPS64/EmulateInstructionMIPS64.h" #include "Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.h" +//#include "Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.h" #include "Plugins/ObjectFile/ELF/ObjectFileELF.h" +//#include "Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h" #include "Plugins/Process/gdb-remote/ProcessGDBRemoteLog.h" #if defined(__APPLE__) @@ -86,6 +88,7 @@ SystemInitializerCommon::Initialize() // Initialize plug-ins ObjectContainerBSDArchive::Initialize(); ObjectFileELF::Initialize(); +// ObjectFilePECOFF::Initialize(); EmulateInstructionARM::Initialize(); EmulateInstructionMIPS::Initialize(); @@ -94,6 +97,8 @@ SystemInitializerCommon::Initialize() //---------------------------------------------------------------------- // Apple/Darwin hosted plugins //---------------------------------------------------------------------- +// ObjectContainerUniversalMachO::Initialize(); + #if defined(__APPLE__) ObjectFileMachO::Initialize(); @@ -113,12 +118,13 @@ SystemInitializerCommon::Terminate() Timer scoped_timer(__PRETTY_FUNCTION__, __PRETTY_FUNCTION__); ObjectContainerBSDArchive::Terminate(); ObjectFileELF::Terminate(); +// ObjectFilePECOFF::Terminate(); EmulateInstructionARM::Terminate(); EmulateInstructionMIPS::Terminate(); EmulateInstructionMIPS64::Terminate(); - ObjectContainerUniversalMachO::Terminate(); +// ObjectContainerUniversalMachO::Terminate(); #if defined(__APPLE__) ObjectFileMachO::Terminate(); #endif diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/ThreadElfCore.cpp b/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/ThreadElfCore.cpp index e4cfa68044f1..d5dccfaa80dd 100644 --- a/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/ThreadElfCore.cpp +++ b/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/ThreadElfCore.cpp @@ -18,7 +18,7 @@ #include "ProcessElfCore.h" #include "Plugins/Process/Utility/RegisterContextLinux_arm.h" #include "Plugins/Process/Utility/RegisterContextLinux_arm64.h" -#include "Plugins/Process/Utility/RegisterContextLinux_s390x.h" +//#include "Plugins/Process/Utility/RegisterContextLinux_s390x.h" #include "Plugins/Process/Utility/RegisterContextLinux_x86_64.h" #include "Plugins/Process/Utility/RegisterContextFreeBSD_arm.h" #include "Plugins/Process/Utility/RegisterContextFreeBSD_arm64.h" @@ -30,7 +30,7 @@ #include "RegisterContextPOSIXCore_arm64.h" #include "RegisterContextPOSIXCore_mips64.h" #include "RegisterContextPOSIXCore_powerpc.h" -#include "RegisterContextPOSIXCore_s390x.h" +//#include "RegisterContextPOSIXCore_s390x.h" #include "RegisterContextPOSIXCore_x86_64.h" using namespace lldb; @@ -141,9 +141,9 @@ ThreadElfCore::CreateRegisterContextForFrame (StackFrame *frame) case llvm::Triple::aarch64: reg_interface = new RegisterContextLinux_arm64(arch); break; - case llvm::Triple::systemz: - reg_interface = new RegisterContextLinux_s390x(arch); - break; +// case llvm::Triple::systemz: +// reg_interface = new RegisterContextLinux_s390x(arch); +// break; case llvm::Triple::x86_64: reg_interface = new RegisterContextLinux_x86_64(arch); break; @@ -179,9 +179,9 @@ ThreadElfCore::CreateRegisterContextForFrame (StackFrame *frame) case llvm::Triple::ppc64: m_thread_reg_ctx_sp.reset(new RegisterContextCorePOSIX_powerpc (*this, reg_interface, m_gpregset_data, m_fpregset_data, m_vregset_data)); break; - case llvm::Triple::systemz: - m_thread_reg_ctx_sp.reset(new RegisterContextCorePOSIX_s390x (*this, reg_interface, m_gpregset_data, m_fpregset_data)); - break; +// case llvm::Triple::systemz: +// m_thread_reg_ctx_sp.reset(new RegisterContextCorePOSIX_s390x (*this, reg_interface, m_gpregset_data, m_fpregset_data)); +// break; case llvm::Triple::x86: case llvm::Triple::x86_64: m_thread_reg_ctx_sp.reset(new RegisterContextCorePOSIX_x86_64 (*this, reg_interface, m_gpregset_data, m_fpregset_data)); @@ -226,7 +226,7 @@ ELFLinuxPrStatus::Parse(DataExtractor &data, ArchSpec &arch) size_t len; switch(arch.GetCore()) { - case ArchSpec::eCore_s390x_generic: +// case ArchSpec::eCore_s390x_generic: case ArchSpec::eCore_x86_64_x86_64: len = data.ExtractBytes(0, ELFLINUXPRSTATUS64_SIZE, byteorder, this); return len == ELFLINUXPRSTATUS64_SIZE; @@ -250,7 +250,7 @@ ELFLinuxPrPsInfo::Parse(DataExtractor &data, ArchSpec &arch) size_t len; switch(arch.GetCore()) { - case ArchSpec::eCore_s390x_generic: +// case ArchSpec::eCore_s390x_generic: case ArchSpec::eCore_x86_64_x86_64: len = data.ExtractBytes(0, ELFLINUXPRPSINFO64_SIZE, byteorder, this); return len == ELFLINUXPRPSINFO64_SIZE; diff --git a/lib/clang/Makefile b/lib/clang/Makefile index 45ba333a89f4..71d72c125162 100644 --- a/lib/clang/Makefile +++ b/lib/clang/Makefile @@ -150,6 +150,7 @@ SUBDIR+=liblldb \ liblldbPluginABISysV_ppc \ liblldbPluginABISysV_ppc64 \ liblldbPluginABISysV_x86_64 \ + liblldbPluginCPlusPlusLanguage \ liblldbPluginCXXItaniumABI \ liblldbPluginDisassemblerLLVM \ liblldbPluginDynamicLoaderStatic \ @@ -162,9 +163,8 @@ SUBDIR+=liblldb \ liblldbPluginInstructionMIPS64 \ liblldbPluginInstrumentationRuntimeAddressSanitizer \ liblldbPluginJITLoaderGDB \ - liblldbPluginLanguageCPlusPlus \ - liblldbPluginLanguageObjC \ liblldbPluginMemoryHistoryASan \ + liblldbPluginObjCLanguage \ liblldbPluginObjectContainerBSDArchive \ liblldbPluginObjectFileELF \ liblldbPluginObjectFileJIT \ @@ -177,6 +177,7 @@ SUBDIR+=liblldb \ liblldbPluginProcessUtility \ liblldbPluginScriptInterpreterNone \ liblldbPluginSymbolFileDWARF \ + liblldbPluginSymbolFilePDB \ liblldbPluginSymbolFileSymtab \ liblldbPluginSymbolVendorELF \ liblldbPluginUnwindAssemblyInstEmulation \ diff --git a/lib/clang/liblldbAPI/Makefile b/lib/clang/liblldbAPI/Makefile index 0ecf54a4b65c..354b01ef33f8 100644 --- a/lib/clang/liblldbAPI/Makefile +++ b/lib/clang/liblldbAPI/Makefile @@ -33,6 +33,8 @@ SRCS= SBAddress.cpp \ SBLaunchInfo.cpp \ SBLineEntry.cpp \ SBListener.cpp \ + SBMemoryRegionInfo.cpp \ + SBMemoryRegionInfoList.cpp \ SBModule.cpp \ SBModuleSpec.cpp \ SBPlatform.cpp \ @@ -47,9 +49,9 @@ SRCS= SBAddress.cpp \ SBSymbolContext.cpp \ SBSymbolContextList.cpp \ SBTarget.cpp \ + SBThread.cpp \ SBThreadCollection.cpp \ SBThreadPlan.cpp \ - SBThread.cpp \ SBType.cpp \ SBTypeCategory.cpp \ SBTypeEnumMember.cpp \ @@ -60,8 +62,8 @@ SRCS= SBAddress.cpp \ SBTypeSynthetic.cpp \ SBUnixSignals.cpp \ SBValue.cpp \ - SBVariablesOptions.cpp \ SBValueList.cpp \ + SBVariablesOptions.cpp \ SBWatchpoint.cpp \ SystemInitializerFull.cpp diff --git a/lib/clang/liblldbCore/Makefile b/lib/clang/liblldbCore/Makefile index 2c81bd4b93c2..3b83a0434644 100644 --- a/lib/clang/liblldbCore/Makefile +++ b/lib/clang/liblldbCore/Makefile @@ -60,9 +60,10 @@ SRCS= Address.cpp \ StringList.cpp \ StructuredData.cpp \ Timer.cpp \ + UUID.cpp \ UserID.cpp \ UserSettingsController.cpp \ - UUID.cpp \ + VMRange.cpp \ Value.cpp \ ValueObject.cpp \ ValueObjectCast.cpp \ @@ -76,8 +77,7 @@ SRCS= Address.cpp \ ValueObjectMemory.cpp \ ValueObjectRegister.cpp \ ValueObjectSyntheticFilter.cpp \ - ValueObjectVariable.cpp \ - VMRange.cpp + ValueObjectVariable.cpp TGHDRS= AttrList \ Attrs \ diff --git a/lib/clang/liblldbExpression/Makefile b/lib/clang/liblldbExpression/Makefile index af6635d2a856..cf105c4a7d12 100644 --- a/lib/clang/liblldbExpression/Makefile +++ b/lib/clang/liblldbExpression/Makefile @@ -6,6 +6,7 @@ LIB= lldbExpression SRCDIR= tools/lldb/source/Expression SRCS= DWARFExpression.cpp \ + DiagnosticManager.cpp \ Expression.cpp \ ExpressionSourceCode.cpp \ ExpressionVariable.cpp \ diff --git a/lib/clang/liblldbHostCommon/Makefile b/lib/clang/liblldbHostCommon/Makefile index 706ea1f8f0ab..8393310ec409 100644 --- a/lib/clang/liblldbHostCommon/Makefile +++ b/lib/clang/liblldbHostCommon/Makefile @@ -8,6 +8,7 @@ SRCDIR= tools/lldb/source/Host/common SRCS= Condition.cpp \ Editline.cpp \ File.cpp \ + FileCache.cpp \ FileSpec.cpp \ FileSystem.cpp \ GetOptInc.cpp \ @@ -20,7 +21,13 @@ SRCS= Condition.cpp \ LockFileBase.cpp \ MonitoringProcessLauncher.cpp \ Mutex.cpp \ + NativeBreakpoint.cpp \ + NativeBreakpointList.cpp \ + NativeProcessProtocol.cpp \ NativeRegisterContext.cpp \ + NativeRegisterContextRegisterInfo.cpp \ + NativeThreadProtocol.cpp \ + NativeWatchpointList.cpp \ OptionParser.cpp \ PipeBase.cpp \ ProcessRunLock.cpp \ @@ -34,8 +41,8 @@ SRCS= Condition.cpp \ ThisThread.cpp \ ThreadLauncher.cpp \ TimeValue.cpp \ - XML.cpp \ - UDPSocket.cpp + UDPSocket.cpp \ + XML.cpp TGHDRS= AttrList \ Attrs \ diff --git a/lib/clang/liblldbHostPOSIX/Makefile b/lib/clang/liblldbHostPOSIX/Makefile index d6e275c19b8a..e83ed7099c28 100644 --- a/lib/clang/liblldbHostPOSIX/Makefile +++ b/lib/clang/liblldbHostPOSIX/Makefile @@ -12,6 +12,7 @@ SRCS= ConnectionFileDescriptorPosix.cpp \ HostProcessPosix.cpp \ HostThreadPosix.cpp \ LockFilePosix.cpp \ + MainLoopPosix.cpp \ PipePosix.cpp \ ProcessLauncherPosix.cpp diff --git a/lib/clang/liblldbInterpreter/Makefile b/lib/clang/liblldbInterpreter/Makefile index cf7d28e381ad..d0a71784a26b 100644 --- a/lib/clang/liblldbInterpreter/Makefile +++ b/lib/clang/liblldbInterpreter/Makefile @@ -6,6 +6,7 @@ LIB= lldbInterpreter SRCDIR= tools/lldb/source/Interpreter SRCS= Args.cpp \ + CommandAlias.cpp \ CommandHistory.cpp \ CommandInterpreter.cpp \ CommandObject.cpp \ @@ -23,6 +24,8 @@ SRCS= Args.cpp \ OptionGroupUInt64.cpp \ OptionGroupUUID.cpp \ OptionGroupValueObjectDisplay.cpp \ + OptionGroupVariable.cpp \ + OptionGroupWatchpoint.cpp \ OptionValue.cpp \ OptionValueArch.cpp \ OptionValueArgs.cpp \ @@ -43,8 +46,6 @@ SRCS= Args.cpp \ OptionValueString.cpp \ OptionValueUInt64.cpp \ OptionValueUUID.cpp \ - OptionGroupVariable.cpp \ - OptionGroupWatchpoint.cpp \ Options.cpp \ Property.cpp \ ScriptInterpreter.cpp diff --git a/lib/clang/liblldbPluginLanguageCPlusPlus/Makefile b/lib/clang/liblldbPluginCPlusPlusLanguage/Makefile similarity index 57% rename from lib/clang/liblldbPluginLanguageCPlusPlus/Makefile rename to lib/clang/liblldbPluginCPlusPlusLanguage/Makefile index 6382609eb484..817578c8e43f 100644 --- a/lib/clang/liblldbPluginLanguageCPlusPlus/Makefile +++ b/lib/clang/liblldbPluginCPlusPlusLanguage/Makefile @@ -2,12 +2,14 @@ .include -LIB= lldbPluginLanguageCPlusPlus +LIB= lldbPluginCPlusPlusLanguage -SRCDIR= tools/lldb/source/Plugins/Language/CPlusPlus/ -SRCS= CPlusPlusLanguage.cpp \ +SRCDIR= tools/lldb/source/Plugins/Language/CPlusPlus +SRCS= BlockPointer.cpp \ + CPlusPlusLanguage.cpp \ CxxStringTypes.cpp \ LibCxx.cpp \ + LibCxxAtomic.cpp \ LibCxxInitializerList.cpp \ LibCxxList.cpp \ LibCxxMap.cpp \ @@ -15,7 +17,9 @@ SRCS= CPlusPlusLanguage.cpp \ LibCxxVector.cpp \ LibStdcpp.cpp -TGHDRS= CommentCommandList \ +TGHDRS= AttrList \ + Attrs \ + CommentCommandList \ DeclNodes \ DiagnosticCommonKinds \ StmtNodes diff --git a/lib/clang/liblldbPluginLanguageCPlusPlus/Makefile.depend b/lib/clang/liblldbPluginCPlusPlusLanguage/Makefile.depend similarity index 100% rename from lib/clang/liblldbPluginLanguageCPlusPlus/Makefile.depend rename to lib/clang/liblldbPluginCPlusPlusLanguage/Makefile.depend diff --git a/lib/clang/liblldbPluginExpressionParserClang/Makefile b/lib/clang/liblldbPluginExpressionParserClang/Makefile index 2f27613cabe5..b3958cf7cc1e 100644 --- a/lib/clang/liblldbPluginExpressionParserClang/Makefile +++ b/lib/clang/liblldbPluginExpressionParserClang/Makefile @@ -25,6 +25,7 @@ TGHDRS= Attributes \ Attrs \ CommentCommandList \ DeclNodes \ + DiagnosticASTKinds \ DiagnosticCommonKinds \ DiagnosticFrontendKinds \ DiagnosticSemaKinds \ diff --git a/lib/clang/liblldbPluginLanguageObjC/Makefile b/lib/clang/liblldbPluginObjCLanguage/Makefile similarity index 93% rename from lib/clang/liblldbPluginLanguageObjC/Makefile rename to lib/clang/liblldbPluginObjCLanguage/Makefile index 8653e75e3e8e..40b3cdebe637 100644 --- a/lib/clang/liblldbPluginLanguageObjC/Makefile +++ b/lib/clang/liblldbPluginObjCLanguage/Makefile @@ -2,7 +2,7 @@ .include -LIB= lldbPluginLanguageObjC +LIB= lldbPluginObjCLanguage SRCDIR= tools/lldb/source/Plugins/Language/ObjC/ SRCS= CF.cpp \ diff --git a/lib/clang/liblldbPluginLanguageObjC/Makefile.depend b/lib/clang/liblldbPluginObjCLanguage/Makefile.depend similarity index 100% rename from lib/clang/liblldbPluginLanguageObjC/Makefile.depend rename to lib/clang/liblldbPluginObjCLanguage/Makefile.depend diff --git a/lib/clang/liblldbPluginProcessElfCore/Makefile b/lib/clang/liblldbPluginProcessElfCore/Makefile index e8fc69875c66..e77053403aa1 100644 --- a/lib/clang/liblldbPluginProcessElfCore/Makefile +++ b/lib/clang/liblldbPluginProcessElfCore/Makefile @@ -9,13 +9,13 @@ CFLAGS+=-I${.CURDIR}/../../../contrib/llvm/tools/lldb/source/Plugins/Process/Uti SRCDIR= tools/lldb/source/Plugins/Process/elf-core SRCS= ProcessElfCore.cpp \ - ThreadElfCore.cpp \ RegisterContextPOSIXCore_arm.cpp \ RegisterContextPOSIXCore_arm64.cpp \ RegisterContextPOSIXCore_mips64.cpp \ RegisterContextPOSIXCore_powerpc.cpp \ - RegisterContextPOSIXCore_x86_64.cpp - + RegisterContextPOSIXCore_x86_64.cpp \ + ThreadElfCore.cpp + TGHDRS= DiagnosticCommonKinds \ DeclNodes \ StmtNodes \ diff --git a/lib/clang/liblldbPluginProcessFreeBSD/Makefile b/lib/clang/liblldbPluginProcessFreeBSD/Makefile index d9444eefb984..037d97639d17 100644 --- a/lib/clang/liblldbPluginProcessFreeBSD/Makefile +++ b/lib/clang/liblldbPluginProcessFreeBSD/Makefile @@ -11,9 +11,9 @@ CFLAGS+=-I${.CURDIR}/../../../contrib/llvm/tools/lldb/source/Plugins/Process/Uti SRCDIR= tools/lldb/source/Plugins/Process/FreeBSD SRCS= FreeBSDThread.cpp \ + POSIXStopInfo.cpp \ ProcessFreeBSD.cpp \ ProcessMonitor.cpp \ - POSIXStopInfo.cpp \ RegisterContextPOSIXProcessMonitor_arm.cpp \ RegisterContextPOSIXProcessMonitor_arm64.cpp \ RegisterContextPOSIXProcessMonitor_mips64.cpp \ diff --git a/lib/clang/liblldbPluginProcessUtility/Makefile b/lib/clang/liblldbPluginProcessUtility/Makefile index 4a5e340fc467..8e7af94bd760 100644 --- a/lib/clang/liblldbPluginProcessUtility/Makefile +++ b/lib/clang/liblldbPluginProcessUtility/Makefile @@ -26,16 +26,16 @@ SRCS= DynamicRegisterInfo.cpp \ RegisterContextFreeBSD_powerpc.cpp \ RegisterContextFreeBSD_x86_64.cpp \ RegisterContextHistory.cpp \ + RegisterContextLLDB.cpp \ RegisterContextLinux_arm.cpp \ RegisterContextLinux_arm64.cpp \ RegisterContextLinux_i386.cpp \ RegisterContextLinux_mips.cpp \ RegisterContextLinux_x86_64.cpp \ - RegisterContextLLDB.cpp \ + RegisterContextMacOSXFrameBackchain.cpp \ RegisterContextMach_arm.cpp \ RegisterContextMach_i386.cpp \ RegisterContextMach_x86_64.cpp \ - RegisterContextMacOSXFrameBackchain.cpp \ RegisterContextMemory.cpp \ RegisterContextPOSIX_arm.cpp \ RegisterContextPOSIX_arm64.cpp \ diff --git a/lib/clang/liblldbPluginSymbolFileDWARF/Makefile b/lib/clang/liblldbPluginSymbolFileDWARF/Makefile index 0d2409e70ee9..8a73597d84e1 100644 --- a/lib/clang/liblldbPluginSymbolFileDWARF/Makefile +++ b/lib/clang/liblldbPluginSymbolFileDWARF/Makefile @@ -6,35 +6,35 @@ LIB= lldbPluginSymbolFileDWARF SRCDIR= tools/lldb/source/Plugins/SymbolFile/DWARF SRCS= DIERef.cpp \ - DWARFAbbreviationDeclaration.cpp \ DWARFASTParserClang.cpp \ DWARFASTParserGo.cpp \ + DWARFAbbreviationDeclaration.cpp \ DWARFAttribute.cpp \ DWARFCompileUnit.cpp \ + DWARFDIE.cpp \ + DWARFDIECollection.cpp \ DWARFDataExtractor.cpp \ DWARFDebugAbbrev.cpp \ - DWARFDebugAranges.cpp \ DWARFDebugArangeSet.cpp \ + DWARFDebugAranges.cpp \ DWARFDebugInfo.cpp \ DWARFDebugInfoEntry.cpp \ - DWARFDebugMacro.cpp \ DWARFDebugLine.cpp \ DWARFDebugMacinfo.cpp \ DWARFDebugMacinfoEntry.cpp \ + DWARFDebugMacro.cpp \ DWARFDebugPubnames.cpp \ DWARFDebugPubnamesSet.cpp \ DWARFDebugRanges.cpp \ DWARFDeclContext.cpp \ DWARFDefines.cpp \ - DWARFDIE.cpp \ - DWARFDIECollection.cpp \ DWARFFormValue.cpp \ - LogChannelDWARF.cpp \ HashedNameToDIE.cpp \ + LogChannelDWARF.cpp \ NameToDIE.cpp \ SymbolFileDWARF.cpp \ - SymbolFileDWARFDwo.cpp \ SymbolFileDWARFDebugMap.cpp \ + SymbolFileDWARFDwo.cpp \ UniqueDWARFASTType.cpp TGHDRS= AttrList \ diff --git a/lib/clang/liblldbPluginSymbolFilePDB/Makefile b/lib/clang/liblldbPluginSymbolFilePDB/Makefile new file mode 100644 index 000000000000..6b952a96dec8 --- /dev/null +++ b/lib/clang/liblldbPluginSymbolFilePDB/Makefile @@ -0,0 +1,18 @@ +# $FreeBSD$ + +.include + +LIB= lldbPluginSymbolFilePDB + +SRCDIR= tools/lldb/source/Plugins/SymbolFile/PDB +SRCS= PDBASTParser.cpp \ + SymbolFilePDB.cpp + +TGHDRS= AttrList \ + Attrs \ + CommentCommandList \ + DeclNodes \ + DiagnosticCommonKinds \ + StmtNodes + +.include "../lldb.lib.mk" diff --git a/lib/clang/liblldbSymbol/Makefile b/lib/clang/liblldbSymbol/Makefile index 0cc7a75a5052..05f74c519b5f 100644 --- a/lib/clang/liblldbSymbol/Makefile +++ b/lib/clang/liblldbSymbol/Makefile @@ -11,16 +11,17 @@ SRCS= ArmUnwindInfo.cpp \ ClangASTImporter.cpp \ ClangExternalASTSourceCallbacks.cpp \ ClangExternalASTSourceCommon.cpp \ + ClangUtil.cpp \ + CompactUnwindInfo.cpp \ + CompileUnit.cpp \ CompilerDecl.cpp \ CompilerDeclContext.cpp \ CompilerType.cpp \ - CompactUnwindInfo.cpp \ - DebugMacros.cpp \ - CompileUnit.cpp \ - Declaration.cpp \ DWARFCallFrameInfo.cpp \ - Function.cpp \ + DebugMacros.cpp \ + Declaration.cpp \ FuncUnwinders.cpp \ + Function.cpp \ GoASTContext.cpp \ LineEntry.cpp \ LineTable.cpp \ diff --git a/usr.bin/clang/lldb/Makefile b/usr.bin/clang/lldb/Makefile index b2c905045580..915600db115d 100644 --- a/usr.bin/clang/lldb/Makefile +++ b/usr.bin/clang/lldb/Makefile @@ -23,62 +23,61 @@ LIBADD+= edit panel ncursesw execinfo z LLDB_LIBS=\ lldb \ - \ lldbAPI \ lldbBreakpoint \ lldbCommands \ - lldbCore \ lldbDataFormatters \ - lldbExpression \ - lldbHostFreeBSD \ lldbHostCommon \ + lldbHostFreeBSD \ lldbHostPOSIX \ + lldbCore \ + lldbExpression \ lldbInitialization \ lldbInterpreter \ lldbSymbol \ lldbTarget \ lldbUtility \ \ + lldbPluginDisassemblerLLVM \ + lldbPluginSymbolFileDWARF \ + lldbPluginSymbolFilePDB \ + lldbPluginSymbolFileSymtab \ + lldbPluginDynamicLoaderStatic \ + lldbPluginDynamicLoaderPosixDYLD \ + lldbPluginCPlusPlusLanguage \ + lldbPluginObjCLanguage \ + lldbPluginObjectFileELF \ + lldbPluginObjectFileJIT \ + lldbPluginSymbolVendorELF \ + lldbPluginProcessGDBRemote \ + lldbPluginProcessUtility \ + lldbPluginPlatformGDB \ + lldbPluginPlatformFreeBSD \ + lldbPluginObjectContainerBSDArchive \ + lldbPluginUnwindAssemblyInstEmulation \ + lldbPluginUnwindAssemblyX86 \ + lldbPluginCXXItaniumABI \ lldbPluginABISysV_arm \ lldbPluginABISysV_arm64 \ lldbPluginABISysV_i386 \ - lldbPluginABISysV_mips \ - lldbPluginABISysV_mips64 \ + lldbPluginABISysV_x86_64 \ lldbPluginABISysV_ppc \ lldbPluginABISysV_ppc64 \ - lldbPluginABISysV_x86_64 \ - lldbPluginCXXItaniumABI \ - lldbPluginDisassemblerLLVM \ - lldbPluginExpressionParserClang \ - lldbPluginExpressionParserGo \ + lldbPluginABISysV_mips \ + lldbPluginABISysV_mips64 \ lldbPluginInstructionARM \ lldbPluginInstructionARM64 \ lldbPluginInstructionMIPS \ lldbPluginInstructionMIPS64 \ - lldbPluginInstrumentationRuntimeAddressSanitizer \ - lldbPluginJITLoaderGDB \ - lldbPluginLanguageCPlusPlus \ - lldbPluginLanguageObjC \ - lldbPluginSymbolFileDWARF \ - lldbPluginSymbolFileSymtab \ - lldbPluginDynamicLoaderStatic \ - lldbPluginDynamicLoaderPosixDYLD \ lldbPluginMemoryHistoryASan \ - lldbPluginObjectContainerBSDArchive \ - lldbPluginObjectFileELF \ - lldbPluginObjectFileJIT \ - lldbPluginScriptInterpreterNone \ - lldbPluginSymbolVendorELF \ - lldbPluginPlatformFreeBSD \ - lldbPluginPlatformGDB \ + lldbPluginInstrumentationRuntimeAddressSanitizer \ lldbPluginProcessElfCore \ + lldbPluginJITLoaderGDB \ + lldbPluginExpressionParserClang \ + lldbPluginExpressionParserGo \ lldbPluginProcessFreeBSD \ - lldbPluginProcessGDBRemote \ - lldbPluginProcessUtility \ lldbPluginProcessPOSIX \ - lldbPluginProcessFreeBSD \ - lldbPluginUnwindAssemblyInstEmulation \ - lldbPluginUnwindAssemblyX86 + lldbPluginScriptInterpreterNone LDADD+= -Wl,--start-group .for lib in ${LLDB_LIBS} @@ -89,82 +88,88 @@ LDADD+= -Wl,--end-group # Clang and LLVM libraries LIBDEPS=\ + clangcodegen \ + clangrewritefrontend \ + llvmaarch64codegen \ + llvmaarch64asmparser \ + llvmaarch64disassembler \ + llvmarmcodegen \ + llvmarmasmparser \ + llvmarmdisassembler \ + llvmmipscodegen \ + llvmmipsasmparser \ + llvmmipsdesc \ + llvmmipsdisassembler \ + llvmpowerpccodegen \ + llvmpowerpcasmparser \ + llvmpowerpcdesc \ + llvmpowerpcdisassembler \ + llvmsparccodegen \ + llvmsparcasmparser \ + llvmsparcdesc \ + llvmsparcdisassembler \ + llvmx86codegen \ + llvmx86asmparser \ + llvmx86desc \ + llvmx86disassembler \ + llvminterpreter \ + llvmipo \ + llvmselectiondag \ + llvmmcjit \ + llvmexecutionengine \ + llvmruntimedyld \ + llvmcoverage \ + llvmglobalisel \ + llvmaarch64desc \ + llvmaarch64asmprinter \ + llvmaarch64info \ + llvmaarch64utils \ + llvmarmdesc \ + llvmarmasmprinter \ + llvmarminfo \ + llvmmipsasmprinter \ + llvmmipsinfo \ + llvmpowerpcasmprinter \ + llvmpowerpcinfo \ + llvmsparcasmprinter \ + llvmsparcinfo \ + llvmasmprinter \ + llvmx86asmprinter \ + llvmx86utils \ + llvmx86info \ + llvmmcdisassembler \ + llvmcodegen \ + llvmdebuginfopdb \ + llvmdebuginfocodeview \ + llvmbitwriter \ + llvmvectorize \ + llvmscalaropts \ + llvmtarget \ + llvmobject \ + llvminstrumentation \ + llvmirreader \ + llvmasmparser \ + llvminstcombine \ + llvmlinker \ + llvmobjcarcopts \ + llvmtransformutils \ + llvmanalysis \ clangfrontend \ clangdriver \ - clangserialization \ - clangcodegen \ + llvmoption \ clangparse \ + llvmmcparser \ + clangserialization \ + llvmbitreader \ clangsema \ clanganalysis \ clangedit \ clangast \ + llvmprofiledata \ + clangrewrite \ clanglex \ clangbasic \ - \ - llvmoption \ - llvmobjcarcopts \ - llvmlinker \ - llvmmcjit \ - llvmruntimedyld \ - llvmexecutionengine \ - llvmirreader \ - llvmipo \ - llvmvectorize \ - llvmbitwriter \ - llvmasmparser \ - llvmaarch64disassembler \ - llvmaarch64codegen \ - llvmaarch64asmparser \ - llvmaarch64desc \ - llvmaarch64info \ - llvmaarch64asmprinter \ - llvmaarch64utils \ - llvmarmdisassembler \ - llvmarmcodegen \ - llvmarmasmparser \ - llvmarmdesc \ - llvmarminfo \ - llvmarmasmprinter \ - llvmmipsdisassembler \ - llvmmipscodegen \ - llvmmipsasmparser \ - llvmmipsdesc \ - llvmmipsinfo \ - llvmmipsasmprinter \ - llvmpowerpcdisassembler \ - llvmpowerpccodegen \ - llvmpowerpcasmparser \ - llvmpowerpcdesc \ - llvmpowerpcinfo \ - llvmpowerpcasmprinter \ - llvmsparcdisassembler \ - llvmsparccodegen \ - llvmsparcasmparser \ - llvmsparcdesc \ - llvmsparcinfo \ - llvmsparcasmprinter \ - llvmx86disassembler \ - llvmx86asmparser \ - llvmx86codegen \ - llvmselectiondag \ - llvmasmprinter \ - llvmcodegen \ - llvmtarget \ - llvmscalaropts \ - llvmprofiledata \ - llvminstcombine \ - llvmtransformutils \ - llvmanalysis \ - llvminstrumentation \ - llvmx86desc \ - llvmobject \ - llvmmcparser \ - llvmbitreader \ - llvmmcdisassembler \ - llvmx86info \ - llvmx86asmprinter \ llvmmc \ - llvmx86utils \ llvmcore \ llvmsupport