diff options
| -rw-r--r-- | lldb/source/API/SystemInitializerFull.cpp | 8 | ||||
| -rw-r--r-- | lldb/source/Initialization/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | lldb/source/Initialization/SystemInitializerCommon.cpp | 11 |
3 files changed, 8 insertions, 13 deletions
diff --git a/lldb/source/API/SystemInitializerFull.cpp b/lldb/source/API/SystemInitializerFull.cpp index 74d12c5e8f4..8e5e1a865ed 100644 --- a/lldb/source/API/SystemInitializerFull.cpp +++ b/lldb/source/API/SystemInitializerFull.cpp @@ -58,6 +58,8 @@ #include "Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h" #include "Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.h" #include "Plugins/MemoryHistory/asan/MemoryHistoryASan.h" +#include "Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.h" +#include "Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.h" #include "Plugins/ObjectFile/Breakpad/ObjectFileBreakpad.h" #include "Plugins/ObjectFile/ELF/ObjectFileELF.h" #include "Plugins/ObjectFile/Mach-O/ObjectFileMachO.h" @@ -129,6 +131,9 @@ llvm::Error SystemInitializerFull::Initialize() { ObjectFileMachO::Initialize(); ObjectFilePECOFF::Initialize(); + ObjectContainerBSDArchive::Initialize(); + ObjectContainerUniversalMachO::Initialize(); + ScriptInterpreterNone::Initialize(); #ifndef LLDB_DISABLE_PYTHON @@ -360,6 +365,9 @@ void SystemInitializerFull::Terminate() { ObjectFileMachO::Terminate(); ObjectFilePECOFF::Terminate(); + ObjectContainerBSDArchive::Terminate(); + ObjectContainerUniversalMachO::Terminate(); + // Now shutdown the common parts, in reverse order. SystemInitializerCommon::Terminate(); } diff --git a/lldb/source/Initialization/CMakeLists.txt b/lldb/source/Initialization/CMakeLists.txt index f8ee7c64cbb..7e8e26834aa 100644 --- a/lldb/source/Initialization/CMakeLists.txt +++ b/lldb/source/Initialization/CMakeLists.txt @@ -17,8 +17,6 @@ add_lldb_library(lldbInitialization lldbPluginInstructionARM lldbPluginInstructionMIPS lldbPluginInstructionMIPS64 - lldbPluginObjectContainerBSDArchive - lldbPluginObjectContainerMachOArchive lldbPluginProcessGDBRemote ${EXTRA_PLUGINS} ${LLDB_SYSTEM_LIBS} diff --git a/lldb/source/Initialization/SystemInitializerCommon.cpp b/lldb/source/Initialization/SystemInitializerCommon.cpp index 7ada7567f11..562adeec2f9 100644 --- a/lldb/source/Initialization/SystemInitializerCommon.cpp +++ b/lldb/source/Initialization/SystemInitializerCommon.cpp @@ -11,8 +11,6 @@ #include "Plugins/Instruction/ARM/EmulateInstructionARM.h" #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/Process/gdb-remote/ProcessGDBRemoteLog.h" #include "lldb/Host/FileSystem.h" #include "lldb/Host/Host.h" @@ -101,16 +99,10 @@ llvm::Error SystemInitializerCommon::Initialize() { process_gdb_remote::ProcessGDBRemoteLog::Initialize(); - // Initialize plug-ins - ObjectContainerBSDArchive::Initialize(); - EmulateInstructionARM::Initialize(); EmulateInstructionMIPS::Initialize(); EmulateInstructionMIPS64::Initialize(); - // Apple/Darwin hosted plugins - ObjectContainerUniversalMachO::Initialize(); - #if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) ProcessPOSIXLog::Initialize(); #endif @@ -124,14 +116,11 @@ llvm::Error SystemInitializerCommon::Initialize() { void SystemInitializerCommon::Terminate() { static Timer::Category func_cat(LLVM_PRETTY_FUNCTION); Timer scoped_timer(func_cat, LLVM_PRETTY_FUNCTION); - ObjectContainerBSDArchive::Terminate(); EmulateInstructionARM::Terminate(); EmulateInstructionMIPS::Terminate(); EmulateInstructionMIPS64::Terminate(); - ObjectContainerUniversalMachO::Terminate(); - #if defined(_MSC_VER) ProcessWindowsLog::Terminate(); #endif |
