Author: ki.stfu
Date: Tue Mar 24 09:30:28 2015
New Revision: 233084
URL: http://llvm.org/viewvc/llvm-project?rev=233084&view=rev
Log:
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
Modified:
lldb/trunk/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp
lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp
lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.h
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=233084&r1=233083&r2=233084&view=diff
==============================================================================
---
lldb/trunk/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp
(original)
+++
lldb/trunk/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp
Tue Mar 24 09:30:28 2015
@@ -831,7 +831,7 @@ DynamicLoaderDarwinKernel::KextImageInfo
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);
}
}
Modified: lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp?rev=233084&r1=233083&r2=233084&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp
(original)
+++ lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp Tue Mar
24 09:30:28 2015
@@ -760,6 +760,7 @@ PlatformDarwinKernel::GetKernelsInDirect
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 (c
}
// 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
Modified: lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.h
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.h?rev=233084&r1=233083&r2=233084&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.h (original)
+++ lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.h Tue Mar 24
09:30:28 2015
@@ -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,
_______________________________________________
lldb-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
