diff --git a/lldb/source/Host/ohos/HostInfoOHOS.cpp b/lldb/source/Host/ohos/HostInfoOHOS.cpp index e47d26e3e93868d2fc1fbe6dbd241ed83264576b..6a03da35197d1705234e3eeb3dba73d4f765f004 100644 --- a/lldb/source/Host/ohos/HostInfoOHOS.cpp +++ b/lldb/source/Host/ohos/HostInfoOHOS.cpp @@ -20,10 +20,10 @@ void HostInfoOHOS::ComputeHostArchitectureSupport(ArchSpec &arch_32, HostInfoLinux::ComputeHostArchitectureSupport(arch_32, arch_64); if (arch_32.IsValid()) { - arch_32.GetTriple().setEnvironment(llvm::Triple::UnknownEnvironment); + arch_32.GetTriple().setEnvironment(llvm::Triple::OpenHOS); } if (arch_64.IsValid()) { - arch_64.GetTriple().setEnvironment(llvm::Triple::UnknownEnvironment); + arch_64.GetTriple().setEnvironment(llvm::Triple::OpenHOS); } } diff --git a/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp b/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp index abee8dbebe759e8de254c5ab37368c24b72d0b84..ecd51abf329580f81fc9e7ac5bc3f1c98de70c5b 100644 --- a/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp +++ b/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp @@ -1734,7 +1734,11 @@ Status NativeProcessLinux::GetLoadedModuleFileSpec(const char *module_path, file_spec.Clear(); for (const auto &it : m_mem_region_cache) { - if (it.second.GetFilename() == module_file_spec.GetFilename()) { + // OHOS_LOCAL + const bool dir_check = (!m_arch.GetTriple().isOHOSFamily() || + it.second.GetDirectory() == module_file_spec.GetDirectory()); + // OHOS_LOCAL + if (it.second.GetFilename() == module_file_spec.GetFilename() && dir_check) { file_spec = it.second; return Status(); }