diff options
| -rw-r--r-- | lldb/source/API/SystemInitializerFull.cpp | 12 | ||||
| -rw-r--r-- | lldb/source/Initialization/SystemInitializerCommon.cpp | 11 |
2 files changed, 12 insertions, 11 deletions
diff --git a/lldb/source/API/SystemInitializerFull.cpp b/lldb/source/API/SystemInitializerFull.cpp index bf445c9b0c1..5cf4b659c36 100644 --- a/lldb/source/API/SystemInitializerFull.cpp +++ b/lldb/source/API/SystemInitializerFull.cpp @@ -57,6 +57,8 @@ #include "Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h" #include "Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.h" #include "Plugins/MemoryHistory/asan/MemoryHistoryASan.h" +#include "Plugins/OperatingSystem/Python/OperatingSystemPython.h" +#include "Plugins/OperatingSystem/Go/OperatingSystemGo.h" #include "Plugins/Platform/gdb-server/PlatformRemoteGDBServer.h" #include "Plugins/Process/elf-core/ProcessElfCore.h" #include "Plugins/Process/gdb-remote/ProcessGDBRemote.h" @@ -259,6 +261,11 @@ SystemInitializerFull::Initialize() SystemInitializerCommon::Initialize(); ScriptInterpreterNone::Initialize(); +#ifndef LLDB_DISABLE_PYTHON + OperatingSystemPython::Initialize(); +#endif + OperatingSystemGo::Initialize(); + #if !defined(LLDB_DISABLE_PYTHON) InitializeSWIG(); @@ -462,6 +469,11 @@ SystemInitializerFull::Terminate() process_gdb_remote::ProcessGDBRemote::Terminate(); DynamicLoaderStatic::Terminate(); +#ifndef LLDB_DISABLE_PYTHON + OperatingSystemPython::Terminate(); +#endif + OperatingSystemGo::Terminate(); + // Now shutdown the common parts, in reverse order. SystemInitializerCommon::Terminate(); } diff --git a/lldb/source/Initialization/SystemInitializerCommon.cpp b/lldb/source/Initialization/SystemInitializerCommon.cpp index d63b19b8398..e80ae80ba1c 100644 --- a/lldb/source/Initialization/SystemInitializerCommon.cpp +++ b/lldb/source/Initialization/SystemInitializerCommon.cpp @@ -25,8 +25,6 @@ #include "Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.h" #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" @@ -145,10 +143,6 @@ SystemInitializerCommon::Initialize() #if defined(_MSC_VER) ProcessWindowsLog::Initialize(); #endif -#ifndef LLDB_DISABLE_PYTHON - OperatingSystemPython::Initialize(); -#endif - OperatingSystemGo::Initialize(); } void @@ -189,11 +183,6 @@ SystemInitializerCommon::Terminate() ProcessWindowsLog::Terminate(); #endif -#ifndef LLDB_DISABLE_PYTHON - OperatingSystemPython::Terminate(); -#endif - OperatingSystemGo::Terminate(); - HostInfo::Terminate(); Log::Terminate(); } |
