* vax-nat.c: Update copyright year. Include "inf-ptrace.h".

(vax_register_u_offset): Make statuc.
(_initialize_vax_nat): Construct and add target vector.
* config/vax/vax.mh (NATDEPFILES): Remove infptrace.o and
inftarg.o.  Add inf-ptrace.o.
* Makefile.in (vax-nat.o): Update dependencies.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d3c3a7bbfbecc52623c5d642d933388d912f12c6..21cea869753e7b0b5608cdeba24e8d5c7d091d99 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,12 @@
 2005-01-10  Mark Kettenis  <kettenis@gnu.org>
 
+       * vax-nat.c: Update copyright year.  Include "inf-ptrace.h".
+       (vax_register_u_offset): Make statuc.
+       (_initialize_vax_nat): Construct and add target vector.
+       * config/vax/vax.mh (NATDEPFILES): Remove infptrace.o and
+       inftarg.o.  Add inf-ptrace.o.
+       * Makefile.in (vax-nat.o): Update dependencies.
+
        * inf-ptrace.h: Update copyright year.  Sync comment with
        inf-ptrace.c.
        (inf_ptrace_trad_target): New prototype.

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 68c2a600ab7f2c8ef76ef0f8f93ef3d647ba0443..958a4dd0b9b82a6488c246873d7f951b78abc959 100644 (file)
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -2674,7 +2674,8 @@ varobj.o: varobj.c $(defs_h) $(value_h) $(expression_h) $(frame_h) \
        $(language_h) $(wrapper_h) $(gdbcmd_h) $(gdb_string_h) $(varobj_h)
 vaxbsd-nat.o: vaxbsd-nat.c $(defs_h) $(inferior_h) $(regcache_h) $(target_h) \
        $(vax_tdep_h) $(inf_ptrace_h) $(bsd_kvm_h)
-vax-nat.o: vax-nat.c $(defs_h) $(inferior_h) $(gdb_assert_h) $(vax_tdep_h)
+vax-nat.o: vax-nat.c $(defs_h) $(inferior_h) $(gdb_assert_h) $(vax_tdep_h) \
+       $(inf_ptrace_h)
 vaxnbsd-tdep.o: vaxnbsd-tdep.c $(defs_h) $(arch_utils_h) $(osabi_h) \
        $(vax_tdep_h) $(solib_svr4_h) $(gdb_string_h)
 vax-tdep.o: vax-tdep.c $(defs_h) $(arch_utils_h) $(dis_asm_h) $(frame_h) \

diff --git a/gdb/config/vax/vax.mh b/gdb/config/vax/vax.mh
index 341aa6bde386a1b5285ae78b1ee753b632211200..46b85d1cc5940a3df6e245fd57e2fd757ec8a6de 100644 (file)
--- a/gdb/config/vax/vax.mh
+++ b/gdb/config/vax/vax.mh
@@ -1,4 +1,4 @@
 # Host: VAX running 4.2BSD or Ultrix
-NATDEPFILES= vax-nat.o fork-child.o infptrace.o inftarg.o \
+NATDEPFILES= vax-nat.o fork-child.o inf-ptrace.o \
        corelow.o core-aout.o
 NAT_FILE= nm-vax.h

diff --git a/gdb/vax-nat.c b/gdb/vax-nat.c
index 9dc0c51fa056246870c28cb575756010f68d7b49..d01d9489a137811d29167d351ab217aac7d13872 100644 (file)
--- a/gdb/vax-nat.c
+++ b/gdb/vax-nat.c
@@ -1,6 +1,6 @@
 /* Native-dependent code for VAX UNIXen (including older BSD's).
 
-   Copyright 2004 Free Software Foundation, Inc.
+   Copyright 2004, 2005 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -44,6 +44,7 @@
 #endif
 
 #include "vax-tdep.h"
+#include "inf-ptrace.h"
 
 /* Address of the user structure.  This is the the value for 32V; 3BSD
    uses a different value, but hey, who's still using those systems?  */
@@ -66,9 +67,8 @@ vax_register_u_addr (CORE_ADDR u_ar0, int regnum)
   /* Type is `int *u_ar0'.  See <sys/user.h>.  */
   return u_ar0 + vax_register_index[regnum - VAX_R0_REGNUM] * 4;
 }
-\f
 
-CORE_ADDR
+static CORE_ADDR
 vax_register_u_offset (int regnum)
 {
   size_t u_ar0_offset = offsetof (struct user, u_ar0);
@@ -103,4 +103,6 @@ _initialize_vax_nat (void)
   names[1].n_name = NULL;
   if (nlist (_PATH_UNIX, names) == 0)
     vax_kernel_u_addr = names[0].n_value;
+
+  add_target (inf_ptrace_trad_target (vax_register_u_offset));
 }