diff options
| author | Peter Collingbourne <peter@pcc.me.uk> | 2011-05-19 17:34:40 +0000 |
|---|---|---|
| committer | Peter Collingbourne <peter@pcc.me.uk> | 2011-05-19 17:34:40 +0000 |
| commit | a09bfcaed488f522ef618b0b023422902f197ff2 (patch) | |
| tree | 4f8e40b250ba5986e97ed11e85961e5b5f972817 | |
| parent | 59b523169f78c87b4dd8576fc507e314435fb876 (diff) | |
| download | bcm5719-llvm-a09bfcaed488f522ef618b0b023422902f197ff2.tar.gz bcm5719-llvm-a09bfcaed488f522ef618b0b023422902f197ff2.zip | |
Initialise the Darwin ABI plugins only on Darwin
llvm-svn: 131645
| -rw-r--r-- | lldb/source/lldb.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lldb/source/lldb.cpp b/lldb/source/lldb.cpp index c8ab895a5f0..c941b420116 100644 --- a/lldb/source/lldb.cpp +++ b/lldb/source/lldb.cpp @@ -22,6 +22,7 @@ #include "llvm/ADT/StringRef.h" +#include "Plugins/ABI/SysV-x86_64/ABISysV_x86_64.h" #include "Plugins/Disassembler/llvm/DisassemblerLLVM.h" #include "Plugins/Instruction/ARM/EmulateInstructionARM.h" #include "Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.h" @@ -36,7 +37,6 @@ #if defined (__APPLE__) #include "Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.h" #include "Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.h" -#include "Plugins/ABI/SysV-x86_64/ABISysV_x86_64.h" #include "Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.h" #include "Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.h" #include "Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.h" @@ -77,6 +77,7 @@ lldb_private::Initialize () Timer::Initialize (); Timer scoped_timer (__PRETTY_FUNCTION__, __PRETTY_FUNCTION__); + ABISysV_x86_64::Initialize(); DisassemblerLLVM::Initialize(); ObjectContainerBSDArchive::Initialize(); ObjectFileELF::Initialize(); @@ -85,14 +86,13 @@ lldb_private::Initialize () UnwindAssemblyInstEmulation::Initialize(); UnwindAssembly_x86::Initialize(); EmulateInstructionARM::Initialize (); - ABIMacOSX_i386::Initialize(); - ABIMacOSX_arm::Initialize(); - ABISysV_x86_64::Initialize(); #if defined (__APPLE__) //---------------------------------------------------------------------- // Apple/Darwin hosted plugins //---------------------------------------------------------------------- + ABIMacOSX_i386::Initialize(); + ABIMacOSX_arm::Initialize(); DynamicLoaderMacOSXDYLD::Initialize(); SymbolFileDWARFDebugMap::Initialize(); ItaniumABILanguageRuntime::Initialize(); @@ -144,6 +144,7 @@ lldb_private::Terminate () // Terminate and unload and loaded system or user LLDB plug-ins PluginManager::Terminate(); + ABISysV_x86_64::Terminate(); DisassemblerLLVM::Terminate(); ObjectContainerBSDArchive::Terminate(); ObjectFileELF::Terminate(); @@ -152,11 +153,10 @@ lldb_private::Terminate () UnwindAssembly_x86::Terminate(); UnwindAssemblyInstEmulation::Terminate(); EmulateInstructionARM::Terminate (); - ABIMacOSX_i386::Terminate(); - ABIMacOSX_arm::Terminate(); - ABISysV_x86_64::Terminate(); #if defined (__APPLE__) + ABIMacOSX_i386::Terminate(); + ABIMacOSX_arm::Terminate(); DynamicLoaderMacOSXDYLD::Terminate(); SymbolFileDWARFDebugMap::Terminate(); ItaniumABILanguageRuntime::Terminate(); |
