Index: Makefile.in
===================================================================
RCS file: /cvs/src/src/gdb/Makefile.in,v
retrieving revision 1.984
diff -u -p -u -r1.984 Makefile.in
--- Makefile.in	20 Feb 2008 15:45:20 -0000	1.984
+++ Makefile.in	15 Mar 2008 18:40:40 -0000
@@ -1867,7 +1867,7 @@ amd64-linux-tdep.o: amd64-linux-tdep.c $
 amd64-nat.o: amd64-nat.c $(defs_h) $(gdbarch_h) $(regcache_h) \
 	$(gdb_assert_h) $(gdb_string_h) $(i386_tdep_h) $(amd64_tdep_h)
 amd64nbsd-nat.o: amd64nbsd-nat.c $(defs_h) $(target_h) $(gdb_assert_h) \
-	$(amd64_tdep_h) $(amd64_nat_h)
+	$(amd64_tdep_h) $(amd64_nat_h) $(nbsd_nat_h)
 amd64nbsd-tdep.o: amd64nbsd-tdep.c $(defs_h) $(arch_utils_h) $(frame_h) \
 	$(gdbcore_h) $(osabi_h) $(symtab_h) $(gdb_assert_h) $(amd64_tdep_h) \
 	$(nbsd_tdep_h) $(solib_svr4_h)
Index: amd64nbsd-nat.c
===================================================================
RCS file: /cvs/src/src/gdb/amd64nbsd-nat.c,v
retrieving revision 1.8
diff -u -p -u -r1.8 amd64nbsd-nat.c
--- amd64nbsd-nat.c	1 Jan 2008 22:53:09 -0000	1.8
+++ amd64nbsd-nat.c	15 Mar 2008 18:40:40 -0000
@@ -22,6 +22,7 @@
 
 #include "gdb_assert.h"
 
+#include "nbsd-nat.h"
 #include "amd64-tdep.h"
 #include "amd64-nat.h"
 
@@ -61,10 +62,14 @@ void _initialize_amd64nbsd_nat (void);
 void
 _initialize_amd64nbsd_nat (void)
 {
+  struct target_ops *t;
+
   amd64_native_gregset32_reg_offset = amd64nbsd32_r_reg_offset;
   amd64_native_gregset32_num_regs = ARRAY_SIZE (amd64nbsd32_r_reg_offset);
   amd64_native_gregset64_reg_offset = amd64nbsd_r_reg_offset;
 
-  /* We've got nothing to add to the common *BSD/amd64 target.  */
-  add_target (amd64bsd_target ());
+  /* Add some extra features to the common *BSD/amd64 target.  */
+  t = amd64bsd_target ();
+  t->to_pid_to_exec_file = nbsd_pid_to_exec_file;
+  add_target (t);
 }
Index: config/i386/nbsd64.mh
===================================================================
RCS file: /cvs/src/src/gdb/config/i386/nbsd64.mh,v
retrieving revision 1.7
diff -u -p -u -r1.7 nbsd64.mh
--- config/i386/nbsd64.mh	1 Oct 2004 17:26:13 -0000	1.7
+++ config/i386/nbsd64.mh	15 Mar 2008 18:40:42 -0000
@@ -1,3 +1,3 @@
 # Host: NetBSD/amd64
 NATDEPFILES= fork-child.o inf-ptrace.o \
-	amd64-nat.o amd64bsd-nat.o amd64nbsd-nat.o
+	nbsd-nat.o amd64-nat.o amd64bsd-nat.o amd64nbsd-nat.o