2003-11-09 Andrew Cagney <cagney@redhat.com>

	* config/mips/irix6.mh (NAT_FILE): Set to "nm-irix5.h".
	* config/mips/nm-irix6.h: Delete file.
	* config/mips/nm-linux.h: Update copyright.
	(MIPS_GNULINUX_TARGET): Delete macro.
	* config/mips/irix6.mh (XM_FILE): Set to "xm-irix5.h".
	* config/mips/xm-irix6.h: Delete file.
	* config/mips/linux.mh (XM_FILE): Delete definition.
	* config/mips/xm-linux.h: Delete file.

7 files changed, 14 insertions, 75 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2ce15c0..6f24ff9 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,16 @@
 2003-11-09  Andrew Cagney  <cagney@redhat.com>
 
+	* config/mips/irix6.mh (NAT_FILE): Set to "nm-irix5.h".
+	* config/mips/nm-irix6.h: Delete file.
+	* config/mips/nm-linux.h: Update copyright.
+	(MIPS_GNULINUX_TARGET): Delete macro.
+	* config/mips/irix6.mh (XM_FILE): Set to "xm-irix5.h".
+	* config/mips/xm-irix6.h: Delete file.
+	* config/mips/linux.mh (XM_FILE): Delete definition.
+	* config/mips/xm-linux.h: Delete file.
+
+2003-11-09  Andrew Cagney  <cagney@redhat.com>
+
 	* d10v-tdep.c (d10v_return_value): New function.
 	(d10v_use_struct_convention): Delete function.
 	(d10v_store_return_value): Delete function.
diff --git a/gdb/config/mips/irix6.mh b/gdb/config/mips/irix6.mh
index 8075f0d..141bff6 100644
--- a/gdb/config/mips/irix6.mh
+++ b/gdb/config/mips/irix6.mh
@@ -1,6 +1,6 @@
 # Host: SGI Iris running irix 6.x
-XM_FILE= xm-irix6.h
-NAT_FILE= nm-irix6.h
+XM_FILE= xm-irix5.h
+NAT_FILE= nm-irix5.h
 NATDEPFILES= fork-child.o irix5-nat.o corelow.o procfs.o \
 	proc-api.o proc-events.o proc-flags.o proc-why.o
 
diff --git a/gdb/config/mips/linux.mh b/gdb/config/mips/linux.mh
index 38f8725..3fbc3e9 100644
--- a/gdb/config/mips/linux.mh
+++ b/gdb/config/mips/linux.mh
@@ -1,5 +1,4 @@
 # Host: Linux/MIPS
-XM_FILE= xm-linux.h
 NAT_FILE= nm-linux.h
 NATDEPFILES= infptrace.o inftarg.o fork-child.o mips-linux-nat.o \
 	thread-db.o lin-lwp.o proc-service.o linux-proc.o gcore.o \
diff --git a/gdb/config/mips/nm-irix6.h b/gdb/config/mips/nm-irix6.h
deleted file mode 100644
index 301b629..0000000
--- a/gdb/config/mips/nm-irix6.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Definitions for native support of irix6.
-
-   Copyright 2001 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.  */
-
-#include "mips/nm-irix5.h"
diff --git a/gdb/config/mips/nm-linux.h b/gdb/config/mips/nm-linux.h
index 426dd55..8fd2193 100644
--- a/gdb/config/mips/nm-linux.h
+++ b/gdb/config/mips/nm-linux.h
@@ -1,6 +1,6 @@
 /* Native-dependent definitions for GNU/Linux on MIPS.
 
-   Copyright 1996, 2001, 2002 Free Software Foundation, Inc.
+   Copyright 1996, 2001, 2002, 2003 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -22,8 +22,6 @@
 #ifndef NM_MIPSLINUX_H
 #define NM_MIPSLINUX_H
 
-#define MIPS_GNULINUX_TARGET
-
 #include "config/nm-linux.h"
 
 /* Return sizeof user struct to callers in less machine dependent
diff --git a/gdb/config/mips/xm-irix6.h b/gdb/config/mips/xm-irix6.h
deleted file mode 100644
index a8a4c68..0000000
--- a/gdb/config/mips/xm-irix6.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Definitions for irix6 hosting support.
-
-   Copyright 2001 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.  */
-
-#include "mips/xm-irix5.h"
diff --git a/gdb/config/mips/xm-linux.h b/gdb/config/mips/xm-linux.h
deleted file mode 100644
index 4db6201..0000000
--- a/gdb/config/mips/xm-linux.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Host definitions for GNU/Linux on MIPS.
-
-   Copyright 2001, 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 XM_MIPSLINUX_H
-#define XM_MIPSLINUX_H
-
-#endif /* XM_MIPSLINUX_H */