[src/trunk]: src/external/gpl3/gdb/dist/gdb make those compile again...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d33e47335818
branches:  trunk
changeset: 456861:d33e47335818
user:      christos <christos%NetBSD.org@localhost>
date:      Wed May 29 22:08:28 2019 +0000

description:
make those compile again...

diffstat:

 external/gpl3/gdb/dist/gdb/sparc-nat.c        |   2 +-
 external/gpl3/gdb/dist/gdb/sparc-nat.h        |   2 +-
 external/gpl3/gdb/dist/gdb/sparc-nbsd-nat.c   |   4 +-
 external/gpl3/gdb/dist/gdb/sparc-nbsd-tdep.c  |   4 --
 external/gpl3/gdb/dist/gdb/sparc64-nbsd-nat.c |  39 ++------------------------
 5 files changed, 7 insertions(+), 44 deletions(-)

diffs (134 lines):

diff -r 4760d042ca24 -r d33e47335818 external/gpl3/gdb/dist/gdb/sparc-nat.c
--- a/external/gpl3/gdb/dist/gdb/sparc-nat.c    Wed May 29 22:07:47 2019 +0000
+++ b/external/gpl3/gdb/dist/gdb/sparc-nat.c    Wed May 29 22:08:28 2019 +0000
@@ -252,7 +252,7 @@
    TARGET_OBJECT_WCOOKIE.  Fetch StackGhost Per-Process XOR cookie.  */
 
 enum target_xfer_status
-sparc_xfer_wcookie (struct target_ops *ops, enum target_object object,
+sparc_xfer_wcookie (enum target_object object,
                    const char *annex, gdb_byte *readbuf,
                    const gdb_byte *writebuf, ULONGEST offset, ULONGEST len,
                    ULONGEST *xfered_len)
diff -r 4760d042ca24 -r d33e47335818 external/gpl3/gdb/dist/gdb/sparc-nat.h
--- a/external/gpl3/gdb/dist/gdb/sparc-nat.h    Wed May 29 22:07:47 2019 +0000
+++ b/external/gpl3/gdb/dist/gdb/sparc-nat.h    Wed May 29 22:08:28 2019 +0000
@@ -75,7 +75,7 @@
       return sparc_xfer_wcookie (object, annex, readbuf, writebuf,
                                 offset, len, xfered_len);
 
-    return BaseTarget (object, annex, readbuf, writebuf,
+    return BaseTarget::xfer_partial (object, annex, readbuf, writebuf,
                       offset, len, xfered_len);
   }
 };
diff -r 4760d042ca24 -r d33e47335818 external/gpl3/gdb/dist/gdb/sparc-nbsd-nat.c
--- a/external/gpl3/gdb/dist/gdb/sparc-nbsd-nat.c       Wed May 29 22:07:47 2019 +0000
+++ b/external/gpl3/gdb/dist/gdb/sparc-nbsd-nat.c       Wed May 29 22:08:28 2019 +0000
@@ -91,7 +91,7 @@
   return 1;
 }
 
-static sparc_target<inf_ptrace_target> the_sparc_nbsd_nat_target;
+static sparc_target<nbsd_nat_target> the_sparc_nbsd_nat_target;
 
 void
 _initialize_sparcnbsd_nat (void)
@@ -100,7 +100,7 @@
   sparc_gregmap = &sparc32nbsd_gregmap;
   sparc_fpregmap = &sparc32_bsd_fpregmap;
 
-  add_inf_child_target (&sparc_nbsd_nat_target);
+  add_inf_child_target (&the_sparc_nbsd_nat_target);
 
   /* Support debugging kernel virtual memory images.  */
   bsd_kvm_add_target (sparc32nbsd_supply_pcb);
diff -r 4760d042ca24 -r d33e47335818 external/gpl3/gdb/dist/gdb/sparc-nbsd-tdep.c
--- a/external/gpl3/gdb/dist/gdb/sparc-nbsd-tdep.c      Wed May 29 22:07:47 2019 +0000
+++ b/external/gpl3/gdb/dist/gdb/sparc-nbsd-tdep.c      Wed May 29 22:08:28 2019 +0000
@@ -324,10 +324,6 @@
 void
 _initialize_sparcnbsd_tdep (void)
 {
-  /* BFD doesn't set a flavour for NetBSD style a.out core files.  */
-  gdbarch_register_osabi_sniffer (bfd_arch_sparc, bfd_target_unknown_flavour,
-                                  sparcnbsd_core_osabi_sniffer);
-
   gdbarch_register_osabi (bfd_arch_sparc, 0, GDB_OSABI_NETBSD,
                          sparc32nbsd_elf_init_abi);
 }
diff -r 4760d042ca24 -r d33e47335818 external/gpl3/gdb/dist/gdb/sparc64-nbsd-nat.c
--- a/external/gpl3/gdb/dist/gdb/sparc64-nbsd-nat.c     Wed May 29 22:07:47 2019 +0000
+++ b/external/gpl3/gdb/dist/gdb/sparc64-nbsd-nat.c     Wed May 29 22:08:28 2019 +0000
@@ -20,6 +20,8 @@
 #include "defs.h"
 #include "gdbcore.h"
 #include "regcache.h"
+#include "inferior.h"
+#include "inf-ptrace.h"
 #include "target.h"
 
 #include "nbsd-nat.h"
@@ -27,17 +29,6 @@
 #include "sparc-nbsd-tdep.h"
 #include "sparc-nat.h"
 
-#include <machine/reg.h>
-
-#ifndef HAVE_GREGSET_T
-typedef struct reg gregset_t;
-#endif
-
-#ifndef HAVE_FPREGSET_T
-typedef struct fpreg fpregset_t;
-#endif
-#include "gregset.h"
- 
 /* NetBSD is different from the other OSes that support both SPARC and
    UltraSPARC in that the result of ptrace(2) depends on whether the
    traced process is 32-bit or 64-bit.  */
@@ -139,29 +130,7 @@
   return 0;
 }
 
-void
-supply_gregset (struct regcache *regcache, const gregset_t *gregs)
-{
-  sparc64nbsd_supply_gregset (sparc_gregmap, regcache, -1, gregs);
-}
 
-void
-supply_fpregset (struct regcache *regcache, const fpregset_t *fpregs)
-{
-  sparc64nbsd_supply_fpregset (sparc_fpregmap, regcache, -1, fpregs);
-}
-
-void
-fill_gregset (const struct regcache *regcache, gregset_t *gregs, int regnum)
-{
-  sparc64nbsd_collect_gregset (sparc_gregmap, regcache, regnum, gregs);
-}
-
-void
-fill_fpregset (const struct regcache *regcache, fpregset_t *fpregs, int regnum)
-{
-  sparc64nbsd_collect_fpregset (sparc_fpregmap, regcache, regnum, fpregs);
-}
 /* Support for debugging kernel virtual memory images.  */
 
 #include <sys/types.h>
@@ -203,13 +172,11 @@
 }
 
 /* We've got nothing to add to the generic SPARC target.  */
-static sparc_target<inf_ptrace_target> the_sparc64_nbsd_nat_target;
+static sparc_target<nbsd_nat_target> the_sparc64_nbsd_nat_target;
 
 void
 _initialize_sparc64nbsd_nat (void)
 {
-  struct target_ops *t;
-
   sparc_supply_gregset = sparc64nbsd_supply_gregset;
   sparc_collect_gregset = sparc64nbsd_collect_gregset;
   sparc_supply_fpregset = sparc64nbsd_supply_fpregset;