In ProcessGDBRemote::DoConnectRemote(), if the remote system informed

us of its architecture, use that to set the Target's arch if it
doesn't already have one set.

In Process::CompleteAttach(), if the Target has a valid arch make
sure that the Platform we pick up is compatible with that arch; if
not, find a Platform that is compatible.  Don't let the the default
platform override the Target's arch.

<rdar://problem/11185420>

llvm-svn: 156116

1 files changed, 17 insertions, 5 deletions

diff --git a/lldb/source/Target/Process.cpp b/lldb/source/Target/Process.cpp
index 2a02bd52d17..deb657c2664 100644
--- a/lldb/source/Target/Process.cpp
+++ b/lldb/source/Target/Process.cpp
@@ -2741,11 +2741,23 @@ Process::CompleteAttach ()
     assert (platform_sp.get());
     if (platform_sp)
     {
-        ProcessInstanceInfo process_info;
-        platform_sp->GetProcessInfo (GetID(), process_info);
-        const ArchSpec &process_arch = process_info.GetArchitecture();
-        if (process_arch.IsValid() && m_target.GetArchitecture() != process_arch)
-            m_target.SetArchitecture (process_arch);
+	  const ArchSpec &target_arch = m_target.GetArchitecture();
+	  if (target_arch.IsValid() && !platform_sp->IsCompatibleWithArchitecture (target_arch))
+	  {
+              platform_sp = platform_sp->GetPlatformForArchitecture (target_arch);
+              if (platform_sp)
+              {
+                  m_target.SetPlatform (platform_sp);
+              }
+	  }
+	  else
+	  {
+      	         ProcessInstanceInfo process_info;
+	         platform_sp->GetProcessInfo (GetID(), process_info);
+	         const ArchSpec &process_arch = process_info.GetArchitecture();
+	         if (process_arch.IsValid() && m_target.GetArchitecture() != process_arch)
+	             m_target.SetArchitecture (process_arch);
+	  }
     }
 
     // We have completed the attach, now it is time to find the dynamic loader