testsuite: Fix false FAIL in gdb.cp/casts.exp

[deliverable/binutils-gdb.git] / gdb / inferior.c

diff --git a/gdb/inferior.c b/gdb/inferior.c
index e71104d6e90c5e9efe472d7e0905203a2e55fa19..47d91c7037e6563f72a7e7acd008c3871088d8d8 100644 (file)
--- a/gdb/inferior.c
+++ b/gdb/inferior.c
@@ -249,8 +249,6 @@ exit_inferior_1 (struct inferior *inftoex, int silent)
 
   iterate_over_threads (delete_thread_of_inferior, &arg);
 
-  /* Notify the observers before removing the inferior from the list,
-     so that the observers have a chance to look it up.  */
   observer_notify_inferior_exit (inf);
 
   inf->pid = 0;
@@ -748,8 +746,8 @@ inferior_command (char *args, int from_tty)
          switch_to_thread (tp->ptid);
        }
 
-      printf_filtered (_("[Switching to thread %d (%s)] "),
-                      pid_to_thread_id (inferior_ptid),
+      printf_filtered (_("[Switching to thread %s (%s)] "),
+                      print_thread_id (inferior_thread ()),
                       target_pid_to_str (inferior_ptid));
     }
   else
@@ -805,7 +803,7 @@ remove_inferior_command (char *args, int from_tty)
 
       if (inf == current_inferior ())
        {
-         warning (_("Can not remove current symbol inferior %d."), num);
+         warning (_("Can not remove current inferior %d."), num);
          continue;
        }
     
@@ -1008,6 +1006,26 @@ show_print_inferior_events (struct ui_file *file, int from_tty,
   fprintf_filtered (file, _("Printing of inferior events is %s.\n"), value);
 }
 
+/* Return a new value for the selected inferior's id.  */
+
+static struct value *
+inferior_id_make_value (struct gdbarch *gdbarch, struct internalvar *var,
+                       void *ignore)
+{
+  struct inferior *inf = current_inferior ();
+
+  return value_from_longest (builtin_type (gdbarch)->builtin_int, inf->num);
+}
+
+/* Implementation of `$_inferior' variable.  */
+
+static const struct internalvar_funcs inferior_funcs =
+{
+  inferior_id_make_value,
+  NULL,
+  NULL
+};
+
 \f
 
 void
@@ -1071,4 +1089,5 @@ Show printing of inferior events (e.g., inferior start and exit)."), NULL,
          show_print_inferior_events,
          &setprintlist, &showprintlist);
 
+  create_internalvar_type_lazy ("_inferior", &inferior_funcs, NULL);
 }