[binutils-gdb] [gdb, hurd] Repair build after "Convert struct target_ops to C++" changes

[Thomas Schwinge <tschwinge at sourceware dot org>]

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

commit 2d0a338c7c321de6c63be4e7e3f06ba12b783c63
Author: Thomas Schwinge <thomas@codesourcery.com>
Date:   Fri Jul 20 02:03:25 2018 +0200

    [gdb, hurd] Repair build after "Convert struct target_ops to C++" changes
    
    ..., that is commit f6ac5f3d63e03a81c4ff3749aba234961cc9090e causing:
    
        In file included from [...]/gdb/gnu-nat.c:24:0:
        [...]/gdb/gnu-nat.h:123:1: error: expected class-name before '{' token
         {
         ^
        [...]/gdb/gnu-nat.h:128:16: error: 'inferior' has not been declared
           void detach (inferior *, int) override;
                        ^~~~~~~~
        [...]/gdb/gnu-nat.h:132:8: error: use of enum 'target_xfer_status' without previous declaration
           enum target_xfer_status xfer_partial (enum target_object object,
                ^~~~~~~~~~~~~~~~~~
        [...]/gdb/gnu-nat.h:132:46: error: use of enum 'target_object' without previous declaration
           enum target_xfer_status xfer_partial (enum target_object object,
                                                      ^~~~~~~~~~~~~
        [...]/gdb/gnu-nat.h:124:8: error: 'void gnu_nat_target::attach(const char*, int)' marked 'override', but does not override
           void attach (const char *, int) override;
                ^~~~~~
        [...]
    
        [...]/gdb/gnu-nat.c: In member function 'virtual void gnu_nat_target::detach(inferior*, int)':
        [...]/gdb/gnu-nat.c:2286:34: error: 'ops' was not declared in this scope
           inf_child_maybe_unpush_target (ops);
                                          ^~~
        [...]/gdb/gnu-nat.c:2286:34: note: suggested alternative: 'open'
           inf_child_maybe_unpush_target (ops);
                                          ^~~
                                          open
        [...]/gdb/gnu-nat.c:2286:3: error: 'inf_child_maybe_unpush_target' was not declared in this scope
           inf_child_maybe_unpush_target (ops);
           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
        [...]/gdb/gnu-nat.c:2286:3: note: suggested alternative: 'maybe_unpush_target'
           inf_child_maybe_unpush_target (ops);
           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
           maybe_unpush_target
    
        [...]/gdb/i386-gnu-nat.c:200:1: warning: 'void gnu_store_registers(target_ops*, regcache*, int)' defined but not used [-Wunused-function]
         gnu_store_registers (struct target_ops *ops,
         ^~~~~~~~~~~~~~~~~~~
        [...]/gdb/i386-gnu-nat.c:109:1: warning: 'void gnu_fetch_registers(target_ops*, regcache*, int)' defined but not used [-Wunused-function]
         gnu_fetch_registers (struct target_ops *ops,
         ^~~~~~~~~~~~~~~~~~~
        [...]
        /usr/bin/ld: i386-gnu-nat.o:(.data.rel+0x0): undefined reference to `vtable for i386_gnu_nat_target'
        collect2: error: ld returned 1 exit status
    
    	gdb/
    	* gnu-nat.c (gnu_nat_target::detach): Instead of
    	'inf_child_maybe_unpush_target (ops)' call 'maybe_unpush_target'.
    	* gnu-nat.h: #include "inf-child.h".
    	* i386-gnu-nat.c (gnu_fetch_registers): Rename/move to
    	'i386_gnu_nat_target::fetch_registers'.
    	(gnu_store_registers): Rename/move to
    	'i386_gnu_nat_target::store_registers'.

Diff:
---
 gdb/ChangeLog      |  8 ++++++++
 gdb/gnu-nat.c      |  2 +-
 gdb/gnu-nat.h      |  2 ++
 gdb/i386-gnu-nat.c | 10 ++++------
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c88216b..fcaae61 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,13 @@
 2019-02-14  Thomas Schwinge  <thomas@codesourcery.com>
 
+	* gnu-nat.c (gnu_nat_target::detach): Instead of
+	'inf_child_maybe_unpush_target (ops)' call 'maybe_unpush_target'.
+	* gnu-nat.h: #include "inf-child.h".
+	* i386-gnu-nat.c (gnu_fetch_registers): Rename/move to
+	'i386_gnu_nat_target::fetch_registers'.
+	(gnu_store_registers): Rename/move to
+	'i386_gnu_nat_target::store_registers'.
+
 	* config/i386/nm-i386gnu.h: Don't "#include" any files.
 	* gnu-nat.h (mach_thread_info): New function.
 	* gnu-nat.c (thread_takeover_sc_cmd): Use it.
diff --git a/gdb/gnu-nat.c b/gdb/gnu-nat.c
index bd8fcb6..78966c8 100644
--- a/gdb/gnu-nat.c
+++ b/gdb/gnu-nat.c
@@ -2280,7 +2280,7 @@ gnu_nat_target::detach (inferior *inf, int from_tty)
   inferior_ptid = null_ptid;
   detach_inferior (pid);
 
-  inf_child_maybe_unpush_target (ops);
+  maybe_unpush_target ();
 }
 
 
diff --git a/gdb/gnu-nat.h b/gdb/gnu-nat.h
index dbad0ca..4bd4176 100644
--- a/gdb/gnu-nat.h
+++ b/gdb/gnu-nat.h
@@ -35,6 +35,8 @@ extern __typeof__ (mach_thread_info) mach_thread_info asm ("thread_info");
 
 #include <unistd.h>
 
+#include "inf-child.h"
+
 struct inf;
 
 extern struct inf *gnu_current_inf;
diff --git a/gdb/i386-gnu-nat.c b/gdb/i386-gnu-nat.c
index c23c4bc..75ae641 100644
--- a/gdb/i386-gnu-nat.c
+++ b/gdb/i386-gnu-nat.c
@@ -105,9 +105,8 @@ fetch_fpregs (struct regcache *regcache, struct proc *thread)
 }
 
 /* Fetch register REGNO, or all regs if REGNO is -1.  */
-static void
-gnu_fetch_registers (struct target_ops *ops,
-		     struct regcache *regcache, int regno)
+void
+i386_gnu_nat_target::fetch_registers (struct regcache *regcache, int regno)
 {
   struct proc *thread;
   ptid_t ptid = regcache->ptid ();
@@ -196,9 +195,8 @@ store_fpregs (const struct regcache *regcache, struct proc *thread, int regno)
 }
 
 /* Store at least register REGNO, or all regs if REGNO == -1.  */
-static void
-gnu_store_registers (struct target_ops *ops,
-		     struct regcache *regcache, int regno)
+void
+i386_gnu_nat_target::store_registers (struct regcache *regcache, int regno)
 {
   struct proc *thread;
   struct gdbarch *gdbarch = regcache->arch ();