From 667ef229202b29c4a31e3693a815adf8729f4fd1 Mon Sep 17 00:00:00 2001 From: Ilia K Date: Tue, 24 Mar 2015 14:30:28 +0000 Subject: [PATCH] Fix build on OS X after r233061 This includes following: # Add a missing Process argument when calling GetSharedModule in DynamicLoaderDarwinKernel::KextImageInfo::LoadImageUsingMemoryModule # Fix PlatformDarwinKernel::GetSharedModule prototype llvm-svn: 233084 --- .../DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp | 2 +- lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp | 3 ++- lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.h | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp b/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp index 85e69358e4a6..9100bf0caee6 100644 --- a/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp +++ b/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp @@ -831,7 +831,7 @@ DynamicLoaderDarwinKernel::KextImageInfo::LoadImageUsingMemoryModule (Process *p ModuleSpec kext_bundle_module_spec(module_spec); FileSpec kext_filespec(m_name.c_str(), false); kext_bundle_module_spec.GetFileSpec() = kext_filespec; - platform_sp->GetSharedModule (kext_bundle_module_spec, m_module_sp, &target.GetExecutableSearchPaths(), NULL, NULL); + platform_sp->GetSharedModule (kext_bundle_module_spec, process, m_module_sp, &target.GetExecutableSearchPaths(), NULL, NULL); } } diff --git a/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp b/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp index eb9ca451069d..e9761474a847 100644 --- a/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp +++ b/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp @@ -760,6 +760,7 @@ PlatformDarwinKernel::GetKernelsInDirectory (void *baton, Error PlatformDarwinKernel::GetSharedModule (const ModuleSpec &module_spec, + Process *process, ModuleSP &module_sp, const FileSpecList *module_search_paths_ptr, ModuleSP *old_module_sp_ptr, @@ -813,7 +814,7 @@ PlatformDarwinKernel::GetSharedModule (const ModuleSpec &module_spec, } // Else fall back to treating the file's path as an actual file path - defer to PlatformDarwin's GetSharedModule. - return PlatformDarwin::GetSharedModule (module_spec, module_sp, module_search_paths_ptr, old_module_sp_ptr, did_create_ptr); + return PlatformDarwin::GetSharedModule (module_spec, process, module_sp, module_search_paths_ptr, old_module_sp_ptr, did_create_ptr); } Error diff --git a/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.h b/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.h index ad0bc6205b88..decc835fb526 100644 --- a/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.h +++ b/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.h @@ -85,6 +85,7 @@ public: lldb_private::Error GetSharedModule (const lldb_private::ModuleSpec &module_spec, + lldb_private::Process *process, lldb::ModuleSP &module_sp, const lldb_private::FileSpecList *module_search_paths_ptr, lldb::ModuleSP *old_module_sp_ptr,