[Lldb-commits] [lldb] r131661 - in /lldb/trunk: lib/Makefile source/Plugins/Makefile source/lldb.cpp

[Peter Collingbourne]

Author: pcc
Date: Thu May 19 13:32:34 2011
New Revision: 131661

URL: http://llvm.org/viewvc/llvm-project?rev=131661&view=rev
Log:
Build and initialise the Darwin ABI plugins on all platforms

Modified:
    lldb/trunk/lib/Makefile
    lldb/trunk/source/Plugins/Makefile
    lldb/trunk/source/lldb.cpp

Modified: lldb/trunk/lib/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lib/Makefile?rev=131661&r1=131660&r2=131661&view=diff
==============================================================================
--- lldb/trunk/lib/Makefile (original)
+++ lldb/trunk/lib/Makefile Thu May 19 13:32:34 2011
@@ -28,6 +28,7 @@
 	lldbHostCommon.a \
 	lldbInitAndLog.a \
 	lldbInterpreter.a \
+	lldbPluginABIMacOSX_arm.a \
 	lldbPluginABIMacOSX_i386.a \
 	lldbPluginABISysV_x86_64.a \
 	lldbPluginDisassemblerLLVM.a \

Modified: lldb/trunk/source/Plugins/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Makefile?rev=131661&r1=131660&r2=131661&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Makefile (original)
+++ lldb/trunk/source/Plugins/Makefile Thu May 19 13:32:34 2011
@@ -12,7 +12,7 @@
 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 \

Modified: lldb/trunk/source/lldb.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/lldb.cpp?rev=131661&r1=131660&r2=131661&view=diff
==============================================================================
--- lldb/trunk/source/lldb.cpp (original)
+++ lldb/trunk/source/lldb.cpp Thu May 19 13:32:34 2011
@@ -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 @@
         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 @@
         //----------------------------------------------------------------------
         // Apple/Darwin hosted plugins
         //----------------------------------------------------------------------
-        ABIMacOSX_i386::Initialize();
-        ABIMacOSX_arm::Initialize();
         DynamicLoaderMacOSXDYLD::Initialize();
         SymbolFileDWARFDebugMap::Initialize();
         ItaniumABILanguageRuntime::Initialize();
@@ -144,6 +144,8 @@
     // 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 @@
     EmulateInstructionARM::Terminate ();
 
 #if defined (__APPLE__)
-    ABIMacOSX_i386::Terminate();
-    ABIMacOSX_arm::Terminate();
     DynamicLoaderMacOSXDYLD::Terminate();
     SymbolFileDWARFDebugMap::Terminate();
     ItaniumABILanguageRuntime::Terminate();