diff options
| author | Peter Collingbourne <peter@pcc.me.uk> | 2011-05-19 18:32:34 +0000 |
|---|---|---|
| committer | Peter Collingbourne <peter@pcc.me.uk> | 2011-05-19 18:32:34 +0000 |
| commit | 1b27dac25336bf99098f6e4159c266ea8628a2b6 (patch) | |
| tree | 1330586cfa85c259c447389b2f9ab14e4864f271 | |
| parent | 05fd5aa1d0d2ca5fa4b6d2b8edd164ab1a6e333c (diff) | |
| download | bcm5719-llvm-1b27dac25336bf99098f6e4159c266ea8628a2b6.tar.gz bcm5719-llvm-1b27dac25336bf99098f6e4159c266ea8628a2b6.zip | |
Build and initialise the Darwin ABI plugins on all platforms
llvm-svn: 131661
| -rw-r--r-- | lldb/lib/Makefile | 1 | ||||
| -rw-r--r-- | lldb/source/Plugins/Makefile | 2 | ||||
| -rw-r--r-- | lldb/source/lldb.cpp | 12 |
3 files changed, 8 insertions, 7 deletions
diff --git a/lldb/lib/Makefile b/lldb/lib/Makefile index 4dd7266cebb..66efb32033c 100644 --- a/lldb/lib/Makefile +++ b/lldb/lib/Makefile @@ -28,6 +28,7 @@ USEDLIBS = lldbAPI.a \ lldbHostCommon.a \ lldbInitAndLog.a \ lldbInterpreter.a \ + lldbPluginABIMacOSX_arm.a \ lldbPluginABIMacOSX_i386.a \ lldbPluginABISysV_x86_64.a \ lldbPluginDisassemblerLLVM.a \ diff --git a/lldb/source/Plugins/Makefile b/lldb/source/Plugins/Makefile index f974d5f004b..fbff5e933db 100644 --- a/lldb/source/Plugins/Makefile +++ b/lldb/source/Plugins/Makefile @@ -12,7 +12,7 @@ LLDB_LEVEL := ../.. include $(LLDB_LEVEL)/../../Makefile.config -DIRS := ABI/MacOSX-i386 ABI/SysV-x86_64 Disassembler/llvm \ +DIRS := ABI/MacOSX-arm ABI/MacOSX-i386 ABI/SysV-x86_64 Disassembler/llvm \ ObjectContainer/BSD-Archive ObjectFile/ELF SymbolFile/DWARF \ SymbolFile/Symtab Process/Utility DynamicLoader/Static \ Platform Process/gdb-remote Instruction/ARM \ diff --git a/lldb/source/lldb.cpp b/lldb/source/lldb.cpp index c941b420116..de6f1698094 100644 --- a/lldb/source/lldb.cpp +++ b/lldb/source/lldb.cpp @@ -22,6 +22,8 @@ #include "llvm/ADT/StringRef.h" +#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/Disassembler/llvm/DisassemblerLLVM.h" #include "Plugins/Instruction/ARM/EmulateInstructionARM.h" @@ -35,8 +37,6 @@ #include "Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.h" #if defined (__APPLE__) -#include "Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.h" -#include "Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.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,8 @@ lldb_private::Initialize () Timer::Initialize (); Timer scoped_timer (__PRETTY_FUNCTION__, __PRETTY_FUNCTION__); + ABIMacOSX_i386::Initialize(); + ABIMacOSX_arm::Initialize(); ABISysV_x86_64::Initialize(); DisassemblerLLVM::Initialize(); ObjectContainerBSDArchive::Initialize(); @@ -91,8 +93,6 @@ lldb_private::Initialize () //---------------------------------------------------------------------- // Apple/Darwin hosted plugins //---------------------------------------------------------------------- - ABIMacOSX_i386::Initialize(); - ABIMacOSX_arm::Initialize(); DynamicLoaderMacOSXDYLD::Initialize(); SymbolFileDWARFDebugMap::Initialize(); ItaniumABILanguageRuntime::Initialize(); @@ -144,6 +144,8 @@ lldb_private::Terminate () // Terminate and unload and loaded system or user LLDB plug-ins PluginManager::Terminate(); + ABIMacOSX_i386::Terminate(); + ABIMacOSX_arm::Terminate(); ABISysV_x86_64::Terminate(); DisassemblerLLVM::Terminate(); ObjectContainerBSDArchive::Terminate(); @@ -155,8 +157,6 @@ lldb_private::Terminate () EmulateInstructionARM::Terminate (); #if defined (__APPLE__) - ABIMacOSX_i386::Terminate(); - ABIMacOSX_arm::Terminate(); DynamicLoaderMacOSXDYLD::Terminate(); SymbolFileDWARFDebugMap::Terminate(); ItaniumABILanguageRuntime::Terminate(); |
