3 files changed, 3 insertions, 5 deletions
diff --git a/lldb/tools/debugserver/source/MacOSX/MachProcess.cpp b/lldb/tools/debugserver/source/MacOSX/MachProcess.cpp
index 3ca7fe8abeb..de3ee45c24f 100644
--- a/lldb/tools/debugserver/source/MacOSX/MachProcess.cpp
+++ b/lldb/tools/debugserver/source/MacOSX/MachProcess.cpp
@@ -115,7 +115,6 @@ MachProcess::MachProcess() :
     m_image_infos_baton(NULL)
 {
     DNBLogThreadedIf(LOG_PROCESS | LOG_VERBOSE, "%s", __PRETTY_FUNCTION__);
-    bzero(&m_arch_plugin_info, sizeof(m_arch_plugin_info));
 }
 
 MachProcess::~MachProcess()
@@ -1517,7 +1516,7 @@ MachProcess::LaunchForDebug
 
     case eLaunchFlavorPosixSpawn:
         m_pid = MachProcess::PosixSpawnChildForPTraceDebugging (path, 
-                                                                m_arch_plugin_info.cpu_type,
+                                                                DNBArchProtocol::GetArchitecture (),
                                                                 argv, 
                                                                 envp, 
                                                                 stdio_path, 
diff --git a/lldb/tools/debugserver/source/MacOSX/MachProcess.h b/lldb/tools/debugserver/source/MacOSX/MachProcess.h
index cff08bb4d68..9b6d51fc542 100644
--- a/lldb/tools/debugserver/source/MacOSX/MachProcess.h
+++ b/lldb/tools/debugserver/source/MacOSX/MachProcess.h
@@ -254,7 +254,6 @@ private:
     DNBCallbackCopyExecutableImageInfos
                                 m_image_infos_callback;
     void *                      m_image_infos_baton;
-    DNBArchPluginInfo           m_arch_plugin_info;
 };
 
 
diff --git a/lldb/tools/debugserver/source/MacOSX/MachThreadList.cpp b/lldb/tools/debugserver/source/MacOSX/MachThreadList.cpp
index 7a5e9bb8588..7aaf64258ba 100644
--- a/lldb/tools/debugserver/source/MacOSX/MachThreadList.cpp
+++ b/lldb/tools/debugserver/source/MacOSX/MachThreadList.cpp
@@ -230,9 +230,9 @@ MachThreadList::UpdateThreadList(MachProcess *process, bool update)
                 is_64_bit = true;
         }
         if (is_64_bit)
-            DNBArchProtocol::SetDefaultArchitecture(CPU_TYPE_X86_64);
+            DNBArchProtocol::SetArchitecture(CPU_TYPE_X86_64);
         else
-            DNBArchProtocol::SetDefaultArchitecture(CPU_TYPE_I386);
+            DNBArchProtocol::SetArchitecture(CPU_TYPE_I386);
     }
 #endif