configure changes and -opcode.h movement.

9 files changed, 487 insertions, 263 deletions

diff --git a/gdb/Makefile.dist b/gdb/Makefile.dist
index fffccd2..4771214 100755
--- a/gdb/Makefile.dist
+++ b/gdb/Makefile.dist
@@ -75,10 +75,14 @@ INCLUDE_DEP = $$(INCLUDE_DIR)
 BFD_DIR =  ${srcdir}/../bfd
 BFD_DEP = $$(BFD_DIR)
 
+# the parent of the directory in which live the readline headers.
+READLINE_DIR = ${srcdir}/..
+READLINE_DEP = $$(READLINE_DIR)
+
 # All the includes used for CFLAGS and for lint.
 # -I. for config files.
 # -I${srcdir} possibly for regex.h also.
-INCLUDE_CFLAGS = -I. -I${srcdir} -I$(INCLUDE_DIR) -I${srcdir}/vx-share
+INCLUDE_CFLAGS = -I. -I${srcdir} -I$(INCLUDE_DIR) -I$(READLINE_DIR) -I${srcdir}/vx-share
 
 # {X,T}M_CFLAGS, if defined, has system-dependent CFLAGS.
 # CFLAGS for both GDB and readline.
@@ -106,9 +110,9 @@ TERMCAP = -ltermcap
 # For example, -lPW for System V to get alloca().
 # FIXME STOPGAP FOR BFD LIBRARY: BFD stuff
 CLIBS = ${TERMCAP} $(XM_CLIBS) ${TM_CLIBS} ${BFD_DIR}${subdir}/libbfd.a \
-	${LIBIBERTY}
-CDEPS = ${XM_CDEPS} ${TM_CDEPS} ${BFD_DIR}/libbfd.a \
-	${LIBIBERTY}
+	${LIBIBERTY} ${READLINE_DIR}/readline${subdir}/libreadline.a
+CDEPS = ${XM_CDEPS} ${TM_CDEPS} ${BFD_DIR}${subdir}/libbfd.a \
+	${LIBIBERTY} ${READLINE_DIR}/readline${subdir}/libreadline.a
 
 ADD_FILES = ${REGEX} ${ALLOCA} ${GNU_MALLOC}
 ADD_DEPS = ${REGEX1} ${ALLOCA1} ${GNU_MALLOC}
@@ -176,9 +180,11 @@ HFILES=	breakpoint.h command.h defs.h environ.h \
 	target.h tdesc.h terminal.h tm-68k.h tm-i960.h tm-sunos.h \
 	value.h
 
-OPCODES = pn-opcode.h np1-opcode.h sparc-opcode.h vax-opcode.h m68k-opcode.h \
-	  ns32k-opcode.h convx-opcode.h pyr-opcode.h mips-opcode.h \
-	  am29k-opcode.h
+OPCODES = $(INCLUDE_DIR)/pn-opcode.h $(INCLUDE_DIR)/np1-opcode.h \
+	$(INCLUDE_DIR)/sparc-opcode.h $(INCLUDE_DIR)/vax-opcode.h \
+	$(INCLUDE_DIR)/m68k-opcode.h $(INCLUDE_DIR)/ns32k-opcode.h \
+	$(INCLUDE_DIR)/convx-opcode.h $(INCLUDE_DIR)/pyr-opcode.h \
+	$(INCLUDE_DIR)/mips-opcode.h $(INCLUDE_DIR)/am29k-opcode.h
 
 REMOTE_EXAMPLES = rem-m68k.shar rem-multi.shar
 
@@ -229,7 +235,7 @@ TSSTART = /lib/crt0.o
 
 NTSSTART = kdb-start.o
 
-RL_LIB = readline/libreadline.a
+RL_LIB = ../readline/libreadline.a
 RL_LIB_DEP = $(RL_LIB)
 
 # Prevent Sun make from putting in the machine type.  Setting
@@ -357,7 +363,7 @@ depend: $(SOURCES) Makefile.dist
 	@echo can safely be ignored.
 	@echo Also ignore parse errors in valops.c, and any errors in
 	@echo arm-convert.s.
-	-$(GCC) -MM $(CFLAGS) -I$(BFD_DIR) \
+	-$(GCC) -MM $(CFLAGS) -I$(READLINE_DIR) -I$(BFD_DIR) \
 	    `ls $(SOURCES) | sort -u` >depend.tmp
 	<depend.tmp sed -e 's/ [xt]m.h/& config.status/g'  \
 	  -e 's; vx-share/; $${srcdir}/vx-share/;g'  \
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index fffccd2..4771214 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -75,10 +75,14 @@ INCLUDE_DEP = $$(INCLUDE_DIR)
 BFD_DIR =  ${srcdir}/../bfd
 BFD_DEP = $$(BFD_DIR)
 
+# the parent of the directory in which live the readline headers.
+READLINE_DIR = ${srcdir}/..
+READLINE_DEP = $$(READLINE_DIR)
+
 # All the includes used for CFLAGS and for lint.
 # -I. for config files.
 # -I${srcdir} possibly for regex.h also.
-INCLUDE_CFLAGS = -I. -I${srcdir} -I$(INCLUDE_DIR) -I${srcdir}/vx-share
+INCLUDE_CFLAGS = -I. -I${srcdir} -I$(INCLUDE_DIR) -I$(READLINE_DIR) -I${srcdir}/vx-share
 
 # {X,T}M_CFLAGS, if defined, has system-dependent CFLAGS.
 # CFLAGS for both GDB and readline.
@@ -106,9 +110,9 @@ TERMCAP = -ltermcap
 # For example, -lPW for System V to get alloca().
 # FIXME STOPGAP FOR BFD LIBRARY: BFD stuff
 CLIBS = ${TERMCAP} $(XM_CLIBS) ${TM_CLIBS} ${BFD_DIR}${subdir}/libbfd.a \
-	${LIBIBERTY}
-CDEPS = ${XM_CDEPS} ${TM_CDEPS} ${BFD_DIR}/libbfd.a \
-	${LIBIBERTY}
+	${LIBIBERTY} ${READLINE_DIR}/readline${subdir}/libreadline.a
+CDEPS = ${XM_CDEPS} ${TM_CDEPS} ${BFD_DIR}${subdir}/libbfd.a \
+	${LIBIBERTY} ${READLINE_DIR}/readline${subdir}/libreadline.a
 
 ADD_FILES = ${REGEX} ${ALLOCA} ${GNU_MALLOC}
 ADD_DEPS = ${REGEX1} ${ALLOCA1} ${GNU_MALLOC}
@@ -176,9 +180,11 @@ HFILES=	breakpoint.h command.h defs.h environ.h \
 	target.h tdesc.h terminal.h tm-68k.h tm-i960.h tm-sunos.h \
 	value.h
 
-OPCODES = pn-opcode.h np1-opcode.h sparc-opcode.h vax-opcode.h m68k-opcode.h \
-	  ns32k-opcode.h convx-opcode.h pyr-opcode.h mips-opcode.h \
-	  am29k-opcode.h
+OPCODES = $(INCLUDE_DIR)/pn-opcode.h $(INCLUDE_DIR)/np1-opcode.h \
+	$(INCLUDE_DIR)/sparc-opcode.h $(INCLUDE_DIR)/vax-opcode.h \
+	$(INCLUDE_DIR)/m68k-opcode.h $(INCLUDE_DIR)/ns32k-opcode.h \
+	$(INCLUDE_DIR)/convx-opcode.h $(INCLUDE_DIR)/pyr-opcode.h \
+	$(INCLUDE_DIR)/mips-opcode.h $(INCLUDE_DIR)/am29k-opcode.h
 
 REMOTE_EXAMPLES = rem-m68k.shar rem-multi.shar
 
@@ -229,7 +235,7 @@ TSSTART = /lib/crt0.o
 
 NTSSTART = kdb-start.o
 
-RL_LIB = readline/libreadline.a
+RL_LIB = ../readline/libreadline.a
 RL_LIB_DEP = $(RL_LIB)
 
 # Prevent Sun make from putting in the machine type.  Setting
@@ -357,7 +363,7 @@ depend: $(SOURCES) Makefile.dist
 	@echo can safely be ignored.
 	@echo Also ignore parse errors in valops.c, and any errors in
 	@echo arm-convert.s.
-	-$(GCC) -MM $(CFLAGS) -I$(BFD_DIR) \
+	-$(GCC) -MM $(CFLAGS) -I$(READLINE_DIR) -I$(BFD_DIR) \
 	    `ls $(SOURCES) | sort -u` >depend.tmp
 	<depend.tmp sed -e 's/ [xt]m.h/& config.status/g'  \
 	  -e 's; vx-share/; $${srcdir}/vx-share/;g'  \
diff --git a/gdb/alldeps.mak b/gdb/alldeps.mak
index 50da245..b621d17 100644
--- a/gdb/alldeps.mak
+++ b/gdb/alldeps.mak
@@ -141,7 +141,6 @@ ALLCONFIG=\
 ./tconfig/isi\
 ./tconfig/littlemips\
 ./tconfig/m88k\
-./tconfig/m88k.orig\
 ./tconfig/merlin\
 ./tconfig/news\
 ./tconfig/news1000\
@@ -180,7 +179,6 @@ ALLCONFIG=\
 ./xconfig/isi\
 ./xconfig/littlemips\
 ./xconfig/m88k\
-./xconfig/m88k.orig\
 ./xconfig/merlin\
 ./xconfig/news\
 ./xconfig/news1000\
diff --git a/gdb/coffread.c b/gdb/coffread.c
index 4601e2d..debf04b 100644
--- a/gdb/coffread.c
+++ b/gdb/coffread.c
@@ -20,6 +20,7 @@ You should have received a copy of the GNU General Public License
 along with GDB; see the file COPYING.  If not, write to
 the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
+
 #include <stdio.h>
 #include "defs.h"
 #include "param.h"
@@ -28,6 +29,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "bfd.h"
 #include "symfile.h"
 
+#ifndef NO_COFF
+
 #if defined (TDESC)
 /* Need to get C_VERSION and friends.  */
 #include <a.out.h>
@@ -2048,3 +2051,5 @@ _initialize_coffread ()
 {
   add_symtab_fns(&coff_sym_fns);
 }
+
+#endif /* NO_COFF */
diff --git a/gdb/configure.in b/gdb/configure.in
index 6cc5fba..cd6844d 100644
--- a/gdb/configure.in
+++ b/gdb/configure.in
@@ -12,7 +12,7 @@ if [ ! -f xconfig/${host} ]; then
 	exit 1
 fi
 
-targetfile=`awk '
+hostfile=`awk '
   $1 == "XM_FILE=" { print $2 }' <xconfig/$host`
 if [ "${targetfile}" = "/" ] ; then
 	targetfile=/dev/null
@@ -30,7 +30,7 @@ if [ -z "${removing}" ] ; then
 		print substr($0,6)}'
 fi
 
-hostfile=`awk '
+targetfile=`awk '
   $1 == "TM_FILE=" { print $2 }' <tconfig/$target`
 if [ "${hostfile}" = "/" ] ; then
 	hostfile=/dev/null
diff --git a/gdb/depend b/gdb/depend
index 352c04d..da54ee7 100755
--- a/gdb/depend
+++ b/gdb/depend
@@ -1,116 +1,128 @@
-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 $(INCLUDE_DIR)/bfd.h \
-  $(INCLUDE_DIR)/ansidecl.h 
+altos-xdep.o : altos-xdep.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h \
+  xm.h config.status tm-sparc.h tm-sunos.h frame.h inferior.h breakpoint.h value.h symtab.h \
+  gdbcore.h bfd.h ansidecl.h 
 am29k-pinsn.o : am29k-pinsn.c defs.h target.h am29k-opcode.h 
-am29k-tdep.o : am29k-tdep.c defs.h gdbcore.h $(INCLUDE_DIR)/bfd.h \
-  $(INCLUDE_DIR)/ansidecl.h $(INCLUDE_DIR)/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 \
-  $(INCLUDE_DIR)/bfd.h $(INCLUDE_DIR)/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 \
-  $(INCLUDE_DIR)/bfd.h $(INCLUDE_DIR)/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 $(INCLUDE_DIR)/bfd.h $(INCLUDE_DIR)/ansidecl.h value.h \
+am29k-tdep.o : am29k-tdep.c defs.h gdbcore.h bfd.h ansidecl.h \
+  $(INCLUDE_DIR)/obstack.h frame.h param.h tm.h config.status xm-sparc.h param-no-tm.h xm.h config.status \
+  tm-sparc.h tm-sunos.h value.h symtab.h inferior.h breakpoint.h 
+arm-pinsn.o : arm-pinsn.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h xm.h config.status \
+  tm-sparc.h tm-sunos.h symtab.h $(INCLUDE_DIR)/arm-opcode.h 
+arm-tdep.o : arm-tdep.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h xm.h config.status \
+  tm-sparc.h tm-sunos.h frame.h inferior.h breakpoint.h value.h symtab.h \
+  $(INCLUDE_DIR)/arm-opcode.h gdbcore.h bfd.h ansidecl.h 
+arm-xdep.o : arm-xdep.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h xm.h config.status \
+  tm-sparc.h tm-sunos.h frame.h inferior.h breakpoint.h value.h symtab.h \
+  $(INCLUDE_DIR)/arm-opcode.h gdbcore.h bfd.h ansidecl.h 
+blockframe.o : blockframe.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h \
+  xm.h config.status tm-sparc.h tm-sunos.h symtab.h frame.h gdbcore.h bfd.h ansidecl.h \
+  value.h target.h 
+breakpoint.o : breakpoint.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h \
+  xm.h config.status tm-sparc.h tm-sunos.h symtab.h frame.h breakpoint.h value.h \
+  expression.h gdbcore.h bfd.h ansidecl.h gdbcmd.h command.h inferior.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 $(INCLUDE_DIR)/bfd.h \
-  $(INCLUDE_DIR)/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 $(INCLUDE_DIR)/bfd.h $(INCLUDE_DIR)/ansidecl.h symfile.h \
-  $(BFD_DIR)/libcoff.h 
+coffread.o : coffread.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h xm.h config.status \
+  tm-sparc.h tm-sunos.h symtab.h breakpoint.h value.h bfd.h ansidecl.h \
+  symfile.h $(BFD_DIR)/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 \
-  $(INCLUDE_DIR)/wait.h gdbcore.h $(INCLUDE_DIR)/bfd.h $(INCLUDE_DIR)/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 \
-  $(INCLUDE_DIR)/wait.h gdbcore.h $(INCLUDE_DIR)/bfd.h $(INCLUDE_DIR)/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 $(INCLUDE_DIR)/bfd.h \
-  $(INCLUDE_DIR)/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 \
-  $(INCLUDE_DIR)/bfd.h $(INCLUDE_DIR)/ansidecl.h $(INCLUDE_DIR)/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 \
-  $(INCLUDE_DIR)/a.out.gnu.h $(INCLUDE_DIR)/reloc.h $(INCLUDE_DIR)/stab.gnu.h \
-  $(INCLUDE_DIR)/stab.def symtab.h breakpoint.h value.h command.h target.h \
-  gdbcore.h $(INCLUDE_DIR)/bfd.h $(INCLUDE_DIR)/ansidecl.h $(BFD_DIR)/liba.out.h \
-  symfile.h 
+convex-pinsn.o : convex-pinsn.c defs.h param.h tm.h config.status xm-sparc.h \
+  param-no-tm.h xm.h config.status tm-sparc.h tm-sunos.h symtab.h \
+  $(INCLUDE_DIR)/convx-opcode.h 
+convex-tdep.o : convex-tdep.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h \
+  xm.h config.status tm-sparc.h tm-sunos.h command.h symtab.h value.h frame.h inferior.h \
+  breakpoint.h $(INCLUDE_DIR)/wait.h gdbcore.h bfd.h ansidecl.h gdbcmd.h 
+convex-xdep.o : convex-xdep.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h \
+  xm.h config.status tm-sparc.h tm-sunos.h command.h symtab.h value.h frame.h inferior.h \
+  breakpoint.h $(INCLUDE_DIR)/wait.h gdbcore.h bfd.h ansidecl.h gdbcmd.h 
+core.o : core.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h xm.h config.status \
+  tm-sparc.h tm-sunos.h frame.h inferior.h breakpoint.h value.h symtab.h \
+  command.h bfd.h ansidecl.h target.h gdbcore.h 
+coredep.o : coredep.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h xm.h config.status \
+  tm-sparc.h tm-sunos.h gdbcore.h bfd.h ansidecl.h $(INCLUDE_DIR)/obstack.h 
+cplus-dem.o : cplus-dem.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h xm.h config.status \
+  tm-sparc.h tm-sunos.h 
+dbxread.o : dbxread.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h xm.h config.status \
+  tm-sparc.h tm-sunos.h $(INCLUDE_DIR)/a.out.gnu.h $(INCLUDE_DIR)/reloc.h \
+  $(INCLUDE_DIR)/stab.gnu.h $(INCLUDE_DIR)/stab.def symtab.h breakpoint.h value.h \
+  command.h target.h gdbcore.h bfd.h ansidecl.h $(BFD_DIR)/liba.out.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 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 gdbcore.h $(INCLUDE_DIR)/bfd.h \
-  $(INCLUDE_DIR)/ansidecl.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 $(INCLUDE_DIR)/bfd.h $(INCLUDE_DIR)/ansidecl.h \
+eval.o : eval.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h xm.h config.status \
+  tm-sparc.h tm-sunos.h symtab.h value.h expression.h target.h frame.h 
+exec.o : exec.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h xm.h config.status \
+  tm-sparc.h tm-sunos.h frame.h inferior.h breakpoint.h value.h symtab.h \
+  target.h gdbcmd.h command.h gdbcore.h bfd.h ansidecl.h 
+expprint.o : expprint.c defs.h symtab.h param.h tm.h config.status xm-sparc.h \
+  param-no-tm.h xm.h config.status tm-sparc.h tm-sunos.h expression.h value.h 
+findvar.o : findvar.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h xm.h config.status \
+  tm-sparc.h tm-sunos.h symtab.h frame.h value.h gdbcore.h bfd.h ansidecl.h \
   inferior.h breakpoint.h target.h 
-gould-pinsn.o : gould-pinsn.c gdbcore.h $(INCLUDE_DIR)/bfd.h \
-  $(INCLUDE_DIR)/ansidecl.h $(INCLUDE_DIR)/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 $(INCLUDE_DIR)/bfd.h \
-  $(INCLUDE_DIR)/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 \
-  $(INCLUDE_DIR)/bfd.h $(INCLUDE_DIR)/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 $(INCLUDE_DIR)/bfd.h $(INCLUDE_DIR)/ansidecl.h $(INCLUDE_DIR)/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 $(INCLUDE_DIR)/bfd.h \
-  $(INCLUDE_DIR)/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 $(INCLUDE_DIR)/bfd.h \
-  $(INCLUDE_DIR)/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 \
-  $(INCLUDE_DIR)/bfd.h $(INCLUDE_DIR)/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 
-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 gdbcore.h \
-  $(INCLUDE_DIR)/bfd.h $(INCLUDE_DIR)/ansidecl.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 $(INCLUDE_DIR)/wait.h gdbcore.h \
-  $(INCLUDE_DIR)/bfd.h $(INCLUDE_DIR)/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 $(INCLUDE_DIR)/wait.h \
-  gdbcore.h $(INCLUDE_DIR)/bfd.h $(INCLUDE_DIR)/ansidecl.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 $(INCLUDE_DIR)/bfd.h $(INCLUDE_DIR)/ansidecl.h 
+gould-pinsn.o : gould-pinsn.c gdbcore.h bfd.h ansidecl.h \
+  $(INCLUDE_DIR)/obstack.h defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h xm.h config.status \
+  tm-sparc.h tm-sunos.h symtab.h frame.h $(INCLUDE_DIR)/np1-opcode.h 
+gould-xdep.o : gould-xdep.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h \
+  xm.h config.status tm-sparc.h tm-sunos.h frame.h inferior.h breakpoint.h value.h symtab.h \
+  gdbcore.h bfd.h ansidecl.h 
+hp300ux-xdep.o : hp300ux-xdep.c defs.h param.h tm.h config.status xm-sparc.h \
+  param-no-tm.h xm.h config.status tm-sparc.h tm-sunos.h frame.h inferior.h breakpoint.h \
+  value.h symtab.h gdbcore.h bfd.h ansidecl.h 
+i386-pinsn.o : i386-pinsn.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h \
+  xm.h config.status tm-sparc.h tm-sunos.h gdbcore.h bfd.h ansidecl.h \
+  $(INCLUDE_DIR)/obstack.h 
+i386-tdep.o : i386-tdep.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h xm.h config.status \
+  tm-sparc.h tm-sunos.h frame.h inferior.h breakpoint.h value.h symtab.h \
+  gdbcore.h bfd.h ansidecl.h 
+i386-xdep.o : i386-xdep.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h xm.h config.status \
+  tm-sparc.h tm-sunos.h frame.h inferior.h breakpoint.h value.h symtab.h \
+  gdbcore.h bfd.h ansidecl.h 
+i960-pinsn.o : i960-pinsn.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h \
+  xm.h config.status tm-sparc.h tm-sunos.h frame.h inferior.h breakpoint.h value.h symtab.h 
+i960-tdep.o : i960-tdep.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h xm.h config.status \
+  tm-sparc.h tm-sunos.h 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 xm-sparc.h param-no-tm.h \
+  xm.h config.status tm-sparc.h tm-sunos.h ieee-float.h 
+infcmd.o : infcmd.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h xm.h config.status \
+  tm-sparc.h tm-sunos.h symtab.h frame.h inferior.h breakpoint.h value.h \
+  environ.h gdbcmd.h command.h gdbcore.h bfd.h ansidecl.h target.h 
+inflow.o : inflow.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h xm.h config.status \
+  tm-sparc.h tm-sunos.h frame.h inferior.h breakpoint.h value.h symtab.h \
+  command.h signals.h terminal.h target.h 
+infptrace.o : infptrace.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h xm.h config.status \
+  tm-sparc.h tm-sunos.h frame.h inferior.h breakpoint.h value.h symtab.h \
+  target.h gdbcore.h bfd.h ansidecl.h 
+infrun.o : infrun.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h xm.h config.status \
+  tm-sparc.h tm-sunos.h symtab.h frame.h inferior.h breakpoint.h value.h \
+  $(INCLUDE_DIR)/wait.h gdbcore.h bfd.h ansidecl.h signame.h command.h \
+  terminal.h target.h 
+inftarg.o : inftarg.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h xm.h config.status \
+  tm-sparc.h tm-sunos.h frame.h inferior.h breakpoint.h value.h symtab.h \
+  target.h $(INCLUDE_DIR)/wait.h gdbcore.h bfd.h ansidecl.h ieee-float.h 
+m68k-pinsn.o : m68k-pinsn.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h \
+  xm.h config.status tm-sparc.h tm-sunos.h symtab.h $(INCLUDE_DIR)/m68k-opcode.h gdbcore.h \
+  bfd.h ansidecl.h 
 m68k-tdep.o : m68k-tdep.c defs.h ieee-float.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 
-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 \
-  $(INCLUDE_DIR)/bfd.h $(INCLUDE_DIR)/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 $(INCLUDE_DIR)/bfd.h \
-  $(INCLUDE_DIR)/ansidecl.h 
-mipsread.o : mipsread.c param.h tm.h config.status param-no-tm.h xm.h config.status \
-  $(INCLUDE_DIR)/obstack.h defs.h symtab.h gdbcore.h $(INCLUDE_DIR)/bfd.h \
-  $(INCLUDE_DIR)/ansidecl.h symfile.h $(INCLUDE_DIR)/intel-coff.h 
+m88k-pinsn.o : m88k-pinsn.c $(INCLUDE_DIR)/m88k-opcode.h defs.h symtab.h 
+m88k-tdep.o : m88k-tdep.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h xm.h config.status \
+  tm-sparc.h tm-sunos.h frame.h inferior.h breakpoint.h value.h symtab.h \
+  gdbcore.h bfd.h ansidecl.h /usr/include/setjmp.h 
+m88k-xdep.o : m88k-xdep.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h xm.h config.status \
+  tm-sparc.h tm-sunos.h frame.h inferior.h breakpoint.h value.h symtab.h \
+  gdbcore.h bfd.h ansidecl.h /usr/include/setjmp.h 
+main.o : main.c defs.h gdbcmd.h command.h param.h tm.h config.status xm-sparc.h \
+  param-no-tm.h xm.h config.status tm-sparc.h tm-sunos.h symtab.h inferior.h breakpoint.h \
+  value.h frame.h signals.h target.h 
+mem-break.o : mem-break.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h xm.h config.status \
+  tm-sparc.h tm-sunos.h breakpoint.h value.h symtab.h inferior.h frame.h \
+  target.h 
+mips-pinsn.o : mips-pinsn.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h \
+  xm.h config.status tm-sparc.h tm-sunos.h symtab.h $(INCLUDE_DIR)/mips-opcode.h 
+mips-tdep.o : mips-tdep.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h xm.h config.status \
+  tm-sparc.h tm-sunos.h frame.h inferior.h breakpoint.h value.h symtab.h \
+  gdbcmd.h command.h gdbcore.h bfd.h ansidecl.h 
+mips-xdep.o : mips-xdep.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h xm.h config.status \
+  tm-sparc.h tm-sunos.h frame.h inferior.h breakpoint.h value.h symtab.h \
+  gdbcore.h bfd.h ansidecl.h 
+mipsread.o : mipsread.c param.h tm.h config.status xm-sparc.h param-no-tm.h xm.h config.status \
+  tm-sparc.h tm-sunos.h $(INCLUDE_DIR)/obstack.h defs.h symtab.h gdbcore.h \
+  bfd.h ansidecl.h symfile.h $(INCLUDE_DIR)/intel-coff.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 $(INCLUDE_DIR)/wait.h ${srcdir}/nindy-share/env.h \
@@ -119,95 +131,98 @@ nindy.o : ${srcdir}/nindy-share/nindy.c ${srcdir}/nindy-share/ttycntl.h ${srcdir
   $(INCLUDE_DIR)/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 $(INCLUDE_DIR)/bfd.h \
-  $(INCLUDE_DIR)/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 $(INCLUDE_DIR)/bfd.h \
-  $(INCLUDE_DIR)/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 $(INCLUDE_DIR)/bfd.h $(INCLUDE_DIR)/ansidecl.h 
+nindy-tdep.o : nindy-tdep.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h \
+  xm.h config.status tm-sparc.h tm-sunos.h symtab.h frame.h 
+ns32k-pinsn.o : ns32k-pinsn.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h \
+  xm.h config.status tm-sparc.h tm-sunos.h symtab.h $(INCLUDE_DIR)/ns32k-opcode.h gdbcore.h \
+  bfd.h ansidecl.h 
+printcmd.o : printcmd.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h xm.h config.status \
+  tm-sparc.h tm-sunos.h frame.h symtab.h value.h expression.h gdbcore.h bfd.h \
+  ansidecl.h gdbcmd.h command.h target.h 
+pyr-pinsn.o : pyr-pinsn.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h xm.h config.status \
+  tm-sparc.h tm-sunos.h symtab.h $(INCLUDE_DIR)/pyr-opcode.h gdbcore.h bfd.h \
+  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 $(INCLUDE_DIR)/bfd.h \
-  $(INCLUDE_DIR)/ansidecl.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 $(INCLUDE_DIR)/wait.h \
-  terminal.h target.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 gdbcore.h \
-  $(INCLUDE_DIR)/bfd.h $(INCLUDE_DIR)/ansidecl.h command.h ieee-float.h \
+pyr-xdep.o : pyr-xdep.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h xm.h config.status \
+  tm-sparc.h tm-sunos.h frame.h inferior.h breakpoint.h value.h symtab.h \
+  gdbcore.h bfd.h ansidecl.h 
+remote-eb.o : remote-eb.c defs.h tm-29k.h param-no-tm.h xm.h config.status tm-sparc.h \
+  tm-sunos.h inferior.h breakpoint.h value.h symtab.h frame.h param.h \
+  $(INCLUDE_DIR)/wait.h terminal.h target.h 
+remote-nindy.o : remote-nindy.c defs.h param.h tm.h config.status xm-sparc.h \
+  param-no-tm.h xm.h config.status tm-sparc.h tm-sunos.h frame.h inferior.h breakpoint.h \
+  value.h symtab.h target.h gdbcore.h bfd.h ansidecl.h command.h ieee-float.h \
   $(INCLUDE_DIR)/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 $(INCLUDE_DIR)/wait.h target.h \
-  gdbcore.h $(INCLUDE_DIR)/bfd.h $(INCLUDE_DIR)/ansidecl.h command.h symfile.h \
+remote-vx.o : remote-vx.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h xm.h config.status \
+  tm-sparc.h tm-sunos.h frame.h inferior.h breakpoint.h value.h symtab.h \
+  $(INCLUDE_DIR)/wait.h target.h gdbcore.h bfd.h ansidecl.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 $(INCLUDE_DIR)/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 \
-  $(INCLUDE_DIR)/bfd.h $(INCLUDE_DIR)/ansidecl.h command.h target.h frame.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 $(INCLUDE_DIR)/bfd.h \
-  $(INCLUDE_DIR)/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 $(INCLUDE_DIR)/bfd.h \
-  $(INCLUDE_DIR)/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 ieee-float.h \
-  gdbcore.h $(INCLUDE_DIR)/bfd.h $(INCLUDE_DIR)/ansidecl.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 gdbcore.h \
-  $(INCLUDE_DIR)/bfd.h $(INCLUDE_DIR)/ansidecl.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 $(INCLUDE_DIR)/bfd.h \
-  $(INCLUDE_DIR)/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 $(INCLUDE_DIR)/bfd.h \
-  $(INCLUDE_DIR)/ansidecl.h 
+remote.o : remote.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h xm.h config.status \
+  tm-sparc.h tm-sunos.h frame.h inferior.h breakpoint.h value.h symtab.h \
+  target.h $(INCLUDE_DIR)/wait.h terminal.h 
+signame.o : signame.c signame.h defs.h param.h tm.h config.status xm-sparc.h \
+  param-no-tm.h xm.h config.status tm-sparc.h tm-sunos.h 
+solib.o : solib.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h xm.h config.status \
+  tm-sparc.h tm-sunos.h symtab.h gdbcore.h bfd.h ansidecl.h command.h \
+  target.h frame.h regex.h 
+source.o : source.c defs.h symtab.h param.h tm.h config.status xm-sparc.h param-no-tm.h \
+  xm.h config.status tm-sparc.h tm-sunos.h command.h gdbcmd.h frame.h gdbcore.h bfd.h \
+  ansidecl.h regex.h 
+sparc-pinsn.o : sparc-pinsn.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h \
+  xm.h config.status tm-sparc.h tm-sunos.h symtab.h $(INCLUDE_DIR)/sparc-opcode.h gdbcore.h \
+  bfd.h ansidecl.h /usr/include/string.h target.h 
+sparc-tdep.o : sparc-tdep.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h \
+  xm.h config.status tm-sparc.h tm-sunos.h frame.h inferior.h breakpoint.h value.h symtab.h \
+  signame.h target.h ieee-float.h gdbcore.h bfd.h ansidecl.h 
+sparc-xdep.o : sparc-xdep.c defs.h tm-sparc.h param-no-tm.h xm.h config.status tm-sunos.h \
+  inferior.h breakpoint.h value.h symtab.h frame.h param.h target.h gdbcore.h \
+  bfd.h ansidecl.h 
+stack.o : stack.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h xm.h config.status \
+  tm-sparc.h tm-sunos.h symtab.h frame.h gdbcmd.h command.h value.h gdbcore.h \
+  bfd.h ansidecl.h target.h breakpoint.h 
+sun3-xdep.o : sun3-xdep.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h xm.h config.status \
+  tm-sparc.h tm-sunos.h inferior.h breakpoint.h value.h symtab.h frame.h \
+  gdbcore.h bfd.h 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 $(INCLUDE_DIR)/bfd.h $(INCLUDE_DIR)/ansidecl.h frame.h target.h \
+symfile.o : symfile.c defs.h symtab.h param.h tm.h config.status xm-sparc.h param-no-tm.h \
+  xm.h config.status tm-sparc.h tm-sunos.h gdbcore.h bfd.h 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 $(INCLUDE_DIR)/bfd.h \
-  $(INCLUDE_DIR)/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 $(INCLUDE_DIR)/bfd.h \
-  $(INCLUDE_DIR)/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 $(INCLUDE_DIR)/bfd.h $(INCLUDE_DIR)/ansidecl.h frame.h target.h \
-  value.h symfile.h gdbcmd.h command.h 
+symm-tdep.o : symm-tdep.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h xm.h config.status \
+  tm-sparc.h tm-sunos.h frame.h inferior.h breakpoint.h value.h symtab.h \
+  gdbcore.h bfd.h ansidecl.h 
+symm-xdep.o : symm-xdep.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h xm.h config.status \
+  tm-sparc.h tm-sunos.h frame.h inferior.h breakpoint.h value.h symtab.h \
+  gdbcore.h bfd.h ansidecl.h 
+symmisc.o : symmisc.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h xm.h config.status \
+  tm-sparc.h tm-sunos.h symtab.h breakpoint.h value.h command.h 
+symtab.o : symtab.c defs.h symtab.h param.h tm.h config.status xm-sparc.h param-no-tm.h \
+  xm.h config.status tm-sparc.h tm-sunos.h gdbcore.h bfd.h ansidecl.h frame.h target.h \
+  value.h symfile.h gdbcmd.h command.h regex.h 
 target.o : target.c defs.h target.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 \
-  $(INCLUDE_DIR)/bfd.h $(INCLUDE_DIR)/ansidecl.h symfile.h 
+  breakpoint.h value.h frame.h param.h tm.h config.status xm-sparc.h param-no-tm.h xm.h config.status \
+  tm-sparc.h tm-sunos.h bfd.h ansidecl.h symfile.h 
 tdesc.o : tdesc.c 
-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 $(INCLUDE_DIR)/bfd.h \
-  $(INCLUDE_DIR)/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 $(INCLUDE_DIR)/bfd.h $(INCLUDE_DIR)/ansidecl.h \
-  $(INCLUDE_DIR)/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 
-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 $(INCLUDE_DIR)/bfd.h \
-  $(INCLUDE_DIR)/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 $(INCLUDE_DIR)/bfd.h $(INCLUDE_DIR)/ansidecl.h gdbcmd.h \
+umax-xdep.o : umax-xdep.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h xm.h config.status \
+  tm-sparc.h tm-sunos.h frame.h inferior.h breakpoint.h value.h symtab.h \
+  gdbcore.h bfd.h ansidecl.h 
+utils.o : utils.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h xm.h config.status \
+  tm-sparc.h tm-sunos.h signals.h gdbcmd.h command.h terminal.h bfd.h \
+  ansidecl.h $(INCLUDE_DIR)/obstack.h target.h 
+valarith.o : valarith.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h xm.h config.status \
+  tm-sparc.h tm-sunos.h value.h symtab.h expression.h target.h 
+valops.o : valops.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h xm.h config.status \
+  tm-sparc.h tm-sunos.h symtab.h value.h frame.h inferior.h breakpoint.h \
+  gdbcore.h bfd.h ansidecl.h target.h 
+valprint.o : valprint.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h xm.h config.status \
+  tm-sparc.h tm-sunos.h symtab.h value.h gdbcore.h bfd.h 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 $(INCLUDE_DIR)/bfd.h $(INCLUDE_DIR)/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 
+values.o : values.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h xm.h config.status \
+  tm-sparc.h tm-sunos.h symtab.h value.h gdbcore.h bfd.h ansidecl.h frame.h \
+  command.h gdbcmd.h 
+vax-pinsn.o : vax-pinsn.c defs.h param.h tm.h config.status xm-sparc.h param-no-tm.h xm.h config.status \
+  tm-sparc.h tm-sunos.h symtab.h $(INCLUDE_DIR)/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 
diff --git a/gdb/expread.tab.c b/gdb/expread.tab.c
index d1be5e6..749627d 100755
--- a/gdb/expread.tab.c
+++ b/gdb/expread.tab.c
@@ -223,7 +223,65 @@ static const char yytranslate[] = {     0,
     44,    45,    52,    53,    54,    55
 };
 
-static const short yyrline[] = {     0,
+static const short yyprhs[] = {     0,
+     0,     2,     4,     8,    11,    14,    17,    20,    23,    26,
+    29,    32,    35,    38,    42,    47,    51,    56,    61,    62,
+    68,    69,    71,    75,    80,    85,    89,    93,    97,   101,
+   105,   109,   113,   117,   121,   125,   129,   133,   137,   141,
+   145,   149,   153,   157,   161,   165,   171,   175,   179,   181,
+   183,   185,   187,   189,   191,   193,   195,   197,   199,   204,
+   206,   208,   210,   214,   218,   222,   227,   230,   232,   234,
+   237,   239,   242,   244,   247,   249,   253,   256,   258,   261,
+   263,   266,   270,   273,   275,   279,   286,   295,   305,   307,
+   309,   311,   313,   316,   320,   323,   327,   331,   336,   339,
+   343,   346,   349,   352,   355,   357,   360,   362,   364,   366,
+   368,   370,   372,   376,   378,   380,   382,   384,   386,   388
+};
+
+static const short yyrhs[] = {    67,
+     0,    68,     0,    67,    29,    68,     0,    49,    68,     0,
+    37,    68,     0,    48,    68,     0,    59,    68,     0,    60,
+    68,     0,    53,    68,     0,    54,    68,     0,    68,    53,
+     0,    68,    54,     0,    16,    68,     0,    68,    55,    82,
+     0,    68,    55,    49,    68,     0,    68,    56,    82,     0,
+    68,    56,    49,    68,     0,    68,    57,    67,    61,     0,
+     0,    68,    58,    69,    70,    62,     0,     0,    68,     0,
+    70,    29,    68,     0,    63,    78,    64,    68,     0,    58,
+    78,    62,    68,     0,    58,    67,    62,     0,    68,    46,
+    68,     0,    68,    49,    68,     0,    68,    50,    68,     0,
+    68,    51,    68,     0,    68,    47,    68,     0,    68,    48,
+    68,     0,    68,    44,    68,     0,    68,    45,    68,     0,
+    68,    38,    68,     0,    68,    39,    68,     0,    68,    42,
+    68,     0,    68,    43,    68,     0,    68,    40,    68,     0,
+    68,    41,    68,     0,    68,    37,    68,     0,    68,    36,
+    68,     0,    68,    35,    68,     0,    68,    34,    68,     0,
+    68,    33,    68,     0,    68,    32,    68,    65,    68,     0,
+    68,    31,    68,     0,    68,    27,    68,     0,     3,     0,
+    11,     0,     5,     0,    12,     0,     4,     0,     6,     0,
+    72,     0,    24,     0,    25,     0,    26,     0,    16,    58,
+    78,    62,     0,     7,     0,    28,     0,     9,     0,    71,
+    18,    82,     0,    71,    18,    82,     0,    79,    18,    82,
+     0,    79,    18,    60,    82,     0,    18,    82,     0,    83,
+     0,    79,     0,    79,    74,     0,    49,     0,    49,    74,
+     0,    37,     0,    37,    74,     0,    75,     0,    58,    74,
+    62,     0,    75,    76,     0,    76,     0,    75,    77,     0,
+    77,     0,    57,    61,     0,    57,     3,    61,     0,    58,
+    62,     0,    73,     0,    79,    18,    49,     0,    78,    58,
+    79,    18,    49,    62,     0,    78,    58,    79,    18,    49,
+    62,    58,    62,     0,    78,    58,    79,    18,    49,    62,
+    58,    81,    62,     0,    10,     0,    23,     0,    21,     0,
+    22,     0,    21,    23,     0,    17,    21,    23,     0,    21,
+    21,     0,    21,    21,    23,     0,    17,    21,    21,     0,
+    17,    21,    21,    23,     0,    22,    23,     0,    17,    22,
+    23,     0,    13,    82,     0,    14,    82,     0,    15,    82,
+     0,    17,    80,     0,    17,     0,    20,    80,     0,    20,
+     0,    10,     0,    23,     0,    21,     0,    22,     0,    78,
+     0,    81,    29,    78,     0,     8,     0,     9,     0,    10,
+     0,    11,     0,    12,     0,     8,     0,     9,     0
+};
+
+#if YYDEBUG != 0
+static const short yyrline[] = { 0,
    225,   229,   230,   235,   238,   241,   245,   249,   253,   257,
    261,   265,   269,   273,   279,   283,   289,   293,   297,   301,
    307,   310,   314,   318,   324,   330,   336,   340,   344,   348,
@@ -238,15 +296,18 @@ static const short yyrline[] = {     0,
    889,   898,   903,   910,   911,   912,   913,   914,   917,   918
 };
 
-static const char * const yytname[] = {     0,
+static const char * const yytname[] = {   "$",
 "error","$illegal.","INT","CHAR","UINT","FLOAT","STRING","NAME","BLOCKNAME","TYPENAME",
 "NAME_OR_INT","NAME_OR_UINT","STRUCT","UNION","ENUM","SIZEOF","UNSIGNED","COLONCOLON","ERROR","SIGNED",
 "LONG","SHORT","INT_KEYWORD","LAST","REGNAME","VARIABLE","ASSIGN_MODIFY","THIS","','","ABOVE_COMMA",
 "'='","'?'","OR","AND","'|'","'^'","'&'","EQUAL","NOTEQUAL","'<'",
 "'>'","LEQ","GEQ","LSH","RSH","'@'","'+'","'-'","'*'","'/'",
 "'%'","UNARY","INCREMENT","DECREMENT","ARROW","'.'","'['","'('","'!'","'~'",
-"']'","')'","'{'","'}'","':'","start"
+"']'","')'","'{'","'}'","':'","start","exp1","exp","@1","arglist",
+"block","variable","ptype","abs_decl","direct_abs_decl","array_mod","func_mod","type","typebase","typename",
+"nonempty_typelist","name","name_not_typename",""
 };
+#endif
 
 static const short yyr1[] = {     0,
     66,    67,    67,    68,    68,    68,    68,    68,    68,    68,
@@ -461,13 +522,11 @@ static const short yycheck[] = {    14,
     53,    54,    55,    56,    57,    58,    -1,    49,    50,    51,
     -1,    53,    54,    55,    56,    57,    58
 };
-#define YYPURE 1
-
 /* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
-#line 3 "bison.simple"
+#line 3 "/usr/unsupported/lib/bison.simple"
 
 /* Skeleton output parser for bison,
-   Copyright (C) 1984 Bob Corbett and Richard Stallman
+   Copyright (C) 1984, 1989, 1990 Bob Corbett and Richard Stallman
 
    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
@@ -484,9 +543,19 @@ static const short yycheck[] = {    14,
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 
+#ifndef alloca
+#ifdef __GNUC__
+#define alloca __builtin_alloca
+#else /* Not GNU C.  */
 #if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__)
 #include <alloca.h>
-#endif
+#else /* Not sparc */
+#ifdef MSDOS
+#include <malloc.h>
+#endif /* MSDOS */
+#endif /* Not sparc.  */
+#endif /* Not GNU C.  */
+#endif /* alloca not defined.  */
 
 /* This is the parser code that is written into each bison parser
   when the %semantic_parser declaration is not specified in the grammar.
@@ -501,35 +570,57 @@ static const short yycheck[] = {    14,
 #define yyclearin	(yychar = YYEMPTY)
 #define YYEMPTY		-2
 #define YYEOF		0
-#define YYFAIL		goto yyerrlab;
 #define YYACCEPT	return(0)
 #define YYABORT 	return(1)
-#define YYERROR		goto yyerrlab
+#define YYERROR		goto yyerrlab1
+/* Like YYERROR except do call yyerror.
+   This remains here temporarily to ease the
+   transition to the new meaning of YYERROR, for GCC.
+   Once GCC version 2 has supplanted version 1, this can go.  */
+#define YYFAIL		goto yyerrlab
+#define YYRECOVERING()  (!!yyerrstatus)
+#define YYBACKUP(token, value) \
+do								\
+  if (yychar == YYEMPTY && yylen == 1)				\
+    { yychar = (token), yylval = (value);			\
+      yychar1 = YYTRANSLATE (yychar);				\
+      YYPOPSTACK;						\
+      goto yybackup;						\
+    }								\
+  else								\
+    { yyerror ("syntax error: cannot back up"); YYERROR; }	\
+while (0)
 
 #define YYTERROR	1
 #define YYERRCODE	256
 
-#ifndef YYIMPURE
+#ifndef YYPURE
 #define YYLEX		yylex()
 #endif
 
-#ifndef YYPURE
+#ifdef YYPURE
+#ifdef YYLSP_NEEDED
 #define YYLEX		yylex(&yylval, &yylloc)
+#else
+#define YYLEX		yylex(&yylval)
+#endif
 #endif
 
 /* If nonreentrant, generate the variables here */
 
-#ifndef YYIMPURE
+#ifndef YYPURE
 
 int	yychar;			/*  the lookahead symbol		*/
 YYSTYPE	yylval;			/*  the semantic value of the		*/
 				/*  lookahead symbol			*/
 
+#ifdef YYLSP_NEEDED
 YYLTYPE yylloc;			/*  location data for the lookahead	*/
 				/*  symbol				*/
+#endif
 
 int yynerrs;			/*  number of parse errors so far       */
-#endif  /* YYIMPURE */
+#endif  /* not YYPURE */
 
 #if YYDEBUG != 0
 int yydebug;			/*  nonzero means print parse trace	*/
@@ -537,21 +628,59 @@ int yydebug;			/*  nonzero means print parse trace	*/
    from coexisting.  */
 #endif
 
-/*  YYMAXDEPTH indicates the initial size of the parser's stacks	*/
+/*  YYINITDEPTH indicates the initial size of the parser's stacks	*/
 
-#ifndef	YYMAXDEPTH
-#define YYMAXDEPTH 200
+#ifndef	YYINITDEPTH
+#define YYINITDEPTH 200
 #endif
 
-/*  YYMAXLIMIT is the maximum size the stacks can grow to
+/*  YYMAXDEPTH is the maximum size the stacks can grow to
     (effective only if the built-in stack extension method is used).  */
 
-#ifndef YYMAXLIMIT
-#define YYMAXLIMIT 10000
+#if YYMAXDEPTH == 0
+#undef YYMAXDEPTH
+#endif
+
+#ifndef YYMAXDEPTH
+#define YYMAXDEPTH 10000
 #endif
+
+#ifndef __cplusplus
+
+/* This is the most reliable way to avoid incompatibilities
+   in available built-in functions on various systems.  */
+static void
+__yy_bcopy (from, to, count)
+     char *from;
+     char *to;
+     int count;
+{
+  register char *f = from;
+  register char *t = to;
+  register int i = count;
+
+  while (i-- > 0)
+    *t++ = *f++;
+}
+
+#else /* __cplusplus */
 
+/* This is the most reliable way to avoid incompatibilities
+   in available built-in functions on various systems.  */
+static void
+__yy_bcopy (char *from, char *to, int count)
+{
+  register char *f = from;
+  register char *t = to;
+  register int i = count;
+
+  while (i-- > 0)
+    *t++ = *f++;
+}
 
-#line 90 "bison.simple"
+#endif
+
+#line 160 "/usr/unsupported/lib/bison.simple"
 int
 yyparse()
 {
@@ -559,25 +688,34 @@ yyparse()
   register int yyn;
   register short *yyssp;
   register YYSTYPE *yyvsp;
-  YYLTYPE *yylsp;
   int yyerrstatus;	/*  number of tokens to shift before error messages enabled */
   int yychar1;		/*  lookahead token as an internal (translated) token number */
 
-  short	yyssa[YYMAXDEPTH];	/*  the state stack			*/
-  YYSTYPE yyvsa[YYMAXDEPTH];	/*  the semantic value stack		*/
-  YYLTYPE yylsa[YYMAXDEPTH];	/*  the location stack			*/
+  short	yyssa[YYINITDEPTH];	/*  the state stack			*/
+  YYSTYPE yyvsa[YYINITDEPTH];	/*  the semantic value stack		*/
 
   short *yyss = yyssa;		/*  refer to the stacks thru separate pointers */
   YYSTYPE *yyvs = yyvsa;	/*  to allow yyoverflow to reallocate them elsewhere */
+
+#ifdef YYLSP_NEEDED
   YYLTYPE *yyls = yylsa;
+  YYLTYPE *yylsp;
+  YYLTYPE yylsa[YYINITDEPTH];	/*  the location stack			*/
 
-  int yymaxdepth = YYMAXDEPTH;
+#define YYPOPSTACK   (yyvsp--, yysp--, yylsp--)
+#else
+#define YYPOPSTACK   (yyvsp--, yysp--)
+#endif
 
-#ifndef YYPURE
+  int yystacksize = YYINITDEPTH;
+
+#ifdef YYPURE
   int yychar;
   YYSTYPE yylval;
-  YYLTYPE yylloc;
   int yynerrs;
+#ifdef YYLSP_NEEDED
+  YYLTYPE yylloc;
+#endif
 #endif
 
   YYSTYPE yyval;		/*  the variable used to return		*/
@@ -602,7 +740,9 @@ yyparse()
 
   yyssp = yyss - 1;
   yyvsp = yyvs;
+#ifdef YYLSP_NEEDED
   yylsp = yyls;
+#endif
 
 /* Push a new state, which is found in  yystate  .  */
 /* In all cases, when you get here, the value and location stacks
@@ -611,13 +751,15 @@ yynewstate:
 
   *++yyssp = yystate;
 
-  if (yyssp >= yyss + yymaxdepth - 1)
+  if (yyssp >= yyss + yystacksize - 1)
     {
       /* Give user a chance to reallocate the stack */
       /* Use copies of these so that the &'s don't force the real ones into memory. */
       YYSTYPE *yyvs1 = yyvs;
-      YYLTYPE *yyls1 = yyls;
       short *yyss1 = yyss;
+#ifdef YYLSP_NEEDED
+      YYLTYPE *yyls1 = yyls;
+#endif
 
       /* Get the current used size of the three stacks, in elements.  */
       int size = yyssp - yyss + 1;
@@ -628,24 +770,32 @@ yynewstate:
       yyoverflow("parser stack overflow",
 		 &yyss1, size * sizeof (*yyssp),
 		 &yyvs1, size * sizeof (*yyvsp),
+#ifdef YYLSP_NEEDED
 		 &yyls1, size * sizeof (*yylsp),
-		 &yymaxdepth);
+#endif
+		 &yystacksize);
 
-      yyss = yyss1; yyvs = yyvs1; yyls = yyls1;
+      yyss = yyss1; yyvs = yyvs1;
+#ifdef YYLSP_NEEDED
+      yyls = yyls1;
+#endif
 #else /* no yyoverflow */
       /* Extend the stack our own way.  */
-      if (yymaxdepth >= YYMAXLIMIT)
-	yyerror("parser stack overflow");
-      yymaxdepth *= 2;
-      if (yymaxdepth > YYMAXLIMIT)
-	yymaxdepth = YYMAXLIMIT;
-      yyss = (short *) alloca (yymaxdepth * sizeof (*yyssp));
-      bcopy ((char *)yyss1, (char *)yyss, size * sizeof (*yyssp));
-      yyvs = (YYSTYPE *) alloca (yymaxdepth * sizeof (*yyvsp));
-      bcopy ((char *)yyvs1, (char *)yyvs, size * sizeof (*yyvsp));
+      if (yystacksize >= YYMAXDEPTH)
+	{
+	  yyerror("parser stack overflow");
+	  return 2;
+	}
+      yystacksize *= 2;
+      if (yystacksize > YYMAXDEPTH)
+	yystacksize = YYMAXDEPTH;
+      yyss = (short *) alloca (yystacksize * sizeof (*yyssp));
+      __yy_bcopy ((char *)yyss1, (char *)yyss, size * sizeof (*yyssp));
+      yyvs = (YYSTYPE *) alloca (yystacksize * sizeof (*yyvsp));
+      __yy_bcopy ((char *)yyvs1, (char *)yyvs, size * sizeof (*yyvsp));
 #ifdef YYLSP_NEEDED
-      yyls = (YYLTYPE *) alloca (yymaxdepth * sizeof (*yylsp));
-      bcopy ((char *)yyls1, (char *)yyls, size * sizeof (*yylsp));
+      yyls = (YYLTYPE *) alloca (yystacksize * sizeof (*yylsp));
+      __yy_bcopy ((char *)yyls1, (char *)yyls, size * sizeof (*yylsp));
 #endif
 #endif /* no yyoverflow */
 
@@ -657,10 +807,10 @@ yynewstate:
 
 #if YYDEBUG != 0
       if (yydebug)
-	fprintf(stderr, "Stack size increased to %d\n", yymaxdepth);
+	fprintf(stderr, "Stack size increased to %d\n", yystacksize);
 #endif
 
-      if (yyssp >= yyss + yymaxdepth - 1)
+      if (yyssp >= yyss + yystacksize - 1)
 	YYABORT;
     }
 
@@ -669,9 +819,11 @@ yynewstate:
     fprintf(stderr, "Entering state %d\n", yystate);
 #endif
 
+ yybackup:
+
 /* Do appropriate processing given the current state.  */
 /* Read a lookahead token if we need one and don't already have one.  */
-yyresume:
+/* yyresume: */
 
   /* First try to decide what to do without reference to lookahead token.  */
 
@@ -778,12 +930,15 @@ yyreduce:
 #if YYDEBUG != 0
   if (yydebug)
     {
-      if (yylen == 1)
-	fprintf (stderr, "Reducing 1 value via line %d, ",
-		 yyrline[yyn]);
-      else
-	fprintf (stderr, "Reducing %d values via line %d, ",
-		 yylen, yyrline[yyn]);
+      int i;
+
+      fprintf (stderr, "Reducing via rule %d (line %d), ",
+	       yyn, yyrline[yyn]);
+
+      /* Print the symboles being reduced, and their result.  */
+      for (i = yyprhs[yyn]; yyrhs[i] > 0; i++)
+	fprintf (stderr, "%s ", yytname[yyrhs[i]]);
+      fprintf (stderr, " -> %s\n", yytname[yyr1[yyn]]);
     }
 #endif
 
@@ -1543,7 +1698,7 @@ case 118:
     break;}
 }
    /* the action file gets copied in in place of this dollarsign */
-#line 327 "bison.simple"
+#line 423 "/usr/unsupported/lib/bison.simple"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -1602,9 +1757,45 @@ yyerrlab:   /* here on detecting error */
     /* If not already recovering from an error, report this error.  */
     {
       ++yynerrs;
-      yyerror("parse error");
+
+#ifdef YYERROR_VERBOSE
+      yyn = yypact[yystate];
+
+      if (yyn > YYFLAG && yyn < YYLAST)
+	{
+	  int size = 0;
+	  char *msg;
+	  int x, count;
+
+	  count = 0;
+	  for (x = 0; x < (sizeof(yytname) / sizeof(char *)); x++)
+	    if (yycheck[x + yyn] == x)
+	      size += strlen(yytname[x]) + 15, count++;
+	  msg = (char *) xmalloc(size + 15);
+	  strcpy(msg, "parse error");
+
+	  if (count < 5)
+	    {
+	      count = 0;
+	      for (x = 0; x < (sizeof(yytname) / sizeof(char *)); x++)
+		if (yycheck[x + yyn] == x)
+		  {
+		    strcat(msg, count == 0 ? ", expecting `" : " or `");
+		    strcat(msg, yytname[x]);
+		    strcat(msg, "'");
+		    count++;
+		  }
+	    }
+	  yyerror(msg);
+	  free(msg);
+	}
+      else
+#endif /* YYERROR_VERBOSE */
+	yyerror("parse error");
     }
 
+yyerrlab1:   /* here on error raised explicitly by an action */
+
   if (yyerrstatus == 3)
     {
       /* if just tried and failed to reuse lookahead token after an error, discard it.  */
diff --git a/gdb/sparc-xdep.c b/gdb/sparc-xdep.c
index 89fcb8d..1bc392b 100644
--- a/gdb/sparc-xdep.c
+++ b/gdb/sparc-xdep.c
@@ -37,6 +37,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 extern char register_valid[];
 
+int deferred_stores = 0;	/* Cumulates stores we want to do eventually. */
+
 /* Fetch one or more registers from the inferior.  REGNO == -1 to get
    them all.  We actually fetch more than requested, when convenient,
    marking them as valid so we won't fetch them again.  */
@@ -131,7 +133,6 @@ fetch_inferior_registers (regno)
 #define	INT_REGS	1
 #define	STACK_REGS	2
 #define	FP_REGS		4
-int deferred_stores = 0;	/* Cumulates stores we want to do eventually. */
 
 int
 store_inferior_registers (regno)
diff --git a/gdb/tm-sun4os4.h b/gdb/tm-sun4os4.h
index 971bb4f..f31a8c3 100644
--- a/gdb/tm-sun4os4.h
+++ b/gdb/tm-sun4os4.h
@@ -22,3 +22,5 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #undef STACK_END_ADDRESS
 #define STACK_END_ADDRESS 0xf8000000
+
+#define NO_COFF