[Lldb-commits] [PATCH] D137301: PlatformDarwinKernel::GetSupportedArchitectures should report all supported architectures
Jason Molenda via Phabricator via lldb-commits
lldb-commits at lists.llvm.org
Thu Nov 3 10:48:45 PDT 2022
This revision was automatically updated to reflect the committed changes.
Closed by commit rGfd2065b70f2a: Have GetSupportedArchitectures report all supported arches (authored by jasonmolenda).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D137301/new/
https://reviews.llvm.org/D137301
Files:
lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp
lldb/source/Target/Target.cpp
Index: lldb/source/Target/Target.cpp
===================================================================
--- lldb/source/Target/Target.cpp
+++ lldb/source/Target/Target.cpp
@@ -1436,7 +1436,8 @@
if (!m_arch.GetSpec().IsValid()) {
m_arch = executable_sp->GetArchitecture();
LLDB_LOG(log,
- "setting architecture to {0} ({1}) based on executable file",
+ "Target::SetExecutableModule setting architecture to {0} ({1}) "
+ "based on executable file",
m_arch.GetSpec().GetArchitectureName(),
m_arch.GetSpec().GetTriple().getTriple());
}
@@ -1536,7 +1537,9 @@
// specified
if (replace_local_arch)
m_arch = other;
- LLDB_LOG(log, "set architecture to {0} ({1})",
+ LLDB_LOG(log,
+ "Target::SetArchitecture merging compatible arch; arch "
+ "is now {0} ({1})",
m_arch.GetSpec().GetArchitectureName(),
m_arch.GetSpec().GetTriple().getTriple());
return true;
@@ -1544,9 +1547,13 @@
// If we have an executable file, try to reset the executable to the desired
// architecture
- LLDB_LOGF(log, "Target::SetArchitecture changing architecture to %s (%s)",
- arch_spec.GetArchitectureName(),
- arch_spec.GetTriple().getTriple().c_str());
+ LLDB_LOGF(
+ log,
+ "Target::SetArchitecture changing architecture to %s (%s) from %s (%s)",
+ arch_spec.GetArchitectureName(),
+ arch_spec.GetTriple().getTriple().c_str(),
+ m_arch.GetSpec().GetArchitectureName(),
+ m_arch.GetSpec().GetTriple().getTriple().c_str());
m_arch = other;
ModuleSP executable_sp = GetExecutableModule();
Index: lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp
===================================================================
--- lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp
+++ lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp
@@ -986,11 +986,8 @@
std::vector<ArchSpec> PlatformDarwinKernel::GetSupportedArchitectures(
const ArchSpec &process_host_arch) {
std::vector<ArchSpec> result;
-#if defined(__arm__) || defined(__arm64__) || defined(__aarch64__)
ARMGetSupportedArchitectures(result);
-#else
x86GetSupportedArchitectures(result);
-#endif
return result;
}
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D137301.472983.patch
Type: text/x-patch
Size: 2328 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/lldb-commits/attachments/20221103/15a5a913/attachment-0001.bin>
More information about the lldb-commits
mailing list