Index: source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
===================================================================
--- source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
+++ source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
@@ -1220,19 +1220,20 @@
                     if (new_target_triple.getVendorName().size() == 0)
                     {
                         new_target_triple.setVendor (remote_triple.getVendor());
+                    }
+                    if (new_target_triple.getOSName().size() == 0)
+                    {
+                        new_target_triple.setOS (remote_triple.getOS());
 
-                        if (new_target_triple.getOSName().size() == 0)
-                        {
-                            new_target_triple.setOS (remote_triple.getOS());
-
-                            if (new_target_triple.getEnvironmentName().size() == 0)
-                                new_target_triple.setEnvironment (remote_triple.getEnvironment());
-                        }
-
-                        ArchSpec new_target_arch = target_arch;
-                        new_target_arch.SetTriple(new_target_triple);
-                        GetTarget().SetArchitecture(new_target_arch);
                     }
+                    if (new_target_triple.getEnvironmentName().size() == 0)
+                    {
+                        new_target_triple.setEnvironment (remote_triple.getEnvironment());
+                    }
+
+                    ArchSpec new_target_arch = target_arch;
+                    new_target_arch.SetTriple(new_target_triple);
+                    GetTarget().SetArchitecture(new_target_arch);
                 }
 
                 if (log)