Remove old features when switching architectures.

1 files changed, 4 insertions, 2 deletions

diff --git a/gdb/infcmd.c b/gdb/infcmd.c
index 09732ff4a46..66387d9f5e6 100644
--- a/gdb/infcmd.c
+++ b/gdb/infcmd.c
@@ -421,8 +421,10 @@ post_create_inferior (struct target_ops *target, int from_tty)
       obstack_init (&tmp_obstack);
       features = target_available_features (target, &tmp_obstack);
 
-      if (features)
-	arch_set_available_features (features);
+      /* Switch to a new architecture.  We must call this even if
+	 the target could not return features; if the previous
+	 target could, we may have the wrong architecture selected.  */
+      arch_set_available_features (features);
 
       obstack_free (&tmp_obstack, NULL);
     }