diff options
5 files changed, 21 insertions, 6 deletions
diff --git a/lldb/source/Plugins/DynamicLoader/Linux-DYLD/DynamicLoaderLinuxDYLD.cpp b/lldb/source/Plugins/DynamicLoader/Linux-DYLD/DynamicLoaderLinuxDYLD.cpp index 898c36efcbf..caad7a01f9a 100644 --- a/lldb/source/Plugins/DynamicLoader/Linux-DYLD/DynamicLoaderLinuxDYLD.cpp +++ b/lldb/source/Plugins/DynamicLoader/Linux-DYLD/DynamicLoaderLinuxDYLD.cpp @@ -112,7 +112,7 @@ DynamicLoaderLinuxDYLD::DidAttach() executable = m_process->GetTarget().GetExecutableModule(); load_offset = ComputeLoadOffset(); - if (!executable.empty() && load_offset != LLDB_INVALID_ADDRESS) + if (executable.get() && load_offset != LLDB_INVALID_ADDRESS) { ModuleList module_list; module_list.Append(executable); @@ -132,7 +132,7 @@ DynamicLoaderLinuxDYLD::DidLaunch() executable = m_process->GetTarget().GetExecutableModule(); load_offset = ComputeLoadOffset(); - if (!executable.empty() && load_offset != LLDB_INVALID_ADDRESS) + if (executable.get() && load_offset != LLDB_INVALID_ADDRESS) { ModuleList module_list; module_list.Append(executable); @@ -264,7 +264,7 @@ DynamicLoaderLinuxDYLD::RefreshModules() { FileSpec file(I->path.c_str(), true); ModuleSP module_sp = LoadModuleAtAddress(file, I->base_addr); - if (!module_sp.empty()) + if (module_sp.get()) new_modules.Append(module_sp); } m_process->GetTarget().ModulesDidLoad(new_modules); @@ -280,7 +280,7 @@ DynamicLoaderLinuxDYLD::RefreshModules() FileSpec file(I->path.c_str(), true); ModuleSP module_sp = loaded_modules.FindFirstModuleForFileSpec(file, NULL, NULL); - if (!module_sp.empty()) + if (module_sp.get()) old_modules.Append(module_sp); } m_process->GetTarget().ModulesDidUnload(old_modules); @@ -355,7 +355,7 @@ DynamicLoaderLinuxDYLD::LoadAllCurrentModules() { FileSpec file(I->path.c_str(), false); ModuleSP module_sp = LoadModuleAtAddress(file, I->base_addr); - if (!module_sp.empty()) + if (module_sp.get()) module_list.Append(module_sp); } diff --git a/lldb/source/Plugins/Process/Linux/ProcessLinux.cpp b/lldb/source/Plugins/Process/Linux/ProcessLinux.cpp index 14571ed3cf4..2bc76f3a865 100644 --- a/lldb/source/Plugins/Process/Linux/ProcessLinux.cpp +++ b/lldb/source/Plugins/Process/Linux/ProcessLinux.cpp @@ -437,6 +437,13 @@ ProcessLinux::UpdateThreadListIfNeeded() return m_thread_list.GetSize(false); } +uint32_t +ProcessLinux::UpdateThreadList(ThreadList &old_thread_list, ThreadList &new_thread_list) +{ + // FIXME: Should this be implemented? + return 0; +} + ByteOrder ProcessLinux::GetByteOrder() const { diff --git a/lldb/source/Plugins/Process/Linux/ProcessLinux.h b/lldb/source/Plugins/Process/Linux/ProcessLinux.h index aa31e778d93..713e8ba6095 100644 --- a/lldb/source/Plugins/Process/Linux/ProcessLinux.h +++ b/lldb/source/Plugins/Process/Linux/ProcessLinux.h @@ -129,6 +129,10 @@ public: virtual uint32_t UpdateThreadListIfNeeded(); + uint32_t + UpdateThreadList(lldb_private::ThreadList &old_thread_list, + lldb_private::ThreadList &new_thread_list); + virtual lldb::ByteOrder GetByteOrder() const; diff --git a/lldb/source/Plugins/Process/Linux/ProcessMonitor.cpp b/lldb/source/Plugins/Process/Linux/ProcessMonitor.cpp index ebe59598735..d708ae18362 100644 --- a/lldb/source/Plugins/Process/Linux/ProcessMonitor.cpp +++ b/lldb/source/Plugins/Process/Linux/ProcessMonitor.cpp @@ -241,7 +241,7 @@ ReadRegOperation::Execute(ProcessMonitor *monitor) // Set errno to zero so that we can detect a failed peek. errno = 0; - unsigned long data = ptrace(PTRACE_PEEKUSER, pid, m_offset, NULL); + uint32_t data = ptrace(PTRACE_PEEKUSER, pid, m_offset, NULL); if (data == -1UL && errno) m_result = false; diff --git a/lldb/source/lldb.cpp b/lldb/source/lldb.cpp index 0749f0c9c43..7e9949df66d 100644 --- a/lldb/source/lldb.cpp +++ b/lldb/source/lldb.cpp @@ -94,7 +94,9 @@ lldb_private::Initialize () UnwindAssemblyInstEmulation::Initialize(); UnwindAssembly_x86::Initialize(); EmulateInstructionARM::Initialize (); +#if !defined (__linux__) ObjectFilePECOFF::Initialize (); +#endif #if defined (__APPLE__) //---------------------------------------------------------------------- // Apple/Darwin hosted plugins @@ -166,7 +168,9 @@ lldb_private::Terminate () UnwindAssembly_x86::Terminate(); UnwindAssemblyInstEmulation::Terminate(); EmulateInstructionARM::Terminate (); +#if !defined (__linux__) ObjectFilePECOFF::Terminate (); +#endif #if defined (__APPLE__) DynamicLoaderMacOSXDYLD::Terminate(); |
