[Lldb-commits] [lldb] r165193 - in /lldb/trunk: lib/Makefile source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp source/Plugins/Makefile

[Jason Molenda]

Author: jmolenda
Date: Wed Oct  3 21:16:06 2012
New Revision: 165193

URL: http://llvm.org/viewvc/llvm-project?rev=165193&view=rev
Log:
Patch submitted by Dan Malea -- I introduced a dependency between
ProcessGDBRemote and DynamicLoaderDarwinKernel and a patch was needed
to get this building on Linux.  Thanks!


Modified:
    lldb/trunk/lib/Makefile
    lldb/trunk/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp
    lldb/trunk/source/Plugins/Makefile

Modified: lldb/trunk/lib/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lib/Makefile?rev=165193&r1=165192&r2=165193&view=diff
==============================================================================
--- lldb/trunk/lib/Makefile (original)
+++ lldb/trunk/lib/Makefile Wed Oct  3 21:16:06 2012
@@ -85,9 +85,13 @@
 endif
 
 ifeq ($(HOST_OS),Linux)
-  USEDLIBS += lldbPluginProcessPOSIX.a \
+  USEDLIBS += lldbHostLinux.a \
               lldbPluginProcessLinux.a \
-              lldbHostLinux.a
+              lldbPluginProcessPOSIX.a \
+              lldbPluginDynamicLoaderMacOSX.a \
+              lldbPluginDynamicLoaderDarwinKernel.a \
+              lldbPluginOperatingSystemDarwinKernel.a
+
 endif
 
 ifeq ($(HOST_OS),FreeBSD)

Modified: lldb/trunk/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp?rev=165193&r1=165192&r2=165193&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp (original)
+++ lldb/trunk/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp Wed Oct  3 21:16:06 2012
@@ -409,7 +409,8 @@
         {
             kernel_name = m_kernel.module_sp->GetObjectFile()->GetFileSpec().GetFilename();
         }
-        strlcpy (m_kernel.name, kernel_name.AsCString(), sizeof(m_kernel.name));
+        strncpy (m_kernel.name, kernel_name.AsCString(), sizeof(m_kernel.name));
+        m_kernel.name[sizeof (m_kernel.name) - 1] = '\0';
 
         if (m_kernel.address == LLDB_INVALID_ADDRESS)
         {

Modified: lldb/trunk/source/Plugins/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Makefile?rev=165193&r1=165192&r2=165193&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Makefile (original)
+++ lldb/trunk/source/Plugins/Makefile Wed Oct  3 21:16:06 2012
@@ -33,6 +33,8 @@
 endif
 
 ifeq ($(HOST_OS),Linux)
+DIRS += DynamicLoader/MacOSX-DYLD DynamicLoader/Darwin-Kernel
+DIRS += OperatingSystem/Darwin-Kernel
 DIRS += Process/Linux Process/POSIX
 endif