aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Schwinge <thomas@codesourcery.com>2018-07-24 18:04:18 +0200
committerThomas Schwinge <thomas@codesourcery.com>2019-02-14 16:40:36 +0100
commitc29ee8d45ec2113821c006a18cfedb9023ef9ce1 (patch)
tree75e705f0665576ac15497fa05e2e165e4d84bac5
parent6c6ef69fb4e95d991fa5462d067d3f71a73fedce (diff)
downloadgdb-c29ee8d45ec2113821c006a18cfedb9023ef9ce1.zip
gdb-c29ee8d45ec2113821c006a18cfedb9023ef9ce1.tar.gz
gdb-c29ee8d45ec2113821c006a18cfedb9023ef9ce1.tar.bz2
[gdb, hurd] Repair build after "Use thread_info and inferior pointers more throughout"
..., that is commit 00431a78b28f913a9d5c912c49680e39cfd20847 causing: [...]/gdb/gnu-nat.c: In member function 'virtual void gnu_nat_target::detach(inferior*, int)': [...]/gdb/gnu-nat.c:2284:23: error: invalid conversion from 'int' to 'inferior*' [-fpermissive] detach_inferior (pid); ^ In file included from [...]/gdb/gnu-nat.c:61:0: [...]/gdb/inferior.h:523:13: note: initializing argument 1 of 'void detach_inferior(inferior*)' extern void detach_inferior (inferior *inf); ^~~~~~~~~~~~~~~ Fixed by inlining the removed code. gdb/ * gnu-nat.c (gnu_nat_target::detach): Instead of 'detach_inferior (pid)' call 'detach_inferior (find_inferior_pid (pid))'.
-rw-r--r--gdb/ChangeLog4
-rw-r--r--gdb/gnu-nat.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2974d72..71c61bc 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,9 @@
2019-02-14 Thomas Schwinge <thomas@codesourcery.com>
+ * gnu-nat.c (gnu_nat_target::detach): Instead of
+ 'detach_inferior (pid)' call
+ 'detach_inferior (find_inferior_pid (pid))'.
+
* configure.nat [gdb_host == i386gnu] (NATDEPFILES): Add
'nat/fork-inferior.o'.
* gnu-nat.c: #include "nat/fork-inferior.h".
diff --git a/gdb/gnu-nat.c b/gdb/gnu-nat.c
index 5a47cb7..67cc95c 100644
--- a/gdb/gnu-nat.c
+++ b/gdb/gnu-nat.c
@@ -2279,7 +2279,7 @@ gnu_nat_target::detach (inferior *inf, int from_tty)
inf_detach (gnu_current_inf);
inferior_ptid = null_ptid;
- detach_inferior (pid);
+ detach_inferior (find_inferior_pid (pid));
maybe_unpush_target ();
}