Module Name: src
Committed By: christos
Date: Wed May 29 22:08:28 UTC 2019
Modified Files:
src/external/gpl3/gdb/dist/gdb: sparc-nat.c sparc-nat.h
sparc-nbsd-nat.c sparc-nbsd-tdep.c sparc64-nbsd-nat.c
Log Message:
make those compile again...
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/gpl3/gdb/dist/gdb/sparc-nat.c
cvs rdiff -u -r1.1.1.7 -r1.2 src/external/gpl3/gdb/dist/gdb/sparc-nat.h
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gdb/dist/gdb/sparc-nbsd-nat.c \
src/external/gpl3/gdb/dist/gdb/sparc64-nbsd-nat.c
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gdb/dist/gdb/sparc-nbsd-tdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gdb/dist/gdb/sparc-nat.c
diff -u src/external/gpl3/gdb/dist/gdb/sparc-nat.c:1.12 src/external/gpl3/gdb/dist/gdb/sparc-nat.c:1.13
--- src/external/gpl3/gdb/dist/gdb/sparc-nat.c:1.12 Tue May 28 11:30:39 2019
+++ src/external/gpl3/gdb/dist/gdb/sparc-nat.c Wed May 29 18:08:28 2019
@@ -252,7 +252,7 @@ sparc_store_inferior_registers (struct r
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)
Index: src/external/gpl3/gdb/dist/gdb/sparc-nat.h
diff -u src/external/gpl3/gdb/dist/gdb/sparc-nat.h:1.1.1.7 src/external/gpl3/gdb/dist/gdb/sparc-nat.h:1.2
--- src/external/gpl3/gdb/dist/gdb/sparc-nat.h:1.1.1.7 Sun May 26 16:59:31 2019
+++ src/external/gpl3/gdb/dist/gdb/sparc-nat.h Wed May 29 18:08:28 2019
@@ -75,7 +75,7 @@ struct sparc_target : public BaseTarget
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);
}
};
Index: src/external/gpl3/gdb/dist/gdb/sparc-nbsd-nat.c
diff -u src/external/gpl3/gdb/dist/gdb/sparc-nbsd-nat.c:1.5 src/external/gpl3/gdb/dist/gdb/sparc-nbsd-nat.c:1.6
--- src/external/gpl3/gdb/dist/gdb/sparc-nbsd-nat.c:1.5 Sun May 26 17:40:01 2019
+++ src/external/gpl3/gdb/dist/gdb/sparc-nbsd-nat.c Wed May 29 18:08:28 2019
@@ -91,7 +91,7 @@ sparc32nbsd_supply_pcb (struct regcache
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 @@ _initialize_sparcnbsd_nat (void)
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);
Index: src/external/gpl3/gdb/dist/gdb/sparc64-nbsd-nat.c
diff -u src/external/gpl3/gdb/dist/gdb/sparc64-nbsd-nat.c:1.5 src/external/gpl3/gdb/dist/gdb/sparc64-nbsd-nat.c:1.6
--- src/external/gpl3/gdb/dist/gdb/sparc64-nbsd-nat.c:1.5 Sun May 26 17:40:01 2019
+++ src/external/gpl3/gdb/dist/gdb/sparc64-nbsd-nat.c Wed May 29 18:08:28 2019
@@ -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 @@ sparc64nbsd_fpregset_supplies_p (struct
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 @@ sparc64nbsd_supply_pcb (struct regcache
}
/* 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;
Index: src/external/gpl3/gdb/dist/gdb/sparc-nbsd-tdep.c
diff -u src/external/gpl3/gdb/dist/gdb/sparc-nbsd-tdep.c:1.4 src/external/gpl3/gdb/dist/gdb/sparc-nbsd-tdep.c:1.5
--- src/external/gpl3/gdb/dist/gdb/sparc-nbsd-tdep.c:1.4 Sun May 26 17:40:01 2019
+++ src/external/gpl3/gdb/dist/gdb/sparc-nbsd-tdep.c Wed May 29 18:08:28 2019
@@ -324,10 +324,6 @@ sparc32nbsd_elf_init_abi (struct gdbarch
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);
}
