diff options
| -rw-r--r-- | lldb/lib/Makefile | 8 | ||||
| -rw-r--r-- | lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp | 3 | ||||
| -rw-r--r-- | lldb/source/Plugins/Makefile | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/lldb/lib/Makefile b/lldb/lib/Makefile index 3424492e685..87f805f6ba2 100644 --- a/lldb/lib/Makefile +++ b/lldb/lib/Makefile @@ -85,9 +85,13 @@ ifeq ($(HOST_OS),Darwin) 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) diff --git a/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp b/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp index 67a3b16b0f8..eb172ed0007 100644 --- a/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp +++ b/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp @@ -409,7 +409,8 @@ DynamicLoaderDarwinKernel::LoadKernelModuleIfNeeded() { 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) { diff --git a/lldb/source/Plugins/Makefile b/lldb/source/Plugins/Makefile index 148cffce938..543b5dbef28 100644 --- a/lldb/source/Plugins/Makefile +++ b/lldb/source/Plugins/Makefile @@ -33,6 +33,8 @@ DIRS += Process/mach-core endif ifeq ($(HOST_OS),Linux) +DIRS += DynamicLoader/MacOSX-DYLD DynamicLoader/Darwin-Kernel +DIRS += OperatingSystem/Darwin-Kernel DIRS += Process/Linux Process/POSIX endif |
