5 files changed, 72 insertions, 16 deletions

diff --git a/devel/gdb6/files/patch-config_sparc_fbsd.mh b/devel/gdb6/files/patch-config_sparc_fbsd.mh
new file mode 100644
index 000000000000..5631903da987
--- /dev/null
+++ b/devel/gdb6/files/patch-config_sparc_fbsd.mh
@@ -0,0 +1,10 @@
+--- gdb/config/sparc/fbsd.mh	Wed Mar 13 03:20:24 2002
++++ gdb/config/sparc/fbsd.mh	Tue Oct 15 20:54:37 2002
+@@ -21,5 +21,6 @@
+ # Host: FreeBSD/sparc64
+ NATDEPFILES= sparc-nat.o \
+ 	corelow.o fork-child.o infptrace.o inftarg.o \
+-	solib.o solib-svr4.o solib-legacy.o
++	solib.o solib-svr4.o solib-legacy.o kvm-fbsd.o
+ NAT_FILE= nm-fbsd.h
++NAT_CLIBS= -lkvm
diff --git a/devel/gdb6/files/patch-config_sparc_nm-fbsd.h b/devel/gdb6/files/patch-config_sparc_nm-fbsd.h
new file mode 100644
index 000000000000..c7261a0ca459
--- /dev/null
+++ b/devel/gdb6/files/patch-config_sparc_nm-fbsd.h
@@ -0,0 +1,26 @@
+--- gdb/config/sparc/nm-fbsd.h	Fri Mar  1 18:35:24 2002
++++ gdb/config/sparc/nm-fbsd.h	Tue Oct 15 18:53:19 2002
+@@ -36,6 +36,7 @@
+ 
+ #define SVR4_SHARED_LIBS
+ 
++#include "config/nm-fbsd.h"
+ #include "solib.h"		/* Support for shared libraries. */
+ #include "elf/common.h"		/* Additional ELF shared library info. */
+ 
+@@ -49,12 +50,9 @@
+ #define GDB_GREGSET_T	struct reg
+ #define GDB_FPREGSET_T	struct fpreg
+ 
+-#define regs		trapframe
+-#define r_g1		tf_global[1]
+-#define r_ps		tf_tstate
+-#define r_pc		tf_tpc
+-#define r_npc		tf_tnpc
+-#define r_y		tf_y
++#define regs		reg
++#define r_g1		r_global[1]
++#define r_ps		r_tstate
+ 
+ #define FPU_FSR_TYPE	unsigned long
+ #define fp_status	fpreg		/* our reg.h */
diff --git a/devel/gdb6/files/patch-gdb_config_sparc_fbsd.mh b/devel/gdb6/files/patch-gdb_config_sparc_fbsd.mh
new file mode 100644
index 000000000000..5631903da987
--- /dev/null
+++ b/devel/gdb6/files/patch-gdb_config_sparc_fbsd.mh
@@ -0,0 +1,10 @@
+--- gdb/config/sparc/fbsd.mh	Wed Mar 13 03:20:24 2002
++++ gdb/config/sparc/fbsd.mh	Tue Oct 15 20:54:37 2002
+@@ -21,5 +21,6 @@
+ # Host: FreeBSD/sparc64
+ NATDEPFILES= sparc-nat.o \
+ 	corelow.o fork-child.o infptrace.o inftarg.o \
+-	solib.o solib-svr4.o solib-legacy.o
++	solib.o solib-svr4.o solib-legacy.o kvm-fbsd.o
+ NAT_FILE= nm-fbsd.h
++NAT_CLIBS= -lkvm
diff --git a/devel/gdb6/files/patch-gdb_config_sparc_nm-fbsd.h b/devel/gdb6/files/patch-gdb_config_sparc_nm-fbsd.h
new file mode 100644
index 000000000000..c7261a0ca459
--- /dev/null
+++ b/devel/gdb6/files/patch-gdb_config_sparc_nm-fbsd.h
@@ -0,0 +1,26 @@
+--- gdb/config/sparc/nm-fbsd.h	Fri Mar  1 18:35:24 2002
++++ gdb/config/sparc/nm-fbsd.h	Tue Oct 15 18:53:19 2002
+@@ -36,6 +36,7 @@
+ 
+ #define SVR4_SHARED_LIBS
+ 
++#include "config/nm-fbsd.h"
+ #include "solib.h"		/* Support for shared libraries. */
+ #include "elf/common.h"		/* Additional ELF shared library info. */
+ 
+@@ -49,12 +50,9 @@
+ #define GDB_GREGSET_T	struct reg
+ #define GDB_FPREGSET_T	struct fpreg
+ 
+-#define regs		trapframe
+-#define r_g1		tf_global[1]
+-#define r_ps		tf_tstate
+-#define r_pc		tf_tpc
+-#define r_npc		tf_tnpc
+-#define r_y		tf_y
++#define regs		reg
++#define r_g1		r_global[1]
++#define r_ps		r_tstate
+ 
+ #define FPU_FSR_TYPE	unsigned long
+ #define fp_status	fpreg		/* our reg.h */
diff --git a/devel/gdb6/files/patch-sparc_fbsd.mh b/devel/gdb6/files/patch-sparc_fbsd.mh
deleted file mode 100644
index 76462162ffe2..000000000000
--- a/devel/gdb6/files/patch-sparc_fbsd.mh
+++ /dev/null
@@ -1,16 +0,0 @@
---- gdb/config/sparc/nm-fbsd.h.orig	Fri Mar  1 10:35:24 2002
-+++ gdb/config/sparc/nm-fbsd.h	Sat Oct 12 12:05:27 2002
-@@ -50,10 +50,7 @@
- #define GDB_FPREGSET_T	struct fpreg
- 
--#define regs		trapframe
--#define r_g1		tf_global[1]
--#define r_ps		tf_tstate
--#define r_pc		tf_tpc
--#define r_npc		tf_tnpc
--#define r_y		tf_y
-+#define regs		reg
-+#define r_g1		r_global[1]
-+#define r_ps		r_tstate
- 
- #define FPU_FSR_TYPE	unsigned long