rdar://problem/11487457

Previous fix to add convenience registers for x86_64 did not take the 'process attach' scenario into account.
This patch fixes that.


git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@158222 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp b/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
index caf3461..be5ccab 100644
--- a/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
+++ b/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
@@ -401,7 +401,8 @@
     }
 
     // Add some convenience registers (eax, ebx, ecx, edx, esi, edi, ebp, esp) to x86_64.
-    if (target_arch.IsValid() && target_arch.GetMachine() == llvm::Triple::x86_64)
+    if ((target_arch.IsValid() && target_arch.GetMachine() == llvm::Triple::x86_64)
+        || (remote_arch.IsValid() && remote_arch.GetMachine() == llvm::Triple::x86_64))
         m_register_info.Addx86_64ConvenienceRegisters();
 
     // At this point, we can finalize our register info.