From 7d5adfe3118050243e85469ad891c7813e4db68a Mon Sep 17 00:00:00 2001 From: Sergio Durigan Junior Date: Mon, 19 Sep 2016 17:00:22 -0400 Subject: [PATCH] Use 'event_ptid' instead of 'resume_ptid' on startup_inferior (fix for regression on my last commit) Pedro pointed out a regression happening on gdb.mi/mi-exec-run.exp, and as it turned out, this was a thinko when dealing with some events on startup_inferior. Basically, one needs to pass 'event_ptid' to target_mourn_inferior, but I mistakenly passed 'resume_ptid'. This commit fixes it. Built and regtested on BuildBot, now with fixed e-mail notifications! gdb/ChangeLog: 2016-09-20 Sergio Durigan Junior * fork-inferior.c (startup_inferior): Pass 'event_ptid' instead of 'resume_ptid' to 'target_mourn_inferior'. Fix regression introduced by my last commit. --- gdb/ChangeLog | 6 ++++++ gdb/fork-child.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 26b97e6..0dacaf6 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2016-09-20 Sergio Durigan Junior + + * fork-inferior.c (startup_inferior): Pass 'event_ptid' instead of + 'resume_ptid' to 'target_mourn_inferior'. Fix regression + introduced by my last commit. + 2016-09-19 Pedro Alves * common/gdb_locale.h [!ENABLE_NLS] (gettext, dgettext, dcgettext, diff --git a/gdb/fork-child.c b/gdb/fork-child.c index f367507..15f8249 100644 --- a/gdb/fork-child.c +++ b/gdb/fork-child.c @@ -482,7 +482,7 @@ startup_inferior (int ntraps) case TARGET_WAITKIND_SIGNALLED: target_terminal_ours (); - target_mourn_inferior (resume_ptid); + 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 (resume_ptid); + target_mourn_inferior (event_ptid); if (ws.value.integer) error (_("During startup program exited with code %d."), ws.value.integer); -- 2.7.4