[Lldb-commits] [PATCH] D58405: Merge target triple into module triple when constructing module from memory

[Alex Langford via Phabricator via lldb-commits]

xiaobai updated this revision to Diff 187458.
xiaobai added a comment.

Updating based on feedback from clayborg


CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D58405/new/

https://reviews.llvm.org/D58405

Files:
  source/Core/Module.cpp


Index: source/Core/Module.cpp
===================================================================
--- source/Core/Module.cpp
+++ source/Core/Module.cpp
@@ -309,6 +309,10 @@
           // file's architecture since it might differ in vendor/os if some
           // parts were unknown.
           m_arch = m_objfile_sp->GetArchitecture();
+
+          // Augment the arch with the target's information in case
+          // we are unable to extract the os/environment from memory.
+          
m_arch.MergeFrom(process_sp->GetTarget().GetExecutableModule()->GetArchitecture());
         } else {
           error.SetErrorString("unable to find suitable object file plug-in");
         }



Index: source/Core/Module.cpp
===================================================================
--- source/Core/Module.cpp
+++ source/Core/Module.cpp
@@ -309,6 +309,10 @@
           // file's architecture since it might differ in vendor/os if some
           // parts were unknown.
           m_arch = m_objfile_sp->GetArchitecture();
+
+          // Augment the arch with the target's information in case
+          // we are unable to extract the os/environment from memory.
+          m_arch.MergeFrom(process_sp->GetTarget().GetExecutableModule()->GetArchitecture());
         } else {
           error.SetErrorString("unable to find suitable object file plug-in");
         }

_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits