X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fsparc-linux-nat.c;h=1489d0980e1c786a71b5aefdd45f154815af18ef;hb=refs%2Fheads%2Fconcurrent-displaced-stepping-2020-04-01;hp=4589b95750edebe7299f36b4dcd5ed616528018a;hpb=db75c7177045ed2551fe9f8a71bb454f6b71cd5f;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/sparc-linux-nat.c b/gdb/sparc-linux-nat.c
index 4589b95750..1489d0980e 100644
--- a/gdb/sparc-linux-nat.c
+++ b/gdb/sparc-linux-nat.c
@@ -1,5 +1,5 @@
 /* Native-dependent code for GNU/Linux SPARC.
-   Copyright (C) 2005-2012 Free Software Foundation, Inc.
+   Copyright (C) 2005-2020 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -28,47 +28,51 @@
 #include "target.h"
 #include "linux-nat.h"
 
+class sparc_linux_nat_target final : public linux_nat_target
+{
+public:
+  /* Add our register access methods.  */
+  void fetch_registers (struct regcache *regcache, int regnum) override
+  { sparc_fetch_inferior_registers (regcache, regnum); }
+
+  void store_registers (struct regcache *regcache, int regnum) override
+  { sparc_store_inferior_registers (regcache, regnum); }
+};
+
+static sparc_linux_nat_target the_sparc_linux_nat_target;
+
 void
 supply_gregset (struct regcache *regcache, const prgregset_t *gregs)
 {
-  sparc32_supply_gregset (sparc_gregset, regcache, -1, gregs);
+  sparc32_supply_gregset (sparc_gregmap, regcache, -1, gregs);
 }
 
 void
 supply_fpregset (struct regcache *regcache, const prfpregset_t *fpregs)
 {
-  sparc32_supply_fpregset (sparc_fpregset, regcache, -1, fpregs);
+  sparc32_supply_fpregset (sparc_fpregmap, regcache, -1, fpregs);
 }
 
 void
 fill_gregset (const struct regcache *regcache, prgregset_t *gregs, int regnum)
 {
-  sparc32_collect_gregset (sparc_gregset, regcache, regnum, gregs);
+  sparc32_collect_gregset (sparc_gregmap, regcache, regnum, gregs);
 }
 
 void
 fill_fpregset (const struct regcache *regcache,
 	       prfpregset_t *fpregs, int regnum)
 {
-  sparc32_collect_fpregset (sparc_fpregset, regcache, regnum, fpregs);
+  sparc32_collect_fpregset (sparc_fpregmap, regcache, regnum, fpregs);
 }
 
-void _initialize_sparc_linux_nat (void);
-
+void _initialize_sparc_linux_nat ();
 void
-_initialize_sparc_linux_nat (void)
+_initialize_sparc_linux_nat ()
 {
-  struct target_ops *t;
-
-  /* Fill in the generic GNU/Linux methods.  */
-  t = linux_target ();
-
-  sparc_fpregset = &sparc32_bsd_fpregset;
-
-  /* Add our register access methods.  */
-  t->to_fetch_registers = sparc_fetch_inferior_registers;
-  t->to_store_registers = sparc_store_inferior_registers;
+  sparc_fpregmap = &sparc32_bsd_fpregmap;
 
   /* Register the target.  */
-  linux_nat_add_target (t);
+  linux_target = &the_sparc_linux_nat_target;
+  add_inf_child_target (&the_sparc_linux_nat_target);
 }