[binutils-gdb] hurd: fix pushing target on inferior creation

[binutils-gdb] hurd: fix pushing target on inferior creation

[Samuel Thibault]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=078f2fc9c153e6efd1c88b0a34eccc1164f9ae2f

commit 078f2fc9c153e6efd1c88b0a34eccc1164f9ae2f
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date:   Sat May 30 18:44:17 2020 +0000

    hurd: fix pushing target on inferior creation
    
    This fixes creating inferiors, which was broken since 5b6d1e4fa
    ('Multi-target support')
    
    gdb/ChangeLog:
    
            * gnu-nat.c (gnu_nat_target::create_inferior): Move push_target call
            before fork_inferior call. Avoid calling it if target_is_pushed returns
            true.

Diff:
---
 gdb/ChangeLog | 6 ++++++
 gdb/gnu-nat.c | 5 +++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 67faed176e1..12321b57b03 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2020-05-30  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+
+	* gnu-nat.c (gnu_nat_target::create_inferior): Move push_target call
+	before fork_inferior call. Avoid calling it if target_is_pushed returns
+	true.
+
 2020-05-30  Samuel Thibault  <samuel.thibault@ens-lyon.org>
 
 	* gnu-nat.h (gnu_target): New variable declaration.
diff --git a/gdb/gnu-nat.c b/gdb/gnu-nat.c
index 78e9ab7f717..90732f81296 100644
--- a/gdb/gnu-nat.c
+++ b/gdb/gnu-nat.c
@@ -2146,6 +2146,9 @@ gnu_nat_target::create_inferior (const char *exec_file,
 
   inf_debug (inf, "creating inferior");
 
+  if (!target_is_pushed (this))
+    push_target (this);
+
   pid = fork_inferior (exec_file, allargs, env, gnu_ptrace_me,
                        NULL, NULL, NULL, NULL);
 
@@ -2159,8 +2162,6 @@ gnu_nat_target::create_inferior (const char *exec_file,
 
   inf_attach (inf, pid);
 
-  push_target (this);
-
   inf->pending_execs = 1;
   inf->nomsg = 1;
   inf->traced = 1;