* infrun.c: Fixed typo in comment.

	* utils.c:  All the v*fprintf emulation is now in libiberty,
	so we can get rid of some junk.
	* xm-sun3os4.h, xm-sun4os4.h, xconfig/decstation, xconfig/i386sco,
	xconfig/sun3os4, xconfig/sun4os4: Don`t need HAVE_STRSTR any more.
	* m68k-pinsn.c (print_insn_arg):  Support BB/BW/BL
	type operands, as used by branch instructions.
	* gmalloc.c: Fix prototype of memcpy.
	* elfread.c: Comment out register_addr, since it conflicts
	with the one in coredep.c.
	* buildsym.h:  Remove extern declarations of two functions
	that are really static in buildsym.c.
	* tm-mips.h: Add symbolic names for more registers.
	* mips-xdep.c (store_inferior_registers): Use new register names.
	* xm-mips.h: Simplify REGISTER_U_ADDR, since it is now
	only used for core files, not ptrace.  Therefore,
	the KERNEL_U_ADDR hack is no longer needed.
	The mapping to ptrace number is now in in mips-xdep.c.
	* mips-xdep.c:  Define REGISTER_PTRACE_ADDR (using the
	mapping from the old REGISTER_U_ADDR), and use it
	in {fetch,store}_inferior_registers.
	* mipsread.c: Rename #include ecoff.h to new name coff-mips.h.
	* mips-tdep.c (mips_push_dummy_frame, mips_pop_frame):
	Save/restore FP regs correctly (?).
	* dbxread.c: Remove duplicate define_symbol and type_synonym_name
	(these had been previously moved to buildsym.c).
	Hence, define_symbol becomes extern instead of static.
	* buildsym.c (read_struct_type):  Comment out bogus handling
	of C++ operator methods.  Minor hacking of reading of class
	contexts. Make define_symbol non-static, so dbxread.c can call it.

13 files changed, 91 insertions, 284 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1aa0870035c..f85cf891d1f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,36 @@
+Mon Nov  4 10:49:33 1991  Per Bothner  (bothner at cygnus.com)
+
+	* infrun.c:  Fixed typo in comment.
+	* utils.c:  All the v*fprintf emulation is now in libiberty,
+	so we can get rid of some junk.
+	* xm-sun3os4.h, xm-sun4os4.h, xconfig/decstation, xconfig/i386sco,
+	xconfig/sun3os4, xconfig/sun4os4: Don`t need HAVE_STRSTR any more.
+	* m68k-pinsn.c (print_insn_arg):  Support BB/BW/BL
+	type operands, as used by branch instructions.
+	* gmalloc.c: Fix prototype of memcpy.
+	* elfread.c: Comment out register_addr, since it conflicts
+	with the one in coredep.c.
+	* buildsym.h:  Remove extern declarations of two functions
+	that are really static in buildsym.c.
+	* tm-mips.h: Add symbolic names for more registers.
+	* mips-xdep.c (store_inferior_registers): Use new register names.
+	* xm-mips.h: Simplify REGISTER_U_ADDR, since it is now
+	only used for core files, not ptrace.  Therefore,
+	the KERNEL_U_ADDR hack is no longer needed.
+	The mapping to ptrace number is now in in mips-xdep.c.
+	* mips-xdep.c:  Define REGISTER_PTRACE_ADDR (using the
+	mapping from the old REGISTER_U_ADDR), and use it
+	in {fetch,store}_inferior_registers.
+	* mipsread.c: Rename #include ecoff.h to new name coff-mips.h.
+	* mips-tdep.c (mips_push_dummy_frame, mips_pop_frame):
+	Save/restore FP regs correctly (?).
+	* dbxread.c: Remove duplicate define_symbol and type_synonym_name
+	(these had been previously moved to buildsym.c).
+	Hence, define_symbol becomes extern instead of static.
+	* buildsym.c (read_struct_type):  Comment out bogus handling
+	of C++ operator methods.  Minor hacking of reading of class
+	contexts. Make define_symbol non-static, so dbxread.c can call it.
+
 Fri Nov  1 11:05:47 1991  John Gilmore  (gnu at cygnus.com)
 
 	* mipsread.c (read_mips_symtab, read_the_mips_symtab):  Use real
diff --git a/gdb/buildsym.c b/gdb/buildsym.c
index 09d6c01df49..41bdca19be3 100644
--- a/gdb/buildsym.c
+++ b/gdb/buildsym.c
@@ -51,7 +51,7 @@ extern int hashname ();
 extern void patch_block_stabs ();	/* AIX xcoffread.c */
 #define patch_block_stabs abort		/* FIXME scaffolding */
 
-static struct symbol *define_symbol ();
+
 static void cleanup_undefined_types ();
 static void fix_common_block ();
 
@@ -826,7 +826,7 @@ read_type_number (pp, typenums)
 static char *type_synonym_name;
 
 /* ARGSUSED */
-static struct symbol *
+struct symbol *
 define_symbol (valu, string, desc, type)
      unsigned int valu;
      char *string;
@@ -1841,14 +1841,13 @@ read_struct_type (pp, type)
 		}
 	      *pp = p + 1;
 	      context = read_type (pp);
-	      if (type_name_no_tag (context) == 0)
+	      name = type_name_no_tag (context);
+	      if (name == 0)
 		{
-		  if (name == 0)
-		    error ("type name unknown at symtab pos %d.", symnum);
-		  /* FIXME-tiemann: when is `name' ever non-0?  */
-		  TYPE_NAME (context) = obsavestring (name, p - name - 1);
+		  error ("type name unknown at symtab pos %d.", symnum);
+		  TYPE_NAME (context) = name;
 		}
-	      list->field.name = obconcat (prefix, type_name_no_tag (context), "");
+	      list->field.name = obconcat (prefix, name, "");
 	      p = ++(*pp);
 	      if (p[-1] != ':')
 		error ("invalid abbreviation at symtab pos %d.", symnum);
@@ -2034,29 +2033,32 @@ read_struct_type (pp, type)
 
 	  /* read in the name.  */
 	  while (*p != ':') p++;
+#if 0
 	  if ((*pp)[0] == 'o' && (*pp)[1] == 'p' && (*pp)[2] == CPLUS_MARKER)
 	    {
 	      /* This lets the user type "break operator+".
 	         We could just put in "+" as the name, but that wouldn't
 		 work for "*".  */
+	     /* I don't understand what this is trying to do.
+		It seems completely bogus.  -Per Bothner. */
 	      static char opname[32] = {'o', 'p', CPLUS_MARKER};
 	      char *o = opname + 3;
 
 	      /* Skip past '::'.  */
-	      p += 2;
+	      *pp = p + 2;
+	      if (**pp == '\\') *pp = next_symbol_text ();
+	      p = *pp;
 	      while (*p != '.')
 		*o++ = *p++;
-	     main_fn_name = savestring (opname, o - opname);
+	      main_fn_name = savestring (opname, o - opname);
 	      /* Skip past '.'  */
 	      *pp = p + 1;
 	    }
 	  else
-	    {
-	      i = 0;
+#endif
 	      main_fn_name = savestring (*pp, p - *pp);
-	      /* Skip past '::'.  */
-	      *pp = p + 2;
-	    }
+	  /* Skip past '::'.  */
+	  *pp = p + 2;
 	  new_mainlist->fn_fieldlist.name = main_fn_name;
 
 	  do
diff --git a/gdb/buildsym.h b/gdb/buildsym.h
index 0cea60bcfe0..d9ecb8f04a2 100644
--- a/gdb/buildsym.h
+++ b/gdb/buildsym.h
@@ -34,7 +34,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #endif
 
 extern void add_symbol_to_list ();
-extern void process_one_symbol ();
 extern struct type *read_type ();
 extern struct type *read_range_type ();
 extern struct type *read_enum_type ();
@@ -45,7 +44,6 @@ extern struct type **dbx_lookup_type ();
 extern long read_number ();
 extern void finish_block ();
 extern struct blockvector *make_blockvector ();
-extern void add_undefined_type ();
 extern void really_free_pendings ();
 extern void start_subfile ();
 extern struct symtab *end_symtab ();
diff --git a/gdb/depend b/gdb/depend
index cca7d45642a..73bff51ca8d 100755
--- a/gdb/depend
+++ b/gdb/depend
@@ -1,240 +1,12 @@
-altos-xdep.o : altos-xdep.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status frame.h \
-  inferior.h breakpoint.h value.h symtab.h gdbcore.h ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h 
-am29k-pinsn.o : am29k-pinsn.c defs.h target.h ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h ${srcdir}/../include/obstack.h am29k-opcode.h 
-am29k-tdep.o : am29k-tdep.c defs.h gdbcore.h ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h ${srcdir}/../include/obstack.h frame.h param.h tm.h config.status \
-  param-no-tm.h xm.h config.status value.h symtab.h inferior.h breakpoint.h 
-arm-pinsn.o : arm-pinsn.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status symtab.h \
-  arm-opcode.h 
-arm-tdep.o : arm-tdep.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status frame.h \
-  inferior.h breakpoint.h value.h symtab.h arm-opcode.h gdbcore.h \
-  ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h 
-arm-xdep.o : arm-xdep.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status frame.h \
-  inferior.h breakpoint.h value.h symtab.h arm-opcode.h gdbcore.h \
-  ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h 
 blockframe.o : blockframe.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status symtab.h \
   frame.h gdbcore.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h value.h \
   target.h 
 breakpoint.o : breakpoint.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status symtab.h \
   frame.h breakpoint.h value.h expression.h gdbcore.h ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h gdbcmd.h command.h inferior.h target.h 
-coffread.o : coffread.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status symtab.h \
-  breakpoint.h value.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h symfile.h \
-  ${srcdir}/../include/internalcoff.h ${srcdir}/../bfd/libcoff.h 
-command.o : command.c defs.h command.h symtab.h value.h 
-convex-pinsn.o : convex-pinsn.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status \
-  symtab.h convx-opcode.h 
-convex-tdep.o : convex-tdep.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status \
-  command.h symtab.h value.h frame.h inferior.h breakpoint.h \
-  ${srcdir}/../include/wait.h gdbcore.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h \
-  gdbcmd.h 
-convex-xdep.o : convex-xdep.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status \
-  command.h symtab.h value.h frame.h inferior.h breakpoint.h \
-  ${srcdir}/../include/wait.h gdbcore.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h \
-  gdbcmd.h 
-core.o : core.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status frame.h inferior.h \
-  breakpoint.h value.h symtab.h command.h ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h target.h gdbcore.h 
-coredep.o : coredep.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status gdbcore.h \
-  ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h ${srcdir}/../include/obstack.h 
-cplus-dem.o : cplus-dem.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status 
-dbxread.o : dbxread.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status \
-  ${srcdir}/../include/a.out.gnu.h ${srcdir}/../include/reloc.h ${srcdir}/../include/stab.gnu.h \
-  ${srcdir}/../include/stab.def symtab.h breakpoint.h value.h command.h target.h \
-  ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h gdbcore.h ${srcdir}/../bfd/libaout.h \
-  symfile.h 
-environ.o : environ.c environ.h defs.h 
-eval.o : eval.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status symtab.h value.h \
-  expression.h target.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h frame.h 
-exec.o : exec.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status frame.h inferior.h \
-  breakpoint.h value.h symtab.h target.h ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h gdbcmd.h command.h gdbcore.h 
-expprint.o : expprint.c defs.h symtab.h param.h tm.h config.status param-no-tm.h xm.h config.status \
-  expression.h value.h 
-findvar.o : findvar.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status symtab.h \
-  frame.h value.h gdbcore.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h \
-  inferior.h breakpoint.h target.h 
-gould-pinsn.o : gould-pinsn.c gdbcore.h ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h ${srcdir}/../include/obstack.h defs.h param.h tm.h config.status \
-  param-no-tm.h xm.h config.status symtab.h frame.h np1-opcode.h 
-gould-xdep.o : gould-xdep.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status frame.h \
-  inferior.h breakpoint.h value.h symtab.h gdbcore.h ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h 
-hp300ux-xdep.o : hp300ux-xdep.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status \
-  frame.h inferior.h breakpoint.h value.h symtab.h gdbcore.h \
-  ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h 
-i386-pinsn.o : i386-pinsn.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status \
-  gdbcore.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h ${srcdir}/../include/obstack.h 
-i386-tdep.o : i386-tdep.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status frame.h \
-  inferior.h breakpoint.h value.h symtab.h gdbcore.h ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h 
-i386-xdep.o : i386-xdep.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status frame.h \
-  inferior.h breakpoint.h value.h symtab.h gdbcore.h ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h 
-i960-pinsn.o : i960-pinsn.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status frame.h \
-  inferior.h breakpoint.h value.h symtab.h 
-i960-tdep.o : i960-tdep.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status symtab.h \
-  value.h frame.h signame.h ieee-float.h 
-ieee-float.o : ieee-float.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status \
-  ieee-float.h 
-infcmd.o : infcmd.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status symtab.h frame.h \
-  inferior.h breakpoint.h value.h environ.h gdbcmd.h command.h gdbcore.h \
-  ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h target.h 
-inflow.o : inflow.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status frame.h \
-  inferior.h breakpoint.h value.h symtab.h command.h signals.h terminal.h \
-  target.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h 
-infptrace.o : infptrace.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status frame.h \
-  inferior.h breakpoint.h value.h symtab.h target.h ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h gdbcore.h 
-infrun.o : infrun.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status symtab.h frame.h \
-  inferior.h breakpoint.h value.h ${srcdir}/../include/wait.h gdbcore.h \
-  ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h signame.h command.h terminal.h \
-  target.h 
-inftarg.o : inftarg.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status frame.h \
-  inferior.h breakpoint.h value.h symtab.h target.h ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h ${srcdir}/../include/wait.h gdbcore.h ieee-float.h 
-m68k-pinsn.o : m68k-pinsn.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status symtab.h \
-  m68k-opcode.h gdbcore.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h 
-m68k-tdep.o : m68k-tdep.c defs.h ieee-float.h 
-m88k-pinsn.o : m88k-pinsn.c m88k-opcode.h defs.h symtab.h 
-m88k-tdep.o : m88k-tdep.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status frame.h \
-  inferior.h breakpoint.h value.h symtab.h gdbcore.h ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h /usr/include/setjmp.h 
-m88k-xdep.o : m88k-xdep.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status frame.h \
-  inferior.h breakpoint.h value.h symtab.h gdbcore.h ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h /usr/include/setjmp.h 
-main.o : main.c defs.h gdbcmd.h command.h param.h tm.h config.status param-no-tm.h xm.h config.status \
-  symtab.h inferior.h breakpoint.h value.h frame.h signals.h target.h \
-  ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h ${srcdir}/../include/getopt.h \
-  ${srcdir}/../readline/readline.h ${srcdir}/../readline/keymaps.h ${srcdir}/../readline/chardefs.h \
-  ${srcdir}/../readline/history.h 
-mem-break.o : mem-break.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status 
-mips-pinsn.o : mips-pinsn.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status symtab.h \
-  mips-opcode.h 
-mips-tdep.o : mips-tdep.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status frame.h \
-  inferior.h breakpoint.h value.h symtab.h gdbcmd.h command.h gdbcore.h \
-  ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h 
-mips-xdep.o : mips-xdep.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status frame.h \
-  inferior.h breakpoint.h value.h symtab.h gdbcore.h ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h 
-mipsread.o : mipsread.c param.h tm.h config.status param-no-tm.h xm.h config.status \
-  ${srcdir}/../include/obstack.h defs.h symtab.h gdbcore.h ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h symfile.h ${srcdir}/../include/ecoff.h 
-news-xdep.o : news-xdep.c 
-Onindy.o : ${srcdir}/nindy-share/Onindy.c ${srcdir}/nindy-share/ttycntl.h \
-  ${srcdir}/nindy-share/block_io.h ${srcdir}/../include/wait.h ${srcdir}/nindy-share/env.h \
-  /usr/include/string.h 
-nindy.o : ${srcdir}/nindy-share/nindy.c ${srcdir}/nindy-share/ttycntl.h ${srcdir}/nindy-share/block_io.h \
-  ${srcdir}/../include/wait.h ${srcdir}/nindy-share/env.h /usr/include/string.h 
-ttybreak.o : ${srcdir}/nindy-share/ttybreak.c ${srcdir}/nindy-share/ttycntl.h 
-ttyflush.o : ${srcdir}/nindy-share/ttyflush.c ${srcdir}/nindy-share/ttycntl.h 
-nindy-tdep.o : nindy-tdep.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status symtab.h \
-  frame.h 
-ns32k-pinsn.o : ns32k-pinsn.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status \
-  symtab.h ns32k-opcode.h gdbcore.h ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h 
-printcmd.o : printcmd.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status frame.h \
-  symtab.h value.h expression.h gdbcore.h ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h gdbcmd.h command.h target.h 
-pyr-pinsn.o : pyr-pinsn.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status symtab.h \
-  pyr-opcode.h gdbcore.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h 
-pyr-tdep.o : pyr-tdep.c 
-pyr-xdep.o : pyr-xdep.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status frame.h \
-  inferior.h breakpoint.h value.h symtab.h gdbcore.h ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h 
-remote-adapt.o : remote-adapt.c defs.h tm.h config.status param-no-tm.h xm.h config.status inferior.h \
-  breakpoint.h value.h symtab.h frame.h param.h ${srcdir}/../include/wait.h \
-  terminal.h target.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h gdbcore.h 
-remote-eb.o : remote-eb.c defs.h tm-29k.h param-no-tm.h xm.h config.status inferior.h \
-  breakpoint.h value.h symtab.h frame.h param.h ${srcdir}/../include/wait.h \
-  terminal.h target.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h 
-remote-mm.o : remote-mm.c defs.h inferior.h breakpoint.h value.h symtab.h \
-  frame.h param.h tm.h config.status param-no-tm.h xm.h config.status ${srcdir}/../include/wait.h terminal.h \
-  minimon.h target.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h 
-remote-nindy.o : remote-nindy.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status \
-  frame.h inferior.h breakpoint.h value.h symtab.h target.h \
-  ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h gdbcore.h command.h ieee-float.h \
-  ${srcdir}/../include/wait.h ${srcdir}/nindy-share/ttycntl.h ${srcdir}/nindy-share/demux.h \
-  ${srcdir}/nindy-share/env.h ${srcdir}/nindy-share/stop.h 
-remote-vx.o : remote-vx.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status frame.h \
-  inferior.h breakpoint.h value.h symtab.h ${srcdir}/../include/wait.h target.h \
-  ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h gdbcore.h command.h symfile.h \
-  ${srcdir}/vx-share/xdr_ptrace.h ${srcdir}/vx-share/xdr_regs.h ${srcdir}/vx-share/reg.h \
-  ${srcdir}/vx-share/xdr_ld.h ${srcdir}/vx-share/xdr_rdb.h ${srcdir}/vx-share/dbgRpcLib.h 
-remote.o : remote.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status frame.h \
-  inferior.h breakpoint.h value.h symtab.h target.h ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h ${srcdir}/../include/wait.h terminal.h 
-signame.o : signame.c signame.h defs.h param.h tm.h config.status param-no-tm.h xm.h config.status 
-solib.o : solib.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status symtab.h gdbcore.h \
-  ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h command.h target.h frame.h \
-  regex.h inferior.h breakpoint.h value.h 
-source.o : source.c defs.h symtab.h param.h tm.h config.status param-no-tm.h xm.h config.status \
-  command.h gdbcmd.h frame.h gdbcore.h ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h regex.h 
-sparc-pinsn.o : sparc-pinsn.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status \
-  symtab.h sparc-opcode.h gdbcore.h ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h /usr/include/string.h target.h 
-sparc-tdep.o : sparc-tdep.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status frame.h \
-  inferior.h breakpoint.h value.h symtab.h signame.h target.h \
-  ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h ieee-float.h gdbcore.h 
-sparc-xdep.o : sparc-xdep.c defs.h tm-sparc.h param-no-tm.h xm.h config.status inferior.h \
-  breakpoint.h value.h symtab.h frame.h param.h target.h ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h gdbcore.h 
-stack.o : stack.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status symtab.h frame.h \
-  gdbcmd.h command.h value.h gdbcore.h ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h target.h breakpoint.h 
-sun3-xdep.o : sun3-xdep.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status inferior.h \
-  breakpoint.h value.h symtab.h frame.h gdbcore.h ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h 
-sun386-xdep.o : sun386-xdep.c 
-symfile.o : symfile.c defs.h symtab.h param.h tm.h config.status param-no-tm.h xm.h config.status \
-  gdbcore.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h frame.h target.h \
-  value.h symfile.h gdbcmd.h command.h breakpoint.h 
-symm-tdep.o : symm-tdep.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status frame.h \
-  inferior.h breakpoint.h value.h symtab.h gdbcore.h ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h 
-symm-xdep.o : symm-xdep.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status frame.h \
-  inferior.h breakpoint.h value.h symtab.h gdbcore.h ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h 
-symmisc.o : symmisc.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status symtab.h \
-  breakpoint.h value.h command.h 
-symtab.o : symtab.c defs.h symtab.h param.h tm.h config.status param-no-tm.h xm.h config.status \
-  gdbcore.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h frame.h target.h \
-  value.h symfile.h gdbcmd.h command.h regex.h 
-tahoe-pinsn.o : tahoe-pinsn.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status \
-  symtab.h tahoe-opcode.h 
-target.o : target.c defs.h target.h ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h ${srcdir}/../include/obstack.h gdbcmd.h command.h symtab.h \
-  inferior.h breakpoint.h value.h frame.h param.h tm.h config.status param-no-tm.h xm.h config.status \
-  symfile.h 
-tdesc.o : tdesc.c 
-ultra3-xdep.o : ultra3-xdep.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status \
-  frame.h inferior.h breakpoint.h value.h symtab.h gdbcore.h \
-  ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h 
-umax-xdep.o : umax-xdep.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status frame.h \
-  inferior.h breakpoint.h value.h symtab.h gdbcore.h ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h 
-utils.o : utils.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status signals.h gdbcmd.h \
-  command.h terminal.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h \
-  ${srcdir}/../include/obstack.h target.h 
-valarith.o : valarith.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status value.h \
-  symtab.h expression.h target.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h 
-valops.o : valops.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status symtab.h value.h \
-  frame.h inferior.h breakpoint.h gdbcore.h ${srcdir}/../include/bfd.h \
-  ${srcdir}/../include/ansidecl.h target.h 
-valprint.o : valprint.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status symtab.h \
-  value.h gdbcore.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h gdbcmd.h \
-  command.h target.h 
-values.o : values.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status symtab.h value.h \
-  gdbcore.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h frame.h command.h \
-  gdbcmd.h 
-vax-pinsn.o : vax-pinsn.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status symtab.h \
-  vax-opcode.h 
-xdr_ld.o : ${srcdir}/vx-share/xdr_ld.c ${srcdir}/vx-share/vxWorks.h ${srcdir}/vx-share/vxTypes.h \
-  /usr/include/rpc/rpc.h ${srcdir}/vx-share/xdr_ld.h 
-xdr_ptrace.o : ${srcdir}/vx-share/xdr_ptrace.c 
-xdr_rdb.o : ${srcdir}/vx-share/xdr_rdb.c ${srcdir}/vx-share/vxWorks.h ${srcdir}/vx-share/vxTypes.h \
-  ${srcdir}/vx-share/xdr_rdb.h 
-xdr_regs.o : ${srcdir}/vx-share/xdr_regs.c 
+  ${srcdir}/../include/ansidecl.h gdbcmd.h command.h inferior.h target.h language.h 
+buildsym.o : buildsym.c defs.h param.h tm.h config.status param-no-tm.h xm.h config.status \
+  ${srcdir}/../include/obstack.h symtab.h breakpoint.h value.h gdbcore.h \
+  ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h symfile.h \
+  ${srcdir}/../include/stab.gnu.h ${srcdir}/../include/stab.def buildsym.h 
+c-exp.tab.o : c-exp.tab.c ${srcdir}/defs.h ${srcdir}/param.h tm.h config.status ${srcdir}/param-no-tm.h xm.h config.status \
+  ${srcdir}/symtab.h ${srcdir}/frame.h ${srcdir}/expression.h ${srcdir}/parser-defs.h ${srcdir}/value.h ${srcdir}/language.h 
diff --git a/gdb/elfread.c b/gdb/elfread.c
index 8c8e8c0f36f..124e9a250e8 100644
--- a/gdb/elfread.c
+++ b/gdb/elfread.c
@@ -58,6 +58,7 @@ struct elfinfo {
   unsigned int lnsize;		/* Size of dwarf line number section */
 };
 
+#if 0
 /* FIXME - crude hack to resolve undefined global.  This function is
    part of support for corefiles, which is not yet implemented. */
 
@@ -68,6 +69,7 @@ DEFUN(register_addr, (regno, blockend),
 {
 	error ("Fetching registers from corefiles unimplemented.");
 }
+#endif
 
 /* We are called once per section from elf_symfile_read.  We
    need to examine each section we are passed, check to see
diff --git a/gdb/gmalloc.c b/gdb/gmalloc.c
index 6f10e090fe0..775e2dac65f 100755
--- a/gdb/gmalloc.c
+++ b/gdb/gmalloc.c
@@ -216,7 +216,7 @@ extern PTR EXFUN(realloc, (PTR, size_t));
 #include <stddef.h>
 #endif
 
-extern PTR EXFUN(memcpy, (PTR, PTR, size_t));
+extern PTR EXFUN(memcpy, (PTR, CONST PTR, size_t));
 extern PTR EXFUN(memset, (PTR, int, size_t));
 #define memmove memcpy
 
diff --git a/gdb/m68k-pinsn.c b/gdb/m68k-pinsn.c
index c080d8cad26..b648abbada5 100644
--- a/gdb/m68k-pinsn.c
+++ b/gdb/m68k-pinsn.c
@@ -306,9 +306,11 @@ print_insn_arg (d, buffer, p, addr, stream)
     case 'B':
       if (place == 'b')
 	val = NEXTBYTE (p);
-      else if (place == 'w')
+      else if (place == 'B')
+	val = buffer[1];
+      else if (place == 'w' || place == 'W')
 	val = NEXTWORD (p);
-      else if (place == 'l')
+      else if (place == 'l' || place == 'L')
 	val = NEXTLONG (p);
       else if (place == 'g')
 	{
diff --git a/gdb/mips-xdep.c b/gdb/mips-xdep.c
index 51984e73566..a5b0b03e655 100644
--- a/gdb/mips-xdep.c
+++ b/gdb/mips-xdep.c
@@ -73,6 +73,19 @@ store_inferior_registers (regno)
 
 #else
 
+/* Map gdb internal register number to ptrace address. */
+
+#define REGISTER_PTRACE_ADDR(regno) \
+ (regno < 32 ? regno 		\
+  : regno == PC_REGNUM ? 96	\
+  : regno == CAUSE_REGNUM ? 97	\
+  : regno == HI_REGNUM ? 98	\
+  : regno == LO_REGNUM ? 99	\
+  : regno == FCRCS_REGNUM ? 100	\
+  : regno == FCRIR_REGNUM ? 101	\
+  : regno >= FP0_REGNUM ? regno - (FP0_REGNUM-32)\
+  : 0)
+
 /* Get all registers from the inferior */
 
 void
@@ -87,7 +100,7 @@ fetch_inferior_registers ()
 
   for (regno = 1; regno < NUM_REGS; regno++)
     {
-      regaddr = register_addr (regno, 1);
+      regaddr = REGISTER_PTRACE_ADDR (regno);
       for (i = 0; i < REGISTER_RAW_SIZE (regno); i += sizeof (int))
  	{
  	  *(int *) &buf[i] = ptrace (3, inferior_pid, regaddr, 0);
@@ -113,7 +126,7 @@ store_inferior_registers (regno)
 
   if (regno > 0)
     {
-      regaddr = register_addr (regno, 1);
+      regaddr = REGISTER_PTRACE_ADDR (regno);
       errno = 0;
       ptrace (6, inferior_pid, regaddr, read_register (regno));
       if (errno != 0)
@@ -124,10 +137,11 @@ store_inferior_registers (regno)
     }
   else
     {
-      for (regno = 1; regno < NUM_REGS; regno++)
+      for (regno = 0; regno < NUM_REGS; regno++)
 	{
-	  if (regno == 32 || regno == 35 || regno == 36
-	      || regno == 71 || regno == FP_REGNUM)
+	  if (regno == ZERO_REGNUM || regno == PS_REGNUM
+	      || regno == BADVADDR_REGNUM || regno == CAUSE_REGNUM
+	      || regno == FCRIR_REGNUM || regno == FP_REGNUM)
 	    continue;
 	  regaddr = register_addr (regno, 1);
 	  errno = 0;
diff --git a/gdb/tm-mips.h b/gdb/tm-mips.h
index edc6aabbc2d..f872a044b3b 100644
--- a/gdb/tm-mips.h
+++ b/gdb/tm-mips.h
@@ -120,12 +120,15 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
    to be actual register numbers as far as the user is concerned
    but do serve to get the desired values when passed to read_register.  */
 
+#define ZERO_REGNUM 0		/* read-only register, always 0 */
 #define SP_REGNUM 29		/* Contains address of top of stack */
-#define PC_REGNUM 37		/* Contains program counter */
 #define RA_REGNUM 31		/* Contains return address value */
 #define PS_REGNUM 32		/* Contains processor status */
 #define HI_REGNUM 34            /* Multiple/divide temp */
 #define LO_REGNUM 33            /* ... */
+#define BADVADDR_REGNUM 35	/* bad vaddr for addressing exception */
+#define CAUSE_REGNUM 36		/* describes last exception */
+#define PC_REGNUM 37		/* Contains program counter */
 #define FP0_REGNUM 38           /* Floating point register 0 (single float) */
 #define FCRCS_REGNUM 70         /* FP control/status */
 #define FCRIR_REGNUM 71         /* FP implementation/revision */
diff --git a/gdb/valprint.c b/gdb/valprint.c
index d10b55dea3c..1baf6984e6b 100644
--- a/gdb/valprint.c
+++ b/gdb/valprint.c
@@ -407,7 +407,7 @@ static int
 is_vtbl_ptr_type(type)
      struct type *type;
 {
-  char *typename = TYPE_NAME(type);
+  char *typename = type_name_no_tag (type);
   static const char vtbl_ptr_name[] =
     { CPLUS_MARKER,'v','t','b','l','_','p','t','r','_','t','y','p','e', 0 };
 
diff --git a/gdb/xm-mips.h b/gdb/xm-mips.h
index 4b5eb5fd8d7..ff2bebf51b5 100644
--- a/gdb/xm-mips.h
+++ b/gdb/xm-mips.h
@@ -27,28 +27,13 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define	SET_STACK_LIMIT_HUGE
 
-/* This WOULD BE the amount to subtract from u.u_ar0
-   to get the offset in the core file of the register values.
-   But Mips' ptrace works on regnums, not displacements.  So since
-   REGISTER_U_ADDR is called for both core files and ptrace, use
-   BLOCKEND as a flag:  0 for core files, 1 for ptrace.  What a
-   kludge.  */
+#define KERNEL_U_ADDR 0 /* Not needed. */
 
-#define KERNEL_U_ADDR (int)reg_ptr	/* Magic, causes a zero blockend */
+/* Only used for core files on DECstations. */
 
 #define REGISTER_U_ADDR(addr, blockend, regno) 		\
-   if (blockend == 0) {					\
 	if (regno < 38) addr = (NBPG*UPAGES) + (regno - 38)*sizeof(int);\
-	else addr = 0; /* ..somewhere in the pcb */	\
-   } else if (regno < 32) addr = regno;			\
-   else if (regno == PC_REGNUM) addr = 96;		\
-   else if (regno == 36) addr = 97;			\
-   else if (regno == HI_REGNUM) addr = 98;		\
-   else if (regno == LO_REGNUM) addr = 99;		\
-   else if (regno == FCRCS_REGNUM) addr = 100;		\
-   else if (regno == FCRIR_REGNUM) addr = 101;		\
-   else if (regno >= FP0_REGNUM) addr = regno - (FP0_REGNUM-32);\
-   else addr = 0;
+	else addr = 0; /* ..somewhere in the pcb */
 
 /* Override copies of {fetch,store}_inferior_registers in infptrace.c.  */
 #define FETCH_INFERIOR_REGISTERS
diff --git a/gdb/xm-sun3os4.h b/gdb/xm-sun3os4.h
index ac61c6cb230..d7d1c958d04 100644
--- a/gdb/xm-sun3os4.h
+++ b/gdb/xm-sun3os4.h
@@ -26,5 +26,3 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
    the area occupied by the shared libraries.  Sun knows about this bug
    but has no obvious fix for it.  */
 #define BROKEN_LARGE_ALLOCA
-
-#define HAVE_STRSTR
diff --git a/gdb/xm-sun4os4.h b/gdb/xm-sun4os4.h
index b2f3de6e4ea..75f10375079 100644
--- a/gdb/xm-sun4os4.h
+++ b/gdb/xm-sun4os4.h
@@ -26,5 +26,3 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
    the area occupied by the shared libraries.  Sun knows about this bug
    but has no obvious fix for it.  */
 #define BROKEN_LARGE_ALLOCA
-
-#define HAVE_STRSTR