From 43a16f2688a21ba1ebfc43e28e1f192091d68455 Mon Sep 17 00:00:00 2001
From: John Gilmore <gnu@cygnus>
Date: Tue, 30 Jun 1992 09:27:41 +0000
Subject: [PATCH] Make cross compilation work better.

* tm-mips.h (GDB_TARGET_IS_MIPS):  Define for mips-xdep.c.
(READ_MIPS_FORMAT, COFF_FORMAT):  Remove, unused now.
* mips-xdep.c:  Remove most include files (unused, caused errs).
(fetch_core_registers):  Use right parameters in dummy fn.
---
 gdb/ChangeLog   |  7 +++++++
 gdb/mips-xdep.c | 31 ++++++-------------------------
 gdb/tm-mips.h   | 13 +++++--------
 3 files changed, 18 insertions(+), 33 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 251f9b558db..5e880f9d6ff 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+Tue Jun 30 02:25:10 1992  John Gilmore  (gnu at cygnus.com)
+
+	* tm-mips.h (GDB_TARGET_IS_MIPS):  Define for mips-xdep.c.
+	(READ_MIPS_FORMAT, COFF_FORMAT):  Remove, unused now.
+	* mips-xdep.c:  Remove most include files (unused, caused errs).
+	(fetch_core_registers):  Use right parameters in dummy fn.
+
 Mon Jun 29 18:30:57 1992  John Gilmore  (gnu at cygnus.com)
 
 	* buildsym.c (scan_file_globals):  Beware the null file.
diff --git a/gdb/mips-xdep.c b/gdb/mips-xdep.c
index 511c8c5f803..4052a9c4bd9 100644
--- a/gdb/mips-xdep.c
+++ b/gdb/mips-xdep.c
@@ -20,38 +20,19 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include "defs.h"
-#ifdef sgi
-#include <sys/inst.h>
-#else
-#include <mips/inst.h>
-#endif
-#include "frame.h"
 #include "inferior.h"
-#include "symtab.h"
-#include "value.h"
-
-#ifdef USG
-#include <sys/types.h>
-#endif
-
-#include <sys/param.h>
-#include <sys/dir.h>
-#include <signal.h>
-#include <sys/ioctl.h>
-/* #include <fcntl.h>  Can we live without this?  */
-
 #include "gdbcore.h"
 
-#include <sys/user.h>		/* After a.out.h  */
-#include <sys/file.h>
-#include <sys/stat.h>
-
 /* For now we stub this out; sgi format is super-hairy (and completely
    different in the new release) */
 
-#ifdef sgi
+#if defined(sgi) || !defined(GDB_TARGET_IS_MIPS)
 void
-fetch_core_registers ()
+fetch_core_registers (core_reg_sect, core_reg_size, which, reg_addr)
+     char *core_reg_sect;
+     unsigned core_reg_size;
+     int which;
+     unsigned int reg_addr;
 {
   return;
 }
diff --git a/gdb/tm-mips.h b/gdb/tm-mips.h
index b8623d5221b..59dd91c4482 100644
--- a/gdb/tm-mips.h
+++ b/gdb/tm-mips.h
@@ -26,6 +26,11 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define TARGET_BYTE_ORDER LITTLE_ENDIAN
 #endif
 
+/* FIXME, this triggers host-and-target (``native'') dependent code
+   which currently sits in mips-xdep.c.  Needs to be moved out to
+   mips-nat.c or some such.  */
+#define	GDB_TARGET_IS_MIPS
+
 /* Floating point is IEEE compliant */
 #define IEEE_FLOAT
 
@@ -34,14 +39,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /*#define NAMES_HAVE_UNDERSCORE*/
 
-/* Debugger information will be in mips' format */
-
-#define READ_MIPS_FORMAT
-
-/* File format is coff, but with additions */
-
-#define COFF_FORMAT
-
 /* Offset from address of function to start of its code.
    Zero on most machines.  */
 
-- 
2.30.2