diff options
Diffstat (limited to 'source/Initialization/SystemInitializerCommon.cpp')
| -rw-r--r-- | source/Initialization/SystemInitializerCommon.cpp | 27 | 
1 files changed, 19 insertions, 8 deletions
diff --git a/source/Initialization/SystemInitializerCommon.cpp b/source/Initialization/SystemInitializerCommon.cpp index 51f32a2776a85..6cbc0b707df4b 100644 --- a/source/Initialization/SystemInitializerCommon.cpp +++ b/source/Initialization/SystemInitializerCommon.cpp @@ -13,8 +13,8 @@  #include "lldb/Host/HostInfo.h"  #include "lldb/Core/Log.h"  #include "lldb/Core/Timer.h" -#include "lldb/Interpreter/ScriptInterpreterPython.h" - +#include "lldb/Symbol/GoASTContext.h" +#include "lldb/Symbol/ClangASTContext.h"  #include "Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.h"  #include "Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.h"  #include "Plugins/DynamicLoader/Windows-DYLD/DynamicLoaderWindowsDYLD.h" @@ -26,17 +26,19 @@  #include "Plugins/ObjectFile/ELF/ObjectFileELF.h"  #include "Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h"  #include "Plugins/OperatingSystem/Python/OperatingSystemPython.h" +#include "Plugins/OperatingSystem/Go/OperatingSystemGo.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/PlatformiOSSimulator.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/Process/gdb-remote/ProcessGDBRemoteLog.h"  #if defined(__APPLE__) +#include "Plugins/Platform/MacOSX/PlatformiOSSimulator.h"  #include "Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.h"  #include "Plugins/ObjectFile/Mach-O/ObjectFileMachO.h"  #include "Plugins/Platform/MacOSX/PlatformDarwinKernel.h" @@ -48,7 +50,7 @@  #if defined(_MSC_VER)  #include "lldb/Host/windows/windows.h" -#include "Plugins/Process/Windows/ProcessWindowsLog.h" +#include "Plugins/Process/Windows/Common/ProcessWindowsLog.h"  #endif  #include "llvm/Support/TargetSelect.h" @@ -103,6 +105,9 @@ SystemInitializerCommon::Initialize()      process_gdb_remote::ProcessGDBRemoteLog::Initialize();      // Initialize plug-ins +    ClangASTContext::Initialize(); +    GoASTContext::Initialize(); +      ObjectContainerBSDArchive::Initialize();      ObjectFileELF::Initialize();      ObjectFilePECOFF::Initialize(); @@ -110,6 +115,7 @@ SystemInitializerCommon::Initialize()      DynamicLoaderWindowsDYLD::Initialize();      platform_freebsd::PlatformFreeBSD::Initialize();      platform_linux::PlatformLinux::Initialize(); +    platform_netbsd::PlatformNetBSD::Initialize();      PlatformWindows::Initialize();      PlatformKalimba::Initialize();      platform_android::PlatformAndroid::Initialize(); @@ -126,9 +132,9 @@ SystemInitializerCommon::Initialize()      PlatformRemoteiOS::Initialize();      PlatformMacOSX::Initialize(); -    PlatformiOSSimulator::Initialize();  #if defined(__APPLE__) +    PlatformiOSSimulator::Initialize();      DynamicLoaderDarwinKernel::Initialize();      PlatformDarwinKernel::Initialize();      ObjectFileMachO::Initialize(); @@ -141,9 +147,9 @@ SystemInitializerCommon::Initialize()      ProcessWindowsLog::Initialize();  #endif  #ifndef LLDB_DISABLE_PYTHON -    ScriptInterpreterPython::InitializePrivate();      OperatingSystemPython::Initialize();  #endif +    OperatingSystemGo::Initialize();  }  void @@ -157,6 +163,7 @@ SystemInitializerCommon::Terminate()      DynamicLoaderWindowsDYLD::Terminate();      platform_freebsd::PlatformFreeBSD::Terminate();      platform_linux::PlatformLinux::Terminate(); +    platform_netbsd::PlatformNetBSD::Terminate();      PlatformWindows::Terminate();      PlatformKalimba::Terminate();      platform_android::PlatformAndroid::Terminate(); @@ -164,25 +171,29 @@ SystemInitializerCommon::Terminate()      ObjectContainerUniversalMachO::Terminate();      PlatformMacOSX::Terminate();      PlatformRemoteiOS::Terminate(); -    PlatformiOSSimulator::Terminate(); + +    ClangASTContext::Terminate(); +    GoASTContext::Terminate();      EmulateInstructionARM::Terminate();      EmulateInstructionMIPS::Terminate();      EmulateInstructionMIPS64::Terminate();  #if defined(__APPLE__) +    PlatformiOSSimulator::Terminate();      DynamicLoaderDarwinKernel::Terminate();      ObjectFileMachO::Terminate();      PlatformDarwinKernel::Terminate();  #endif -#if defined(__WIN32__) +#if defined(_MSC_VER)      ProcessWindowsLog::Terminate();  #endif  #ifndef LLDB_DISABLE_PYTHON      OperatingSystemPython::Terminate();  #endif +    OperatingSystemGo::Terminate();      Log::Terminate();  }  | 
