* configure.host: Add patterns for i[3456]86-*-netbsdaout*

and i[3456]86-*-netbsdelf*.
* config/i386/nm-nbsdelf.h: New file.
* config/i386/nbsdelf.mh: New file.

* config/i386/nm-nbsd.h: change include of nm-nbsd.h to
the more explicit config/nm-nbsd.h.
* config/i386/tm-nbsd.h: change include of tm-i386bsd.h to
tm-i386.h.
(SIGTRAMP_START, SIGTRAMP_END, SIGCONTEXT_PC_OFFSET): Define.
-------------------------------------------------------------------

6 files changed, 62 insertions, 2 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 930ed7d9f99..02d17be766a 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,16 @@
+2000-05-31  J.T. Conklin  <jtc@redback.com>
+
+	* configure.host: Add patterns for i[3456]86-*-netbsdaout*
+	and i[3456]86-*-netbsdelf*.
+	* config/i386/nm-nbsdelf.h: New file.
+	* config/i386/nbsdelf.mh: New file.
+
+	* config/i386/nm-nbsd.h: change include of nm-nbsd.h to 
+	the more explicit config/nm-nbsd.h.
+	* config/i386/tm-nbsd.h: change include of tm-i386bsd.h to
+ 	tm-i386.h.
+	(SIGTRAMP_START, SIGTRAMP_END, SIGCONTEXT_PC_OFFSET): Define.
+
 2000-06-01  Mark Kettenis  <kettenis@gnu.org>
 
 	* NEWS: Mention FreeBSD/Alpha and FreeBSD/i386 3.x and up as new
diff --git a/gdb/config/i386/nbsdelf.mh b/gdb/config/i386/nbsdelf.mh
new file mode 100644
index 00000000000..4c197541468
--- /dev/null
+++ b/gdb/config/i386/nbsdelf.mh
@@ -0,0 +1,6 @@
+# Host: Intel 386 running NetBSD
+XDEPFILES= ser-tcp.o
+NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o \
+	i386nbsd-nat.o solib.o
+XM_FILE= xm-nbsd.h
+NAT_FILE= nm-nbsdelf.h
diff --git a/gdb/config/i386/nm-nbsd.h b/gdb/config/i386/nm-nbsd.h
index 74edd2ff46a..7de72e89458 100644
--- a/gdb/config/i386/nm-nbsd.h
+++ b/gdb/config/i386/nm-nbsd.h
@@ -22,7 +22,7 @@
 #define NM_NBSD_H
 
 /* Get generic NetBSD native definitions. */
-#include "nm-nbsd.h"
+#include "config/nm-nbsd.h"
 
 #define REGISTER_U_ADDR(addr, blockend, regno) \
 	(addr) = i386_register_u_addr ((blockend),(regno));
diff --git a/gdb/config/i386/nm-nbsdelf.h b/gdb/config/i386/nm-nbsdelf.h
new file mode 100644
index 00000000000..b06c1ec3845
--- /dev/null
+++ b/gdb/config/i386/nm-nbsdelf.h
@@ -0,0 +1,27 @@
+/* Native-dependent definitions for Intel 386 running NetBSD, for GDB.
+   Copyright 1986, 1987, 1989, 1992, 1994 Free Software Foundation, Inc.
+
+   This file is part of GDB.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#ifndef NM_NBSDELF_H
+#define NM_NBSDELF_H
+
+#define SVR4_SHARED_LIBS
+#include "i386/nm-nbsd.h"
+
+#endif /* NM_NBSDELF_H */
diff --git a/gdb/config/i386/tm-nbsd.h b/gdb/config/i386/tm-nbsd.h
index 885c8099bd1..dbe1f79e82c 100644
--- a/gdb/config/i386/tm-nbsd.h
+++ b/gdb/config/i386/tm-nbsd.h
@@ -23,7 +23,7 @@
 
 #define HAVE_I387_REGS
 
-#include "i386/tm-i386bsd.h"
+#include "i386/tm-i386.h"
 #include "tm-nbsd.h"
 
 extern use_struct_convention_fn i386nbsd_use_struct_convention;
@@ -43,4 +43,16 @@ extern int get_longjmp_target (CORE_ADDR *);
 
 #define GET_LONGJMP_TARGET(ADDR) get_longjmp_target(ADDR)
 
+
+/* Support for signal handlers.  */
+
+/* The sigtramp is above the user stack and immediately below the 
+   user area.  Using constants here allows for cross debugging. */
+
+#define SIGTRAMP_START(pc)	0xbfbfdf20
+#define SIGTRAMP_END(pc)	0xbfbfdff0
+
+/* Offset to saved PC in sigcontext, from <sys/signal.h>.  */
+#define SIGCONTEXT_PC_OFFSET 20
+
 #endif /* TM_NBSD_H */
diff --git a/gdb/configure.host b/gdb/configure.host
index 69bbd6c4ae6..db720b1345f 100644
--- a/gdb/configure.host
+++ b/gdb/configure.host
@@ -57,6 +57,8 @@ i[3456]86-*-aix*)	gdb_host=i386aix ;;
 i[3456]86-*-bsd*)	gdb_host=i386bsd ;;
 i[3456]86-*-dgux*)	gdb_host=i386dgux ;;
 i[3456]86-*-freebsd*)	gdb_host=fbsd ;;
+i[3456]86-*-netbsdelf*)	gdb_host=nbsdelf ;;
+i[3456]86-*-netbsdaout*) gdb_host=nbsd ;;
 i[3456]86-*-netbsd*)	gdb_host=nbsd ;;
 i[3456]86-*-go32*)	gdb_host=go32 ;;
 i[3456]86-*-msdosdjgpp*) gdb_host=go32 ;;