From f01be29bbc6ef5fd011675bd0da09ab1f7aea030 Mon Sep 17 00:00:00 2001
From: Nick Hudson <nick.hudson@dsl.pipex.com>
Date: Sun, 16 Mar 2008 08:50:43 +0000
Subject: [PATCH]         * Makefile.in (amd64nbsd-nat.o): New dependency.     
    * amd64nbsd-nat.c: Include "nbsd-nat.h".        
 (_initialize_amd64nbsd_nat): Update target vector to use        
 nbsd_pid_to_exec_file.         * config/i386/nbsd64.mh (NATDEPFILES): Add
 nbsd-nat.o.

---
 gdb/ChangeLog             | 8 ++++++++
 gdb/Makefile.in           | 2 +-
 gdb/amd64nbsd-nat.c       | 9 +++++++--
 gdb/config/i386/nbsd64.mh | 2 +-
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d0469c44a98..44b6c405cf6 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2008-03-16  Nick Hudson  <nick.hudson@dsl.pipex.com>
+
+        * Makefile.in (amd64nbsd-nat.o): New dependency.
+        * amd64nbsd-nat.c: Include "nbsd-nat.h".
+        (_initialize_amd64nbsd_nat): Update target vector to use
+        nbsd_pid_to_exec_file.
+        * config/i386/nbsd64.mh (NATDEPFILES): Add nbsd-nat.o.
+
 2008-03-15  Vladimir Prus  <vladimir@codesourcery.com>
 
 	Remove ignoring leading exec events code.
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 7942b77a132..e6c8095fc5f 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -1867,7 +1867,7 @@ amd64-linux-tdep.o: amd64-linux-tdep.c $(defs_h) $(frame_h) $(gdbcore_h) \
 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)
diff --git a/gdb/amd64nbsd-nat.c b/gdb/amd64nbsd-nat.c
index 58843c81a36..40c7f09cd1b 100644
--- a/gdb/amd64nbsd-nat.c
+++ b/gdb/amd64nbsd-nat.c
@@ -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);
 }
diff --git a/gdb/config/i386/nbsd64.mh b/gdb/config/i386/nbsd64.mh
index aec29050242..5de8cf582d8 100644
--- a/gdb/config/i386/nbsd64.mh
+++ b/gdb/config/i386/nbsd64.mh
@@ -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
-- 
2.30.2