* Makefile.in (OBS): Compile mipsread.c for all targets now.

(VERSION):  Bump to 4.4.85.
* mipsread.c:  Update for new include files.  Lint.
* tm-irix3.h, tm-mips.h:  Use new include files for ECOFF symtab.
* config/{bigmips.mt, littlemips.mt, irix3.mt, decstation.mt}:
Don't need to bring in mipsread.o specially any more.

5 files changed, 30 insertions, 22 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4fc45d7..9ffa704 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+Thu Apr  2 20:20:54 1992  John Gilmore  (gnu at cygnus.com)
+
+	* Makefile.in (OBS):  Compile mipsread.c for all targets now.
+	(VERSION):  Bump to 4.4.85.
+	* mipsread.c:  Update for new include files.  Lint.
+	* tm-irix3.h, tm-mips.h:  Use new include files for ECOFF symtab.
+	* config/{bigmips.mt, littlemips.mt, irix3.mt, decstation.mt}:
+	Don't need to bring in mipsread.o specially any more.
+
 Thu Apr  2 19:38:31 1992  Stu Grossman  (grossman at cygnus.com)
 
 	* mipsread.c (fixup_sigtramp):  Also look for _sigtramp as a real
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index d44f101..d41aa73 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -165,7 +165,7 @@ CDEPS = ${XM_CDEPS} ${TM_CDEPS} ${BFD_LIB} ${MMALLOC_LIB} ${LIBIBERTY} \
 ADD_FILES = ${REGEX} ${ALLOCA} ${XM_ADD_FILES} ${TM_ADD_FILES}
 ADD_DEPS = ${REGEX1} ${ALLOCA1} ${XM_ADD_FILES} ${TM_ADD_FILES}
 
-VERSION = 4.4.7
+VERSION = 4.4.85
 DIST=gdb
 
 LINT=/usr/5bin/lint
@@ -273,7 +273,7 @@ OBS = main.o blockframe.o breakpoint.o findvar.o stack.o source.o \
     copying.o $(DEPFILES) signame.o cplus-dem.o mem-break.o target.o \
     inftarg.o ieee-float.o putenv.o parse.o language.o $(YYOBJ) \
     buildsym.o objfiles.o minsyms.o \
-    dbxread.o coffread.o elfread.o dwarfread.o xcoffread.o # mipsread.o
+    dbxread.o coffread.o elfread.o dwarfread.o xcoffread.o mipsread.o
 
 RAPP_OBS = rgdb.o rudp.o rserial.o serial.o udp.o $(XDEPFILES)
 
diff --git a/gdb/mipsread.c b/gdb/mipsread.c
index 8d30109..a790061 100644
--- a/gdb/mipsread.c
+++ b/gdb/mipsread.c
@@ -62,6 +62,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <sys/stat.h>
 
 #include "coff/mips.h"
+#include "coff/sym.h"
+#include "coff/symconst.h"
+
 #include "libaout.h"		/* FIXME Secret internal BFD stuff for a.out */
 #include "aout/aout64.h"
 #include "aout/stab_gnu.h"	/* We always use GNU stabs, not native, now */
@@ -206,10 +209,10 @@ static void
 read_mips_symtab PARAMS ((struct objfile *, int));
 
 static void
-read_the_mips_symtab PARAMS ((bfd *, int, CORE_ADDR));
+read_the_mips_symtab PARAMS ((bfd *, int, CORE_ADDR *));
 
 static int
-upgrade_type PARAMS ((struct type **, int, union aux_ent *, int));
+upgrade_type PARAMS ((struct type **, int, union aux_ext *, int));
 
 static void
 parse_partial_symbols PARAMS ((int, struct objfile *));
@@ -361,7 +364,7 @@ mipscoff_symfile_finish (objfile)
 
 static PTR
 xzalloc(size)
-     int size;
+     unsigned int size;
 {
 	PTR p = xmalloc(size);
 
@@ -826,6 +829,7 @@ add_pending(fh, sh, t)
 
 static void
 free_pending(f_idx)
+	int f_idx;
 {
 	register struct mips_pending *p, *q;
 
@@ -900,14 +904,14 @@ parse_symbol(sh, ax, bigend)
 		class = LOC_STATIC;
 		b = BLOCKVECTOR_BLOCK(BLOCKVECTOR(top_stack->cur_st),
 				      GLOBAL_BLOCK);
-		s = new_symbol(sh->iss);
+		s = new_symbol((char *)sh->iss);
 		SYMBOL_VALUE_ADDRESS(s) = (CORE_ADDR)sh->value;
 		goto data;
 
 	    case stStatic:	/* static data, goes into current block. */
 		class = LOC_STATIC;
 		b = top_stack->cur_block;
-		s = new_symbol(sh->iss);
+		s = new_symbol((char *)sh->iss);
 		SYMBOL_VALUE_ADDRESS(s) = (CORE_ADDR)sh->value;
 		goto data;
 
@@ -919,7 +923,7 @@ parse_symbol(sh, ax, bigend)
 		} else
 			class = LOC_LOCAL;
 		b = top_stack->cur_block;
-		s = new_symbol(sh->iss);
+		s = new_symbol((char *)sh->iss);
 		SYMBOL_VALUE(s) = sh->value;
 
 data:		/* Common code for symbols describing data */
@@ -965,7 +969,7 @@ data:		/* Common code for symbols describing data */
 		break;
 
 	    case stLabel:	/* label, goes into current block */
-		s = new_symbol(sh->iss);
+		s = new_symbol((char *)sh->iss);
 		SYMBOL_NAMESPACE(s) = VAR_NAMESPACE;	/* so that it can be used */
 		SYMBOL_CLASS(s) = LOC_LABEL;		/* but not misused */
 		SYMBOL_VALUE_ADDRESS(s) = (CORE_ADDR)sh->value;
@@ -975,7 +979,7 @@ data:		/* Common code for symbols describing data */
 
 	    case stProc:	/* Procedure, usually goes into global block */
 	    case stStaticProc:	/* Static procedure, goes into current block */
-		s = new_symbol(sh->iss);
+		s = new_symbol((char *)sh->iss);
 		SYMBOL_NAMESPACE(s) = VAR_NAMESPACE;
 		SYMBOL_CLASS(s) = LOC_BLOCK;
 		/* Type of the return value */
@@ -1060,7 +1064,7 @@ data:		/* Common code for symbols describing data */
 		    long max_value = 0;
 		    struct field *f;
 
-		    s = new_symbol(sh->iss);
+		    s = new_symbol((char *)sh->iss);
 		    SYMBOL_NAMESPACE(s) = STRUCT_NAMESPACE;
 		    SYMBOL_CLASS(s) = LOC_TYPEDEF;
 		    SYMBOL_VALUE(s) = 0;
@@ -1253,7 +1257,7 @@ data:		/* Common code for symbols describing data */
 		break;
 
 	    case stTypedef:	/* type definition */
-		s = new_symbol(sh->iss);
+		s = new_symbol((char *)sh->iss);
 		SYMBOL_NAMESPACE(s) = VAR_NAMESPACE;
 		SYMBOL_CLASS(s) = LOC_TYPEDEF;
 		SYMBOL_BLOCK_VALUE(s) = top_stack->cur_block;
@@ -1577,6 +1581,7 @@ upgrade_type(tpp, tq, ax, bigend)
 static void
 parse_procedure(pr, bound)
 	PDR *pr;
+	int bound;
 {
 	struct symbol *s, *i;
 	SYMR *sh = (SYMR*)pr->isym;
diff --git a/gdb/tm-irix3.h b/gdb/tm-irix3.h
index 36ea3cd..84017e0 100644
--- a/gdb/tm-irix3.h
+++ b/gdb/tm-irix3.h
@@ -17,11 +17,8 @@ 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 LANGUAGE_C
-#define LANGUAGE_C
-#endif
-#include <sym.h>
-#include <symconst.h>
+#include "coff/sym.h"			/* Needed for PDR below. */
+#include "coff/symconst.h"
 
 #define TARGET_BYTE_ORDER BIG_ENDIAN
 
diff --git a/gdb/tm-mips.h b/gdb/tm-mips.h
index 7e9371f..b8623d5 100644
--- a/gdb/tm-mips.h
+++ b/gdb/tm-mips.h
@@ -19,11 +19,8 @@ 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 LANGUAGE_C
-#define LANGUAGE_C
-#endif
-#include <sym.h>
-#include <symconst.h>
+#include "coff/sym.h"		/* Needed for PDR below.  */
+#include "coff/symconst.h"
 
 #if !defined (TARGET_BYTE_ORDER)
 #define TARGET_BYTE_ORDER LITTLE_ENDIAN