* configure.tgt: Remove i[34567]86-*-go32*,

i[34567]86-*-msdosdjgpp*, i[34567]86-*-sco*, i[34567]86-*-sysv*
and i[34567]86-*-isc*.  Set gdb_target to i386 for
i[34567]86-*-netware* and i[34567]86-*-*.
* config/i386/i386.mt: New file.
* config/i386/embed.mt: Remove file.
* config/i386/go32.mt: Remove file.
* config/i386/i386nw.mt: Remove file.
* config/i386/i386v.mt: Remove file.
* config/i386/tm-go32.h: Remove file.

7 files changed, 15 insertions, 44 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 228ba9c..869e883 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,16 @@
 2004-04-09  Mark Kettenis  <kettenis@gnu.org>
 
+	* configure.tgt: Remove i[34567]86-*-go32*,
+	i[34567]86-*-msdosdjgpp*, i[34567]86-*-sco*, i[34567]86-*-sysv*
+	and i[34567]86-*-isc*.  Set gdb_target to i386 for
+	i[34567]86-*-netware* and i[34567]86-*-*.
+	* config/i386/i386.mt: New file.
+	* config/i386/embed.mt: Remove file.
+	* config/i386/go32.mt: Remove file.
+	* config/i386/i386nw.mt: Remove file.
+	* config/i386/i386v.mt: Remove file.
+	* config/i386/tm-go32.h: Remove file.
+
 	* tui/tui-hooks.c: Include "readline/readline.h" after
 	"gdb_curses.h" instead of before.
 	* tui/tui-io.c: Likewise.
diff --git a/gdb/config/i386/go32.mt b/gdb/config/i386/go32.mt
deleted file mode 100644
index 9b82c64..0000000
--- a/gdb/config/i386/go32.mt
+++ /dev/null
@@ -1,3 +0,0 @@
-# Target: Intel 386 running DJGPP
-TDEPFILES= i386-tdep.o i387-tdep.o
-TM_FILE= tm-go32.h
diff --git a/gdb/config/i386/embed.mt b/gdb/config/i386/i386.mt
index 0a008c7..d2eab6d 100644
--- a/gdb/config/i386/embed.mt
+++ b/gdb/config/i386/i386.mt
@@ -1,2 +1,2 @@
-# Target: Embedded Intel 386 
+# Target: i386
 TDEPFILES= i386-tdep.o i387-tdep.o
diff --git a/gdb/config/i386/i386nw.mt b/gdb/config/i386/i386nw.mt
deleted file mode 100644
index 77c6519..0000000
--- a/gdb/config/i386/i386nw.mt
+++ /dev/null
@@ -1,2 +0,0 @@
-# Target: Intel 386 running NetWare
-TDEPFILES= i386-tdep.o i387-tdep.o
diff --git a/gdb/config/i386/i386v.mt b/gdb/config/i386/i386v.mt
deleted file mode 100644
index 630b19e..0000000
--- a/gdb/config/i386/i386v.mt
+++ /dev/null
@@ -1,2 +0,0 @@
-# Target: Intel 386 running System V
-TDEPFILES= i386-tdep.o i387-tdep.o
diff --git a/gdb/config/i386/tm-go32.h b/gdb/config/i386/tm-go32.h
deleted file mode 100644
index ece1fff..0000000
--- a/gdb/config/i386/tm-go32.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Target-dependent definitions for Intel x86 running DJGPP.
-
-   Copyright 1995, 1996, 1997, 1999, 2000, 2004 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_GO32_H
-#define TM_GO32_H
-
-#undef HAVE_SSE_REGS	/* FIXME! go32-nat.c needs to support XMMi registers */
-
-#endif /* TM_GO32_H */
diff --git a/gdb/configure.tgt b/gdb/configure.tgt
index 0a14df2..c07445e 100644
--- a/gdb/configure.tgt
+++ b/gdb/configure.tgt
@@ -80,23 +80,18 @@ i[34567]86-ncr-*)	gdb_target=ncr3000 ;;
 i[34567]86-*-netbsd* | i[34567]86-*-knetbsd*-gnu)
 			gdb_target=nbsd ;;
 i[34567]86-*-openbsd*)	gdb_target=obsd ;;
-i[34567]86-*-go32*)	gdb_target=i386aout ;;
-i[34567]86-*-msdosdjgpp*) gdb_target=go32 ;;
 i[34567]86-*-nto*)	gdb_target=nto ;;
 i[34567]86-*-lynxos*)	gdb_target=i386lynx ;;
 i[34567]86-*-solaris*)	gdb_target=i386sol2 ;;
-i[34567]86-*-sco*)	gdb_target=i386v ;;
-i[34567]86-*-sysv*)	gdb_target=i386v ;;
 i[34567]86-*-linux*)	gdb_target=linux
 			build_gdbserver=yes
 			;;
-i[34567]86-*-isc*)	gdb_target=i386v ;;
 i[34567]86-*-gnu*)	gdb_target=i386gnu ;;
-i[34567]86-*-netware*)	gdb_target=i386nw
-		configdirs="${configdirs} nlm" ;;
+i[34567]86-*-netware*)	gdb_target=i386
+			configdirs="${configdirs} nlm" ;;
 i[34567]86-*-cygwin*)	gdb_target=cygwin  ;;
 i[34567]86-*-vxworks*)	gdb_target=vxworks ;;
-i[34567]86-*-*)		gdb_target=embed ;;
+i[34567]86-*-*)		gdb_target=i386 ;;
 
 ia64-*-aix*)		gdb_target=aix ;;
 ia64-*-linux*)		gdb_target=linux