aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorRainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>2021-03-29 13:26:35 +0200
committerRainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>2021-03-29 13:26:35 +0200
commit25b48839b37e81e854cfdef9bc8592a4195a5e32 (patch)
treec95dccc053aa94b509a7021f4f0cf61b4b6697c5 /gdb
parentbbe1eca622b28a28a2ea486d77914e6c25d63ed8 (diff)
downloadgdb-25b48839b37e81e854cfdef9bc8592a4195a5e32.zip
gdb-25b48839b37e81e854cfdef9bc8592a4195a5e32.tar.gz
gdb-25b48839b37e81e854cfdef9bc8592a4195a5e32.tar.bz2
Restore procfs.c compilation
Since c8fbd44a018a9923f906bfd2be5489caa87b602a (gdb: remove target_is_pushed free function), procfs.c compilation is broken, which went unnoticed for lack of functioning buildbots: /vol/src/gnu/gdb/hg/master/dist/gdb/procfs.c: In member function 'virtual void procfs_target::attach(const char*, int)': /vol/src/gnu/gdb/hg/master/dist/gdb/procfs.c:1772:8: error: 'inf' was not declared in this scope; did you mean 'info'? 1772 | if (!inf->target_is_pushed (this)) | ^~~ | info /vol/src/gnu/gdb/hg/master/dist/gdb/procfs.c: In member function 'virtual void procfs_target::create_inferior(const char*, const string&, char**, int)': /vol/src/gnu/gdb/hg/master/dist/gdb/procfs.c:2865:8: error: 'inf' was not declared in this scope; did you mean 'info'? 2865 | if (!inf->target_is_pushed (this)) | ^~~ | info Fixed by defining inf. Tested on amd64-pc-solaris2.11 and sparcv9-sun-solaris2.11. 2021-03-29 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> gdb: * procfs.c (procfs_target::attach): Define inf. Use it. (procfs_target::create_inferior): Likewise.
Diffstat (limited to 'gdb')
-rw-r--r--gdb/ChangeLog7
-rw-r--r--gdb/procfs.c6
2 files changed, 11 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 70e8ad7..3e353b3 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2021-03-29 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
+
+ gdb:
+ * procfs.c (procfs_target::attach): Define inf.
+ Use it.
+ (procfs_target::create_inferior): Likewise.
+
2021-03-28 Tom Tromey <tom@tromey.com>
* elfread.c (can_lazily_read_symbols): Move to dwarf2/read.c.
diff --git a/gdb/procfs.c b/gdb/procfs.c
index eb703cf..23c0aa2 100644
--- a/gdb/procfs.c
+++ b/gdb/procfs.c
@@ -1768,10 +1768,11 @@ procfs_target::attach (const char *args, int from_tty)
error (_("Attaching GDB to itself is not a good idea..."));
/* Push the target if needed, ensure it gets un-pushed it if attach fails. */
+ inferior *inf = current_inferior ();
target_unpush_up unpusher;
if (!inf->target_is_pushed (this))
{
- current_inferior ()->push_target (this);
+ inf->push_target (this);
unpusher.reset (this);
}
@@ -2862,8 +2863,9 @@ procfs_target::create_inferior (const char *exec_file,
shell_file = tryname;
}
+ inferior *inf = current_inferior ();
if (!inf->target_is_pushed (this))
- current_inferior ()->push_target (this);
+ inf->push_target (this);
pid = fork_inferior (exec_file, allargs, env, procfs_set_exec_trap,
NULL, procfs_pre_trace, shell_file, NULL);