From be220da15ab003d04e4a7e17096a0d98b1c5b2a3 Mon Sep 17 00:00:00 2001
From: John Gilmore <gnu@cygnus>
Date: Thu, 18 Feb 1993 07:53:44 +0000
Subject: [PATCH] * Makefile.in (VERSION):  Roll to 4.7.9. * xm-hp300bsd.h: 
 Define PSIGNAL_IN_SIGNAL_H and put a compatible definition here, to handle
 both BSD 4.3 and 4.4 systems. * tm-i386bsd.h (NUM_REGS):  There are only
 eleven, not twelve.

---
 gdb/ChangeLog     |  4 +++-
 gdb/Makefile.in   |  2 +-
 gdb/tm-i386bsd.h  |  2 +-
 gdb/xm-hp300bsd.h | 14 ++++++++++----
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7ced539..a8a1b3b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,10 +1,12 @@
 Wed Feb 17 19:24:40 1993  John Gilmore  (gnu@cygnus.com)
 
+	* Makefile.in (VERSION):  Roll to 4.7.9.
+	* xm-hp300bsd.h:  Define PSIGNAL_IN_SIGNAL_H and put a compatible
+	definition here, to handle both BSD 4.3 and 4.4 systems.
 	* mipsread.c (ZMAGIC):  #undef to avoid duplicate define.
 	* remote.c (alarm):  Move declaration to global level, before 
 	first reference to it.
 	* tm-i386bsd.h (NUM_REGS):  There are only eleven, not twelve.
-
 	* dbxread.c (process_one_symbol):  Cast to unsigned char, not int.
 
 Wed Feb 17 13:40:29 1993  K. Richard Pixley  (rich@cygnus.com)
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index cec7a7a..0154839 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -163,7 +163,7 @@ CDEPS = ${XM_CDEPS} ${TM_CDEPS} ${NAT_CDEPS} \
 ADD_FILES = ${REGEX} ${ALLOCA}  ${XM_ADD_FILES} ${TM_ADD_FILES} ${NAT_ADD_FILES}
 ADD_DEPS = ${REGEX1} ${ALLOCA1} ${XM_ADD_FILES} ${TM_ADD_FILES} ${NAT_ADD_FILES}
 
-VERSION = 4.7.6
+VERSION = 4.7.9
 DIST=gdb
 
 LINT=/usr/5bin/lint
diff --git a/gdb/tm-i386bsd.h b/gdb/tm-i386bsd.h
index 23a3433..bb884b1 100644
--- a/gdb/tm-i386bsd.h
+++ b/gdb/tm-i386bsd.h
@@ -1,5 +1,5 @@
 /* Macro definitions for i386 running under BSD Unix.
-   Copyright 1986, 1987, 1989, 1991, 1992 Free Software Foundation, Inc.
+   Copyright 1986, 1987, 1989, 1991, 1992, 1993 Free Software Foundation, Inc.
 
 This file is part of GDB.
 
diff --git a/gdb/xm-hp300bsd.h b/gdb/xm-hp300bsd.h
index c7da722..5defbb5 100644
--- a/gdb/xm-hp300bsd.h
+++ b/gdb/xm-hp300bsd.h
@@ -1,5 +1,5 @@
 /* Parameters for hosting on a Hewlett-Packard 9000/300, running bsd.
-   Copyright 1986, 1987, 1989, 1991, 1992  Free Software Foundation, Inc.
+   Copyright 1986, 1987, 1989, 1991, 1992, 1993  Free Software Foundation, Inc.
 
 This file is part of GDB.
 
@@ -19,7 +19,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /*
  * Configuration file for HP9000/300 series machine running
- * University of Utah's 4.3bsd port.  This is NOT for HP-UX.
+ * University of Utah's 4.3bsd (or 4.4BSD) port.  This is NOT for HP-UX.
  * Problems to hpbsd-bugs@cs.utah.edu
  */
 
@@ -39,6 +39,14 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /* Kernel is a bit tenacious about sharing text segments, disallowing bpts.  */
 #define	ONE_PROCESS_WRITETEXT
+
+/* psignal's definition in 4.4BSD conflicts with the one in defs.h. 
+   But there *is* no psignal definition in 4.3BSD.  So we avoid the defs.h
+   version here, and supply our own (matching) one.  */
+#define PSIGNAL_IN_SIGNAL_H
+void    psignal PARAMS ((unsigned int, const char *));
+
+extern char *strdup PARAMS ((const char *));
 
 /* Interface definitions for kernel debugger KDB.  */
 
@@ -91,5 +99,3 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 { asm ("subil #8,sp@(28)");     \
   asm ("movem sp@,#0xffff"); \
   asm ("rte"); }
-
-extern char *strdup PARAMS ((const char *));
-- 
2.7.4