Skip to content

Commit 2ab7bfc

Browse files
build failure fix post pull (#121)
Changes in DYLD and ProcessAIXCore needed in reference to this PR in the community, as it caused build failures: [lldb] Enable locate module callback for all module loading llvm#160199
1 parent e81a807 commit 2ab7bfc

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

lldb/source/API/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ add_lldb_library(liblldb STATIC ${option_framework}
7171
SBFileSpecList.cpp
7272
SBFormat.cpp
7373
SBFrame.cpp
74+
SBFrameList.cpp
7475
SBFunction.cpp
7576
SBHostOS.cpp
7677
SBInstruction.cpp

lldb/source/Plugins/DynamicLoader/AIX-DYLD/DynamicLoaderAIXDYLD.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -210,10 +210,8 @@ void DynamicLoaderAIXDYLD::ResolveExecutableModule(
210210
if (module_sp && module_sp->MatchesModuleSpec(module_spec))
211211
return;
212212

213-
const auto executable_search_paths(Target::GetDefaultExecutableSearchPaths());
214-
auto error = platform_sp->ResolveExecutable(
215-
module_spec, module_sp,
216-
!executable_search_paths.IsEmpty() ? &executable_search_paths : nullptr);
213+
module_spec.SetTarget(target.shared_from_this());
214+
auto error = platform_sp->ResolveExecutable(module_spec, module_sp);
217215
if (error.Fail()) {
218216
StreamString stream;
219217
module_spec.Dump(stream);

lldb/source/Plugins/Process/aix-core/ProcessAIXCore.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,9 @@ bool ProcessAIXCore::CanDebug(lldb::TargetSP target_sp,
164164

165165
if (!m_core_module_sp && FileSystem::Instance().Exists(m_core_file)) {
166166
ModuleSpec core_module_spec(m_core_file, target_sp->GetArchitecture());
167+
core_module_spec.SetTarget(target_sp);
167168
Status error(ModuleList::GetSharedModule(core_module_spec, m_core_module_sp,
168-
nullptr, nullptr, nullptr));
169+
nullptr, nullptr));
169170
if (m_core_module_sp) {
170171
ObjectFile *core_objfile = m_core_module_sp->GetObjectFile();
171172
if (core_objfile && core_objfile->GetType() == ObjectFile::eTypeCoreFile){

0 commit comments

Comments
 (0)