[Lldb-commits] [lldb] r131645 - /lldb/trunk/source/lldb.cpp

[Jim Ingham]

Why did you have to define these out?  Was it just a problem with building?  We want to make it possible to build an lldb that can be any of the kinds of cross debugger that lldb currently supports, so you don't have to play the games that gdb does with building the linux-cross-arm, and linux-native, and etc, etc. debuggers.  Since you need the ABI bits to make a Linux-cross-MacOS X debugger, we want to make sure these build on all the platforms lldb supports.

If there's some problem building them, we should resolve that.

Jim


On May 19, 2011, at 10:34 AM, Peter Collingbourne wrote:

> Author: pcc
> Date: Thu May 19 12:34:40 2011
> New Revision: 131645
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=131645&view=rev
> Log:
> Initialise the Darwin ABI plugins only on Darwin
> 
> Modified:
>    lldb/trunk/source/lldb.cpp
> 
> Modified: lldb/trunk/source/lldb.cpp
> URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/lldb.cpp?rev=131645&r1=131644&r2=131645&view=diff
> ==============================================================================
> --- lldb/trunk/source/lldb.cpp (original)
> +++ lldb/trunk/source/lldb.cpp Thu May 19 12:34:40 2011
> @@ -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 @@
>         Timer::Initialize ();
>         Timer scoped_timer (__PRETTY_FUNCTION__, __PRETTY_FUNCTION__);
> 
> +        ABISysV_x86_64::Initialize();
>         DisassemblerLLVM::Initialize();
>         ObjectContainerBSDArchive::Initialize();
>         ObjectFileELF::Initialize();
> @@ -85,14 +86,13 @@
>         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 @@
>     // 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 @@
>     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();
> 
> 
> _______________________________________________
> lldb-commits mailing list
> lldb-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits