* configure.host (i[3456]86-*-osf1mk*, mips-*-mach3*,

	ns32k-*-mach3*): Fix file names.
	(i[3456]86-*-os9k, m88*-*-mach3*, w65-*-*): Remove config
	recognition, no source files for these.
	* configure.tgt (powerpc-*-aix4*): Remove config, now identical
	to powerpc-*-aix*.
	* config/powerpc/{aix4.mh,aix4.mt,tm-ppc-aix4.h}: Remove files,
	no longer needed.

7 files changed, 16 insertions, 58 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e527acf..65480e3 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,14 @@
+Fri Jan 23 17:26:22 1998  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* configure.host (i[3456]86-*-osf1mk*, mips-*-mach3*,
+	ns32k-*-mach3*): Fix file names.
+	(i[3456]86-*-os9k, m88*-*-mach3*, w65-*-*): Remove config
+	recognition, no source files for these.
+	* configure.tgt (powerpc-*-aix4*): Remove config, now identical
+	to powerpc-*-aix*.
+	* config/powerpc/{aix4.mh,aix4.mt,tm-ppc-aix4.h}: Remove files,
+	no longer needed.
+
 Fri Jan 23 16:49:41 1998  Mark Alexander  <marka@cygnus.com>
 
 	* monitor.c (monitor_write, monitor_readchar): New functions.
@@ -29,7 +40,7 @@ Tue Jan 20 18:53:18 1998  Stan Shebs  <shebs@andros.cygnus.com>
 
 	* configure.tgt (i386-*-mach*, m88*-*-mach3*): Remove config
 	recognition, no source files for these (note that the i386 Mach
-	is pre-Mach 3).
+	config is for pre-Mach 3).
 	(mips*-*-mach3*, ns32k-*-mach3*): Fix file names.
 	* config/mips/mipsel64.mt: Remove, never referenced.
 
diff --git a/gdb/config/powerpc/.Sanitize b/gdb/config/powerpc/.Sanitize
index 1f8f3e8..e3d314e 100644
--- a/gdb/config/powerpc/.Sanitize
+++ b/gdb/config/powerpc/.Sanitize
@@ -25,8 +25,6 @@ Things-to-keep:
 
 aix.mh
 aix.mt
-aix4.mh
-aix4.mt
 cygwin32.mh
 cygwin32.mt
 gdbserve.mt
@@ -47,7 +45,6 @@ solaris.mt
 tm-cygwin32.h
 tm-macos.h
 tm-ppc-aix.h
-tm-ppc-aix4.h
 tm-ppc-eabi.h
 tm-ppc-nw.h
 tm-ppc-sim.h
diff --git a/gdb/config/powerpc/aix4.mh b/gdb/config/powerpc/aix4.mh
deleted file mode 100644
index 2407231..0000000
--- a/gdb/config/powerpc/aix4.mh
+++ /dev/null
@@ -1,15 +0,0 @@
-# Host: IBM PowerPC running AIX4
-
-XM_FILE= xm-aix.h
-XDEPFILES= 
-
-NAT_FILE= nm-aix.h
-NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o rs6000-nat.o xcoffread.o
-
-# When compiled with cc, for debugging, this argument should be passed.
-# We have no idea who our current compiler is though, so we skip it.
-# MH_CFLAGS = -bnodelcsect
-
-# Rumor has it that libtermcap is "not really functional", and that
-# -lcurses is better.
-TERMCAP= -lcurses
diff --git a/gdb/config/powerpc/aix4.mt b/gdb/config/powerpc/aix4.mt
deleted file mode 100644
index 29bed5f..0000000
--- a/gdb/config/powerpc/aix4.mt
+++ /dev/null
@@ -1,3 +0,0 @@
-# Target: PowerPC running AIX4
-TDEPFILES= rs6000-tdep.o xcoffsolib.o
-TM_FILE= tm-ppc-aix4.h
diff --git a/gdb/config/powerpc/tm-ppc-aix4.h b/gdb/config/powerpc/tm-ppc-aix4.h
deleted file mode 100644
index 7e4296b..0000000
--- a/gdb/config/powerpc/tm-ppc-aix4.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Macro definitions for Power PC running AIX4.
-   Copyright 1995, 1997 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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-#ifndef TM_PPC_AIX4_H
-#define TM_PPC_AIX4_H
-
-/* Use generic RS6000 definitions. */
-#include "rs6000/tm-rs6000.h"
-
-#define GDB_TARGET_POWERPC
-
-#endif /* TM_PPC_AIX4_H */
diff --git a/gdb/configure.host b/gdb/configure.host
index e527531..b9aa3ed 100644
--- a/gdb/configure.host
+++ b/gdb/configure.host
@@ -58,7 +58,7 @@ i[3456]86-*-lynxos*)	gdb_host=i386lynx ;;
 i[3456]86-*-mach3*)	gdb_host=i386m3 ;;
 i[3456]86-*-mach*)	gdb_host=i386mach ;;
 i[3456]86-*-gnu*)	gdb_host=i386gnu ;;
-i[3456]86-*-osf1mk*)	gdb_host=osf1mk ;;
+i[3456]86-*-osf1mk*)	gdb_host=i386mk ;;
 i[3456]86-*-sco3.2v5*)	gdb_host=i386sco5 ;;
 i[3456]86-*-sco3.2v4*)	gdb_host=i386sco4 ;;
 i[3456]86-*-sco*)	gdb_host=i386sco ;;
@@ -72,7 +72,6 @@ i[3456]86-*-unixware2*)	gdb_host=i386v42mp ;;
 i[3456]86-*-unixware*)	gdb_host=i386v4 ;;
 i[3456]86-*-sysv*)	gdb_host=i386v ;;
 i[3456]86-*-isc*)	gdb_host=i386v32 ;;
-i[3456]86-*-os9k)	gdb_host=i386os9k ;;
 i[3456]86-*-cygwin32)	gdb_host=cygwin32 ;;
 i[3456]86-*-windows)	gdb_host=windows
 			configdirs=mswin
@@ -102,7 +101,6 @@ m68*-sun-*)		gdb_host=sun3os4 ;;
 m88*-harris-cxux*)	gdb_host=cxux ;;
 m88*-motorola-sysv4*)	gdb_host=delta88v4 ;;
 m88*-motorola-sysv*)	gdb_host=delta88 ;;
-m88*-*-mach3*)		gdb_host=mach3 ;;
 m88*-*-*)		gdb_host=m88k ;;
 
 mips-dec-mach3*)	gdb_host=mach3 ;;
@@ -114,7 +112,7 @@ mips-sgi-irix5*)	gdb_host=irix5 ;;
 # Close enough for now.
 mips-sgi-irix6*)	gdb_host=irix5 ;;
 mips-sony-*)		gdb_host=news-mips ;;
-mips-*-mach3*)		gdb_host=mach3 ;;
+mips-*-mach3*)		gdb_host=mipsm3 ;;
 mips-*-sysv4*)		gdb_host=mipsv4 ;;
 mips-*-sysv*)		gdb_host=riscos ;;
 mips-*-riscos*)		gdb_host=riscos ;;
@@ -123,7 +121,7 @@ none-*-*)		gdb_host=none ;;
 
 np1-*-*)		gdb_host=np1 ;;
 
-ns32k-*-mach3*)		gdb_host=mach3 ;;
+ns32k-*-mach3*)		gdb_host=ns32km3 ;;
 ns32k-*-netbsd*)	gdb_host=nbsd ;;
 ns32k-umax-*)		gdb_host=umax ;;
 ns32k-utek-sysv*)	gdb_host=merlin ;;
@@ -132,6 +130,7 @@ powerpc-*-aix*)		gdb_host=aix ;;
 powerpcle-*-cygwin32)	gdb_host=cygwin32 ;;
 powerpcle-*-solaris*)	gdb_host=solaris ;;
 powerpc-*-linux*)	gdb_host=linux ;;
+
 pn-*-*)			gdb_host=pn ;;
 
 pyramid-*-*)		gdb_host=pyramid ;;
@@ -156,6 +155,4 @@ vax-*-bsd*)		gdb_host=vaxbsd ;;
 vax-*-ultrix2*)		gdb_host=vaxult2 ;;
 vax-*-ultrix*)		gdb_host=vaxult ;;
 
-w65-*-*)		gdb_host=w65 ;;
-
 esac
diff --git a/gdb/configure.tgt b/gdb/configure.tgt
index d3cf7d9..ce9bb1e 100644
--- a/gdb/configure.tgt
+++ b/gdb/configure.tgt
@@ -233,7 +233,6 @@ powerpc-*-macos*)	gdb_target=macos ;;
 powerpc-*-netware*)	gdb_target=ppc-nw
 			configdirs="${configdirs} nlm" ;;
 
-powerpc-*-aix4*)	gdb_target=aix4 ;;
 powerpc-*-aix*)		gdb_target=aix ;;
 powerpcle-*-cygwin32)	gdb_target=cygwin32 ;;
 powerpcle-*-solaris*)	gdb_target=solaris ;;