* configure.tgt: Add pattern for i[3456]86-*-netbsdelf*.

* config/i386/nbsdelf.mt: New file.
* config/i386/tm-nbsdelf.h: New file.

* config/i386/tm-nbsd.h: change include of tm-nbsd.h to
the more explicit config/tm-nbsd.h.

5 files changed, 46 insertions, 2 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 01bd2381211..003ff850b4b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2000-06-02  J.T. Conklin  <jtc@redback.com>
+
+	* configure.tgt: Add pattern for i[3456]86-*-netbsdelf*.
+	* config/i386/nbsdelf.mt: New file.
+	* config/i386/tm-nbsdelf.h: New file.
+	
+	* config/i386/tm-nbsd.h: change include of tm-nbsd.h to 
+	the more explicit config/tm-nbsd.h.
+
 2000-06-02  Mark Kettenis  <kettenis@gnu.org>
 
 	* alphabsd-nat.c (supply_fpregset): Substract FP0_REGNUM from
diff --git a/gdb/config/i386/nbsdelf.mt b/gdb/config/i386/nbsdelf.mt
new file mode 100644
index 00000000000..278217332fe
--- /dev/null
+++ b/gdb/config/i386/nbsdelf.mt
@@ -0,0 +1,5 @@
+# Target: Intel 386 running NetBSD
+TDEPFILES= i386-tdep.o i387-tdep.o
+TM_FILE= tm-nbsdelf.h
+
+GDBSERVER_DEPFILES= low-nbsd.o
diff --git a/gdb/config/i386/tm-nbsd.h b/gdb/config/i386/tm-nbsd.h
index dbe1f79e82c..a24ac0d69a9 100644
--- a/gdb/config/i386/tm-nbsd.h
+++ b/gdb/config/i386/tm-nbsd.h
@@ -1,5 +1,5 @@
 /* Macro definitions for i386 running under NetBSD.
-   Copyright 1994 Free Software Foundation, Inc.
+   Copyright 1994, 2000 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -24,7 +24,7 @@
 #define HAVE_I387_REGS
 
 #include "i386/tm-i386.h"
-#include "tm-nbsd.h"
+#include "config/tm-nbsd.h"
 
 extern use_struct_convention_fn i386nbsd_use_struct_convention;
 #define USE_STRUCT_CONVENTION(gcc_p, type) \
diff --git a/gdb/config/i386/tm-nbsdelf.h b/gdb/config/i386/tm-nbsdelf.h
new file mode 100644
index 00000000000..4d802c5302d
--- /dev/null
+++ b/gdb/config/i386/tm-nbsdelf.h
@@ -0,0 +1,28 @@
+/* Macro definitions for i386 running under NetBSD.
+   Copyright 2000 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 TM_NBSDELF_H
+#define TM_NBSDELF_H
+
+#include "i386/tm-nbsd.h"
+
+#undef USE_STRUCT_CONVENTION
+
+#endif /* TM_NBSD_H */
diff --git a/gdb/configure.tgt b/gdb/configure.tgt
index 8cd89708df0..99deff296fc 100644
--- a/gdb/configure.tgt
+++ b/gdb/configure.tgt
@@ -88,6 +88,8 @@ i[3456]86-*-elf*)	gdb_target=embed ;;
 i[3456]86-*-aix*)	gdb_target=i386aix ;;
 i[3456]86-*-bsd*)	gdb_target=i386bsd ;;
 i[3456]86-*-freebsd*)	gdb_target=fbsd ;;
+i[3456]86-*-netbsdelf*)	gdb_target=nbsdelf
+		configdirs="${configdirs} gdbserver" ;;
 i[3456]86-*-netbsd*)	gdb_target=nbsd 
 		configdirs="${configdirs} gdbserver" ;;
 i[3456]86-*-os9k)	gdb_target=i386os9k ;;