[Lldb-commits] [PATCH] D36046: Improve the posix core file triple detection

Tamas Berghammer via Phabricator via lldb-commits lldb-commits at lists.llvm.org
Sat Jul 29 06:09:01 PDT 2017

tberghammer created this revision.
Herald added subscribers: kristof.beyls, arichardson, sdardis, aemerson.

Posix core files sometime don't contain enough information to correctly
detect the OS. If that is the case we should use the OS from the target
instead as it will contain usable information in more cases and if the
target and the core contain different OS-es then we are already in a
pretty bad state so moving from an unknown OS to a known (but possibly
incorrect) OS will do no harm.

We already had similar code in place for MIPS. This change tries to make
it more generic by using ArchSpec::MergeFrom and extends it to all
architectures but some MIPS specific issue prevent us from getting rid
of special casing MIPS.



Index: source/Plugins/Process/elf-core/ProcessElfCore.cpp
--- source/Plugins/Process/elf-core/ProcessElfCore.cpp
+++ source/Plugins/Process/elf-core/ProcessElfCore.cpp
@@ -724,15 +724,15 @@
 ArchSpec ProcessElfCore::GetArchitecture() {
-  ObjectFileELF *core_file =
-      (ObjectFileELF *)(m_core_module_sp->GetObjectFile());
   ArchSpec arch;
-  core_file->GetArchitecture(arch);
+  m_core_module_sp->GetObjectFile()->GetArchitecture(arch);
   ArchSpec target_arch = GetTarget().GetArchitecture();
-  if (target_arch.IsMIPS())
+  arch.MergeFrom(target_arch);
+  if (target_arch.IsMIPS()) {
     return target_arch;
+  }
   return arch;
Index: source/Core/ArchSpec.cpp
--- source/Core/ArchSpec.cpp
+++ source/Core/ArchSpec.cpp
@@ -1002,6 +1002,9 @@
     m_core = other.GetCore();
+  if (GetFlags() == 0) {
+    SetFlags(other.GetFlags());
+  }
 bool ArchSpec::SetArchitecture(ArchitectureType arch_type, uint32_t cpu,

-------------- next part --------------
A non-text attachment was scrubbed...
Name: D36046.108781.patch
Type: text/x-patch
Size: 1107 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/lldb-commits/attachments/20170729/fad0068e/attachment.bin>

More information about the lldb-commits mailing list