diff --git a/lldb/tools/debugserver/source/debugserver.cpp b/lldb/tools/debugserver/source/debugserver.cpp
index e8c28cc..f7696ac 100644
--- a/lldb/tools/debugserver/source/debugserver.cpp
+++ b/lldb/tools/debugserver/source/debugserver.cpp
@@ -886,6 +886,10 @@
         arch_name.assign ("arm");
 #endif
     }
+    else
+    {
+        DNBSetArchitecture (arch_name.c_str());
+    }
 
     if (arch_name.empty())
     {
@@ -897,6 +901,8 @@
     argv += optind;
 
     g_remoteSP.reset (new RNBRemote (use_native_registers, arch_name.c_str()));
+    
+    
 
     RNBRemote *remote = g_remoteSP.get();
     if (remote == NULL)