Tweak handling of remote errors in response to resumption packet

[deliverable/binutils-gdb.git] / gdb / gnu-nat.c

diff --git a/gdb/gnu-nat.c b/gdb/gnu-nat.c
index c1fafed156efc81f0971e8e8c6b6fa4cab200aef..74a96f1154f52c17aaa3066e4b83a184085b05a4 100644 (file)
--- a/gdb/gnu-nat.c
+++ b/gdb/gnu-nat.c
@@ -1,5 +1,5 @@
 /* Interface GDB to the GNU Hurd.
-   Copyright (C) 1992-2019 Free Software Foundation, Inc.
+   Copyright (C) 1992-2020 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -63,7 +63,7 @@ extern "C"
 #include "value.h"
 #include "language.h"
 #include "target.h"
-#include "common/gdb_wait.h"
+#include "gdbsupport/gdb_wait.h"
 #include "gdbcmd.h"
 #include "gdbcore.h"
 #include "gdbthread.h"
@@ -93,7 +93,7 @@ int proc_wait_pid = 0;
 /* The number of wait requests we've sent, and expect replies from.  */
 int proc_waits_pending = 0;
 
-int gnu_debug_flag = 0;
+bool gnu_debug_flag = false;
 
 /* Forward decls */
 
@@ -1647,15 +1647,9 @@ rewait:
       inf_update_suspends (inf);
     }
 
-  inf_debug (inf, "returning ptid = %s, status = %s (%d)",
+  inf_debug (inf, "returning ptid = %s, %s",
             target_pid_to_str (ptid).c_str (),
-            status->kind == TARGET_WAITKIND_EXITED ? "EXITED"
-            : status->kind == TARGET_WAITKIND_STOPPED ? "STOPPED"
-            : status->kind == TARGET_WAITKIND_SIGNALLED ? "SIGNALLED"
-            : status->kind == TARGET_WAITKIND_LOADED ? "LOADED"
-            : status->kind == TARGET_WAITKIND_SPURIOUS ? "SPURIOUS"
-            : "?",
-            status->value.integer);
+            target_waitstatus_to_string (status).c_str ());
 
   return ptid;
 }
@@ -1737,7 +1731,7 @@ S_exception_raise_request (mach_port_t port, mach_port_t reply_port,
        }
     }
   else
-    /* A supppressed exception, which ignore.  */
+    /* A suppressed exception, which ignore.  */
     {
       inf->wait.suppress = 1;
       mach_port_deallocate (mach_task_self (), reply_port);
@@ -2201,7 +2195,6 @@ void
 gnu_nat_target::attach (const char *args, int from_tty)
 {
   int pid;
-  char *exec_file;
   struct inf *inf = cur_inf ();
   struct inferior *inferior;
 
@@ -2212,7 +2205,7 @@ gnu_nat_target::attach (const char *args, int from_tty)
 
   if (from_tty)
     {
-      exec_file = (char *) get_exec_file (0);
+      const char *exec_file = get_exec_file (0);
 
       if (exec_file)
        printf_unfiltered ("Attaching to program `%s', pid %d\n",
@@ -2266,7 +2259,7 @@ gnu_nat_target::detach (inferior *inf, int from_tty)
 
   if (from_tty)
     {
-      char *exec_file = get_exec_file (0);
+      const char *exec_file = get_exec_file (0);
 
       if (exec_file)
        printf_unfiltered ("Detaching from program `%s' pid %d\n",
@@ -3318,15 +3311,15 @@ This is the same as setting `task pause', `exceptions', and\n\
 
   /* Commands to show information about the task's ports.  */
   add_info ("send-rights", info_send_rights_cmd,
-           _("Show information about the task's send rights"));
+           _("Show information about the task's send rights."));
   add_info ("receive-rights", info_recv_rights_cmd,
-           _("Show information about the task's receive rights"));
+           _("Show information about the task's receive rights."));
   add_info ("port-rights", info_port_rights_cmd,
-           _("Show information about the task's port rights"));
+           _("Show information about the task's port rights."));
   add_info ("port-sets", info_port_sets_cmd,
-           _("Show information about the task's port sets"));
+           _("Show information about the task's port sets."));
   add_info ("dead-names", info_dead_names_cmd,
-           _("Show information about the task's dead names"));
+           _("Show information about the task's dead names."));
   add_info_alias ("ports", "port-rights", 1);
   add_info_alias ("port", "port-rights", 1);
   add_info_alias ("psets", "port-sets", 1);