[COMMITTED] Restore procfs.c compilation

Message ID yddft0enqrm.fsf@CeBiTec.Uni-Bielefeld.DE
State New
Headers show
Series
  • [COMMITTED] Restore procfs.c compilation
Related show

Commit Message

Rainer Orth March 29, 2021, 11:27 a.m.
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.

Committed to master.

	Rainer

-- 
-----------------------------------------------------------------------------
Rainer Orth, Center for Biotechnology, Bielefeld University


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.

Patch

# HG changeset patch
# Parent  6ea501440b6bfb3b1cb5df1a86fb81c6330d0997
Restore procfs.c compilation

diff --git a/gdb/procfs.c b/gdb/procfs.c
--- a/gdb/procfs.c
+++ b/gdb/procfs.c
@@ -1768,10 +1768,11 @@  procfs_target::attach (const char *args,
     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 ch
       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);