Use gdbpy_enter in gdbpy_before_prompt_hook

[binutils-gdb.git] / gdb / fork-child.c

diff --git a/gdb/fork-child.c b/gdb/fork-child.c
index 6856cf630f58215dc7aee14d6696c4f8e44cf68c..eaa8cb5448ed26c8891f74819d32843cfebc7e6a 100644 (file)
--- a/gdb/fork-child.c
+++ b/gdb/fork-child.c
@@ -1,6 +1,6 @@
 /* Fork a Unix child process, and set up to debug it, for GDB.
 
-   Copyright (C) 1990-2016 Free Software Foundation, Inc.
+   Copyright (C) 1990-2017 Free Software Foundation, Inc.
 
    Contributed by Cygnus Support.
 
@@ -482,7 +482,7 @@ startup_inferior (int ntraps)
 
          case TARGET_WAITKIND_SIGNALLED:
            target_terminal_ours ();
-           target_mourn_inferior ();
+           target_mourn_inferior (event_ptid);
            error (_("During startup program terminated with signal %s, %s."),
                   gdb_signal_to_name (ws.value.sig),
                   gdb_signal_to_string (ws.value.sig));
@@ -490,7 +490,7 @@ startup_inferior (int ntraps)
 
          case TARGET_WAITKIND_EXITED:
            target_terminal_ours ();
-           target_mourn_inferior ();
+           target_mourn_inferior (event_ptid);
            if (ws.value.integer)
              error (_("During startup program exited with code %d."),
                     ws.value.integer);
@@ -514,7 +514,7 @@ startup_inferior (int ntraps)
       if (resume_signal != GDB_SIGNAL_TRAP)
        {
          /* Let shell child handle its own signals in its own way.  */
-         target_resume (resume_ptid, 0, resume_signal);
+         target_continue (resume_ptid, resume_signal);
        }
       else
        {
@@ -540,7 +540,7 @@ startup_inferior (int ntraps)
            break;
 
          /* Just make it go on.  */
-         target_resume (resume_ptid, 0, GDB_SIGNAL_0);
+         target_continue_no_signal (resume_ptid);
        }
     }