* configure.tgt (i[3456]86-*-netbsdelf*): Merge with...

(i[3456]86-*-netbsd*): ...this.  Set gdb_target to nbsd.
(i[3456]86-*-openbsd*): Make this a separate entry.  Add a
comment noting that this needs its own target configuration.
* config/i386/nbsd.mt: New file.
* config/i386/nbsdaout.mt: Remove.
* config/i386/nbsdelf.mt: Ditto.
* config/i386/tm-nbsdaout.h: Ditto.

gdb/ChangeLog

@@ -1,3 +1,14 @@
+2002-09-02  Jason Thorpe  <thorpej@wasabisystems.com>
+
+	* configure.tgt (i[3456]86-*-netbsdelf*): Merge with... 
+	(i[3456]86-*-netbsd*): ...this.  Set gdb_target to nbsd. 
+	(i[3456]86-*-openbsd*): Make this a separate entry.  Add a
+	comment noting that this needs its own target configuration.
+	* config/i386/nbsd.mt: New file.
+	* config/i386/nbsdaout.mt: Remove.
+	* config/i386/nbsdelf.mt: Ditto.
+	* config/i386/tm-nbsdaout.h: Ditto. 
+
 2002-09-02  Jason Thorpe  <thorpej@wasabisystems.com>
 
 	* i386nbsd-tdep.c (i386nbsd_sigtramp_offset): New function. 

gdb/config/i386/nbsdaout.mt

@@ -1,4 +0,0 @@
-# Target: Intel 386 running NetBSD
-TDEPFILES= i386-tdep.o i387-tdep.o i386bsd-tdep.o i386nbsd-tdep.o corelow.o \
-	nbsd-tdep.o
-TM_FILE= tm-nbsdaout.h

gdb/config/i386/tm-nbsdaout.h

@@ -1,26 +0,0 @@
-/* Macro definitions for i386 running under NetBSD.
-   Copyright 2000, 2002 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_NBSDAOUT_H
-#define TM_NBSDAOUT_H
-
-#include "i386/tm-nbsd.h"
-
-#endif /* TM_NBSDAOUT_H */

gdb/configure.tgt

@@ -92,9 +92,8 @@ i[3456]86-ncr-*)	gdb_target=ncr3000 ;;
 # OBSOLETE 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 ;;
-i[3456]86-*-netbsd* | i[3456]86-*-openbsd*)
-			gdb_target=nbsdaout ;;
+i[3456]86-*-netbsd*)	gdb_target=nbsd ;;
+i[3456]86-*-openbsd*)	gdb_target=nbsd ;;	# FIXME: needs its own target
 # OBSOLETE i[3456]86-*-os9k)	gdb_target=i386os9k ;;
 i[3456]86-*-go32*)	gdb_target=i386aout ;;
 i[3456]86-*-msdosdjgpp*) gdb_target=go32 ;;