Remove config.gdb. Restore alldeps.mak, depend, and expread.tab.c

to the RCS archives.  Update .Sanitize for this.

4 files changed, 275 insertions, 283 deletions

diff --git a/gdb/.Sanitize b/gdb/.Sanitize
index 9a3e2b5..4ead097 100644
--- a/gdb/.Sanitize
+++ b/gdb/.Sanitize
@@ -69,6 +69,7 @@ cplus-dem.c
 createtags
 dbxread.c
 defs.h
+depend
 doc
 environ.c
 environ.h
diff --git a/gdb/alldeps.mak b/gdb/alldeps.mak
index 6c9a41a..c7157ff 100644
--- a/gdb/alldeps.mak
+++ b/gdb/alldeps.mak
@@ -1,3 +1,4 @@
+# Start of "alldeps.mak" definitions
 ALLDEPFILES = $(ALLDEPFILES_MAINDIR) $(ALLDEPFILES_SUBDIR)
 ALLDEPFILES_MAINDIR=\
 altos-xdep.c\
@@ -134,6 +135,7 @@ ALLCONFIG=\
 ./tconfig/arm\
 ./tconfig/bigmips\
 ./tconfig/convex\
+./tconfig/dec3100\
 ./tconfig/hp300bsd\
 ./tconfig/hp300hpux\
 ./tconfig/i386sco\
@@ -174,6 +176,7 @@ ALLCONFIG=\
 ./xconfig/arm\
 ./xconfig/bigmips\
 ./xconfig/convex\
+./xconfig/dec3100\
 ./xconfig/hp300bsd\
 ./xconfig/hp300hpux\
 ./xconfig/i386sco\
@@ -205,3 +208,4 @@ ALLCONFIG=\
 ./xconfig/umax\
 ./xconfig/vax
 
+# End of "alldeps.mak" definitions
diff --git a/gdb/depend b/gdb/depend
index 0e32396..8807a8d 100755
--- a/gdb/depend
+++ b/gdb/depend
@@ -1,237 +1,225 @@
-altos-xdep.o : altos-xdep.c defs.h param.h tm.h config.status tm-i960.h param-no-tm.h \
-  xm.h config.status xm-sparc.h 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 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 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 \
-  tm-i960.h param-no-tm.h xm.h config.status xm-sparc.h value.h symtab.h inferior.h \
-  breakpoint.h 
-arm-pinsn.o : arm-pinsn.c defs.h param.h tm.h config.status tm-i960.h param-no-tm.h xm.h config.status \
-  xm-sparc.h symtab.h arm-opcode.h 
-arm-tdep.o : arm-tdep.c defs.h param.h tm.h config.status tm-i960.h param-no-tm.h xm.h config.status \
-  xm-sparc.h 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 tm-i960.h param-no-tm.h xm.h config.status \
-  xm-sparc.h 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 tm-i960.h param-no-tm.h \
-  xm.h config.status xm-sparc.h symtab.h frame.h gdbcore.h $(INCLUDE_DIR)/bfd.h \
-  $(INCLUDE_DIR)/ansidecl.h value.h target.h 
-breakpoint.o : breakpoint.c defs.h param.h tm.h config.status tm-i960.h param-no-tm.h \
-  xm.h config.status xm-sparc.h 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 tm-i960.h param-no-tm.h xm.h config.status \
-  xm-sparc.h symtab.h breakpoint.h value.h $(INCLUDE_DIR)/bfd.h \
-  $(INCLUDE_DIR)/ansidecl.h symfile.h $(BFD_DIR)/libcoff.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 tm-i960.h param-no-tm.h \
-  xm.h config.status xm-sparc.h symtab.h convx-opcode.h 
-convex-tdep.o : convex-tdep.c defs.h param.h tm.h config.status tm-i960.h param-no-tm.h \
-  xm.h config.status xm-sparc.h 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 \
+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 tm-i960.h param-no-tm.h \
-  xm.h config.status xm-sparc.h 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 \
+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 tm-i960.h param-no-tm.h xm.h config.status xm-sparc.h \
-  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 tm-i960.h param-no-tm.h xm.h config.status \
-  xm-sparc.h 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 tm-i960.h param-no-tm.h xm.h config.status \
-  xm-sparc.h 
-dbxread.o : dbxread.c defs.h param.h tm.h config.status tm-i960.h param-no-tm.h xm.h config.status \
-  xm-sparc.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 $(INCLUDE_DIR)/bfd.h $(INCLUDE_DIR)/ansidecl.h \
-  $(BFD_DIR)/libaout.h symfile.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 \
+  gdbcore.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.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 tm-i960.h param-no-tm.h xm.h config.status xm-sparc.h \
-  symtab.h value.h expression.h target.h frame.h 
-exec.o : exec.c defs.h param.h tm.h config.status tm-i960.h param-no-tm.h xm.h config.status xm-sparc.h \
-  frame.h inferior.h breakpoint.h value.h symtab.h target.h gdbcmd.h \
-  command.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 tm-i960.h \
-  param-no-tm.h xm.h config.status xm-sparc.h expression.h value.h 
-findvar.o : findvar.c defs.h param.h tm.h config.status tm-i960.h param-no-tm.h xm.h config.status \
-  xm-sparc.h symtab.h frame.h value.h gdbcore.h $(INCLUDE_DIR)/bfd.h \
-  $(INCLUDE_DIR)/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 \
-  tm-i960.h param-no-tm.h xm.h config.status xm-sparc.h symtab.h frame.h np1-opcode.h 
-gould-xdep.o : gould-xdep.c defs.h param.h tm.h config.status tm-i960.h param-no-tm.h \
-  xm.h config.status xm-sparc.h 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 tm-i960.h param-no-tm.h \
-  xm.h config.status xm-sparc.h 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 tm-i960.h param-no-tm.h \
-  xm.h config.status xm-sparc.h 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 tm-i960.h param-no-tm.h xm.h config.status \
-  xm-sparc.h 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 tm-i960.h param-no-tm.h xm.h config.status \
-  xm-sparc.h 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 tm-i960.h param-no-tm.h \
-  xm.h config.status xm-sparc.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 tm-i960.h param-no-tm.h xm.h config.status \
-  xm-sparc.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 tm-i960.h param-no-tm.h \
-  xm.h config.status xm-sparc.h ieee-float.h 
-infcmd.o : infcmd.c defs.h param.h tm.h config.status tm-i960.h param-no-tm.h xm.h config.status \
-  xm-sparc.h 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 tm-i960.h param-no-tm.h xm.h config.status \
-  xm-sparc.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 tm-i960.h param-no-tm.h xm.h config.status \
-  xm-sparc.h 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 tm-i960.h param-no-tm.h xm.h config.status \
-  xm-sparc.h 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 tm-i960.h param-no-tm.h xm.h config.status \
-  xm-sparc.h 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 \
+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 gdbcmd.h command.h gdbcore.h \
+  ${srcdir}/../include/bfd.h ${srcdir}/../include/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 ${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 
-m68k-pinsn.o : m68k-pinsn.c defs.h param.h tm.h config.status tm-i960.h param-no-tm.h \
-  xm.h config.status xm-sparc.h symtab.h m68k-opcode.h gdbcore.h $(INCLUDE_DIR)/bfd.h \
-  $(INCLUDE_DIR)/ansidecl.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 
+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 \
+  ${srcdir}/../include/bfd.h ${srcdir}/../include/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 ${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/wait.h \
+  gdbcore.h ${srcdir}/../include/bfd.h ${srcdir}/../include/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 ${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 tm-i960.h param-no-tm.h xm.h config.status \
-  xm-sparc.h frame.h inferior.h breakpoint.h value.h symtab.h gdbcore.h \
-  $(INCLUDE_DIR)/bfd.h $(INCLUDE_DIR)/ansidecl.h /usr/include/setjmp.h 
-m88k-xdep.o : m88k-xdep.c defs.h param.h tm.h config.status tm-i960.h param-no-tm.h xm.h config.status \
-  xm-sparc.h frame.h inferior.h breakpoint.h value.h symtab.h gdbcore.h \
-  $(INCLUDE_DIR)/bfd.h $(INCLUDE_DIR)/ansidecl.h /usr/include/setjmp.h 
-main.o : main.c defs.h gdbcmd.h command.h param.h tm.h config.status tm-i960.h \
-  param-no-tm.h xm.h config.status xm-sparc.h symtab.h inferior.h breakpoint.h value.h \
-  frame.h signals.h target.h $(INCLUDE_DIR)/getopt.h $(READLINE_DIR)/readline.h \
-  $(READLINE_DIR)/keymaps.h $(READLINE_DIR)/chardefs.h $(READLINE_DIR)/history.h 
-mem-break.o : mem-break.c defs.h param.h tm.h config.status tm-i960.h param-no-tm.h xm.h config.status \
-  xm-sparc.h 
-mips-pinsn.o : mips-pinsn.c defs.h param.h tm.h config.status tm-i960.h param-no-tm.h \
-  xm.h config.status xm-sparc.h symtab.h mips-opcode.h 
-mips-tdep.o : mips-tdep.c defs.h param.h tm.h config.status tm-i960.h param-no-tm.h xm.h config.status \
-  xm-sparc.h 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 tm-i960.h param-no-tm.h xm.h config.status \
-  xm-sparc.h 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 tm-i960.h param-no-tm.h xm.h config.status \
-  xm-sparc.h $(INCLUDE_DIR)/obstack.h defs.h symtab.h gdbcore.h \
-  $(INCLUDE_DIR)/bfd.h $(INCLUDE_DIR)/ansidecl.h symfile.h $(INCLUDE_DIR)/ecoff.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/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 $(INCLUDE_DIR)/wait.h ${srcdir}/nindy-share/env.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 \
-  $(INCLUDE_DIR)/wait.h ${srcdir}/nindy-share/env.h /usr/include/string.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 tm-i960.h param-no-tm.h \
-  xm.h config.status xm-sparc.h symtab.h frame.h 
-ns32k-pinsn.o : ns32k-pinsn.c defs.h param.h tm.h config.status tm-i960.h param-no-tm.h \
-  xm.h config.status xm-sparc.h 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 tm-i960.h param-no-tm.h xm.h config.status \
-  xm-sparc.h 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 tm-i960.h param-no-tm.h xm.h config.status \
-  xm-sparc.h 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 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 tm-i960.h param-no-tm.h xm.h config.status \
-  xm-sparc.h 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 xm-sparc.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 tm-i960.h param-no-tm.h \
-  xm.h config.status xm-sparc.h 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 \
-  $(INCLUDE_DIR)/wait.h ${srcdir}/nindy-share/ttycntl.h ${srcdir}/nindy-share/demux.h \
+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-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 
+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 \
+  ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.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 tm-i960.h param-no-tm.h xm.h config.status \
-  xm-sparc.h 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 ${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 tm-i960.h param-no-tm.h xm.h config.status \
-  xm-sparc.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 tm-i960.h param-no-tm.h \
-  xm.h config.status xm-sparc.h 
-solib.o : solib.c defs.h param.h tm.h config.status tm-i960.h param-no-tm.h xm.h config.status \
-  xm-sparc.h symtab.h gdbcore.h $(INCLUDE_DIR)/bfd.h $(INCLUDE_DIR)/ansidecl.h \
-  command.h target.h frame.h regex.h 
-source.o : source.c defs.h symtab.h param.h tm.h config.status tm-i960.h param-no-tm.h \
-  xm.h config.status xm-sparc.h 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 tm-i960.h param-no-tm.h \
-  xm.h config.status xm-sparc.h 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 tm-i960.h param-no-tm.h \
-  xm.h config.status xm-sparc.h 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 xm-sparc.h \
-  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 tm-i960.h param-no-tm.h xm.h config.status \
-  xm-sparc.h 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 tm-i960.h param-no-tm.h xm.h config.status \
-  xm-sparc.h inferior.h breakpoint.h value.h symtab.h frame.h gdbcore.h \
-  $(INCLUDE_DIR)/bfd.h $(INCLUDE_DIR)/ansidecl.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 \
+  gdbcore.h ${srcdir}/../include/bfd.h ${srcdir}/../include/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 ${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 
+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 ieee-float.h \
+  gdbcore.h ${srcdir}/../include/bfd.h ${srcdir}/../include/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 \
+  ${srcdir}/../include/bfd.h ${srcdir}/../include/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 ${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 tm-i960.h param-no-tm.h \
-  xm.h config.status xm-sparc.h gdbcore.h $(INCLUDE_DIR)/bfd.h $(INCLUDE_DIR)/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 tm-i960.h param-no-tm.h xm.h config.status \
-  xm-sparc.h 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 tm-i960.h param-no-tm.h xm.h config.status \
-  xm-sparc.h 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 tm-i960.h param-no-tm.h xm.h config.status \
-  xm-sparc.h symtab.h breakpoint.h value.h command.h 
-symtab.o : symtab.c defs.h symtab.h param.h tm.h config.status tm-i960.h param-no-tm.h \
-  xm.h config.status xm-sparc.h gdbcore.h $(INCLUDE_DIR)/bfd.h $(INCLUDE_DIR)/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 tm-i960.h param-no-tm.h \
-  xm.h config.status xm-sparc.h symtab.h tahoe-opcode.h 
+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 gdbcmd.h command.h symtab.h inferior.h \
-  breakpoint.h value.h frame.h param.h tm.h config.status tm-i960.h param-no-tm.h xm.h config.status \
-  xm-sparc.h $(INCLUDE_DIR)/bfd.h $(INCLUDE_DIR)/ansidecl.h symfile.h 
+  breakpoint.h value.h frame.h param.h tm.h config.status param-no-tm.h xm.h config.status \
+  ${srcdir}/../include/bfd.h ${srcdir}/../include/ansidecl.h symfile.h 
 tdesc.o : tdesc.c 
-umax-xdep.o : umax-xdep.c defs.h param.h tm.h config.status tm-i960.h param-no-tm.h xm.h config.status \
-  xm-sparc.h 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 tm-i960.h param-no-tm.h xm.h config.status \
-  xm-sparc.h 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 tm-i960.h param-no-tm.h xm.h config.status \
-  xm-sparc.h value.h symtab.h expression.h target.h 
-valops.o : valops.c defs.h param.h tm.h config.status tm-i960.h param-no-tm.h xm.h config.status \
-  xm-sparc.h 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 tm-i960.h param-no-tm.h xm.h config.status \
-  xm-sparc.h symtab.h value.h gdbcore.h $(INCLUDE_DIR)/bfd.h \
-  $(INCLUDE_DIR)/ansidecl.h gdbcmd.h command.h target.h 
-values.o : values.c defs.h param.h tm.h config.status tm-i960.h param-no-tm.h xm.h config.status \
-  xm-sparc.h 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 tm-i960.h param-no-tm.h xm.h config.status \
-  xm-sparc.h symtab.h vax-opcode.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 
+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 
diff --git a/gdb/expread.tab.c b/gdb/expread.tab.c
index ae7ff92..bb9894c 100755
--- a/gdb/expread.tab.c
+++ b/gdb/expread.tab.c
@@ -288,12 +288,12 @@ static const short yyrline[] = { 0,
    352,   356,   360,   364,   368,   372,   376,   380,   384,   388,
    392,   396,   400,   404,   408,   412,   416,   420,   426,   436,
    449,   461,   474,   481,   488,   491,   497,   503,   509,   516,
-   523,   530,   548,   558,   570,   583,   601,   647,   742,   743,
-   778,   780,   782,   784,   786,   789,   791,   796,   802,   804,
-   808,   810,   814,   818,   819,   821,   823,   826,   833,   835,
-   837,   839,   841,   843,   845,   847,   849,   851,   853,   855,
-   857,   860,   863,   866,   868,   870,   872,   876,   877,   883,
-   889,   898,   903,   910,   911,   912,   913,   914,   917,   918
+   523,   530,   548,   558,   570,   583,   601,   647,   741,   742,
+   777,   779,   781,   783,   785,   788,   790,   795,   801,   803,
+   807,   809,   813,   817,   818,   820,   822,   825,   832,   834,
+   836,   838,   840,   842,   844,   846,   848,   850,   852,   854,
+   856,   859,   862,   865,   867,   869,   871,   875,   876,   882,
+   888,   897,   902,   909,   910,   911,   912,   913,   916,   917
 };
 
 static const char * const yytname[] = {   "$",
@@ -523,24 +523,24 @@ static const short yycheck[] = {    14,
     -1,    53,    54,    55,    56,    57,    58
 };
 /* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
-#line 3 "/usr/unsupported/lib/bison.simple"
+#line 3 "/usr/latest/lib/bison.simple"
 
 /* Skeleton output parser for bison,
    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
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 1, or (at your option)
+   any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   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 alloca
@@ -680,7 +680,7 @@ __yy_bcopy (char *from, char *to, int count)
 
 #endif
 
-#line 160 "/usr/unsupported/lib/bison.simple"
+#line 160 "/usr/latest/lib/bison.simple"
 int
 yyparse()
 {
@@ -1380,7 +1380,6 @@ case 68:
 				case LOC_TYPEDEF:
 				case LOC_LABEL:
 				case LOC_BLOCK:
-				case LOC_EXTERNAL:
 				case LOC_CONST_BYTES:
 
 				  /* In this case the expression can
@@ -1451,7 +1450,7 @@ case 68:
 			;
     break;}
 case 70:
-#line 744 "./expread.y"
+#line 743 "./expread.y"
 {
 		  /* This is where the interesting stuff happens.  */
 		  int done = 0;
@@ -1486,34 +1485,34 @@ case 70:
 		;
     break;}
 case 71:
-#line 779 "./expread.y"
+#line 778 "./expread.y"
 { push_type (tp_pointer); yyval.voidval = 0; ;
     break;}
 case 72:
-#line 781 "./expread.y"
+#line 780 "./expread.y"
 { push_type (tp_pointer); yyval.voidval = yyvsp[0].voidval; ;
     break;}
 case 73:
-#line 783 "./expread.y"
+#line 782 "./expread.y"
 { push_type (tp_reference); yyval.voidval = 0; ;
     break;}
 case 74:
-#line 785 "./expread.y"
+#line 784 "./expread.y"
 { push_type (tp_reference); yyval.voidval = yyvsp[0].voidval; ;
     break;}
 case 76:
-#line 790 "./expread.y"
+#line 789 "./expread.y"
 { yyval.voidval = yyvsp[-1].voidval; ;
     break;}
 case 77:
-#line 792 "./expread.y"
+#line 791 "./expread.y"
 {
 			  push_type_int (yyvsp[0].lval);
 			  push_type (tp_array);
 			;
     break;}
 case 78:
-#line 797 "./expread.y"
+#line 796 "./expread.y"
 {
 			  push_type_int (yyvsp[0].lval);
 			  push_type (tp_array);
@@ -1521,125 +1520,125 @@ case 78:
 			;
     break;}
 case 79:
-#line 803 "./expread.y"
+#line 802 "./expread.y"
 { push_type (tp_function); ;
     break;}
 case 80:
-#line 805 "./expread.y"
+#line 804 "./expread.y"
 { push_type (tp_function); ;
     break;}
 case 81:
-#line 809 "./expread.y"
+#line 808 "./expread.y"
 { yyval.lval = -1; ;
     break;}
 case 82:
-#line 811 "./expread.y"
+#line 810 "./expread.y"
 { yyval.lval = yyvsp[-1].lval; ;
     break;}
 case 83:
-#line 815 "./expread.y"
+#line 814 "./expread.y"
 { yyval.voidval = 0; ;
     break;}
 case 85:
-#line 820 "./expread.y"
+#line 819 "./expread.y"
 { yyval.tval = lookup_member_type (builtin_type_int, yyvsp[-2].tval); ;
     break;}
 case 86:
-#line 822 "./expread.y"
+#line 821 "./expread.y"
 { yyval.tval = lookup_member_type (yyvsp[-5].tval, yyvsp[-3].tval); ;
     break;}
 case 87:
-#line 824 "./expread.y"
+#line 823 "./expread.y"
 { yyval.tval = lookup_member_type
 			    (lookup_function_type (yyvsp[-7].tval), yyvsp[-5].tval); ;
     break;}
 case 88:
-#line 827 "./expread.y"
+#line 826 "./expread.y"
 { yyval.tval = lookup_member_type
 			    (lookup_function_type (yyvsp[-8].tval), yyvsp[-6].tval);
 			  free (yyvsp[-1].tvec); ;
     break;}
 case 89:
-#line 834 "./expread.y"
+#line 833 "./expread.y"
 { yyval.tval = yyvsp[0].tsym.type; ;
     break;}
 case 90:
-#line 836 "./expread.y"
+#line 835 "./expread.y"
 { yyval.tval = builtin_type_int; ;
     break;}
 case 91:
-#line 838 "./expread.y"
+#line 837 "./expread.y"
 { yyval.tval = builtin_type_long; ;
     break;}
 case 92:
-#line 840 "./expread.y"
+#line 839 "./expread.y"
 { yyval.tval = builtin_type_short; ;
     break;}
 case 93:
-#line 842 "./expread.y"
+#line 841 "./expread.y"
 { yyval.tval = builtin_type_long; ;
     break;}
 case 94:
-#line 844 "./expread.y"
+#line 843 "./expread.y"
 { yyval.tval = builtin_type_unsigned_long; ;
     break;}
 case 95:
-#line 846 "./expread.y"
+#line 845 "./expread.y"
 { yyval.tval = builtin_type_long_long; ;
     break;}
 case 96:
-#line 848 "./expread.y"
+#line 847 "./expread.y"
 { yyval.tval = builtin_type_long_long; ;
     break;}
 case 97:
-#line 850 "./expread.y"
+#line 849 "./expread.y"
 { yyval.tval = builtin_type_unsigned_long_long; ;
     break;}
 case 98:
-#line 852 "./expread.y"
+#line 851 "./expread.y"
 { yyval.tval = builtin_type_unsigned_long_long; ;
     break;}
 case 99:
-#line 854 "./expread.y"
+#line 853 "./expread.y"
 { yyval.tval = builtin_type_short; ;
     break;}
 case 100:
-#line 856 "./expread.y"
+#line 855 "./expread.y"
 { yyval.tval = builtin_type_unsigned_short; ;
     break;}
 case 101:
-#line 858 "./expread.y"
+#line 857 "./expread.y"
 { yyval.tval = lookup_struct (copy_name (yyvsp[0].sval),
 					      expression_context_block); ;
     break;}
 case 102:
-#line 861 "./expread.y"
+#line 860 "./expread.y"
 { yyval.tval = lookup_union (copy_name (yyvsp[0].sval),
 					     expression_context_block); ;
     break;}
 case 103:
-#line 864 "./expread.y"
+#line 863 "./expread.y"
 { yyval.tval = lookup_enum (copy_name (yyvsp[0].sval),
 					    expression_context_block); ;
     break;}
 case 104:
-#line 867 "./expread.y"
+#line 866 "./expread.y"
 { yyval.tval = lookup_unsigned_typename (TYPE_NAME(yyvsp[0].tsym.type)); ;
     break;}
 case 105:
-#line 869 "./expread.y"
+#line 868 "./expread.y"
 { yyval.tval = builtin_type_unsigned_int; ;
     break;}
 case 106:
-#line 871 "./expread.y"
+#line 870 "./expread.y"
 { yyval.tval = yyvsp[0].tsym.type; ;
     break;}
 case 107:
-#line 873 "./expread.y"
+#line 872 "./expread.y"
 { yyval.tval = builtin_type_int; ;
     break;}
 case 109:
-#line 878 "./expread.y"
+#line 877 "./expread.y"
 {
 		  yyval.tsym.stoken.ptr = "int";
 		  yyval.tsym.stoken.length = 3;
@@ -1647,7 +1646,7 @@ case 109:
 		;
     break;}
 case 110:
-#line 884 "./expread.y"
+#line 883 "./expread.y"
 {
 		  yyval.tsym.stoken.ptr = "long";
 		  yyval.tsym.stoken.length = 4;
@@ -1655,7 +1654,7 @@ case 110:
 		;
     break;}
 case 111:
-#line 890 "./expread.y"
+#line 889 "./expread.y"
 {
 		  yyval.tsym.stoken.ptr = "short";
 		  yyval.tsym.stoken.length = 5;
@@ -1663,42 +1662,42 @@ case 111:
 		;
     break;}
 case 112:
-#line 899 "./expread.y"
+#line 898 "./expread.y"
 { yyval.tvec = (struct type **)xmalloc (sizeof (struct type *) * 2);
 		  yyval.tvec[0] = (struct type *)0;
 		  yyval.tvec[1] = yyvsp[0].tval;
 		;
     break;}
 case 113:
-#line 904 "./expread.y"
+#line 903 "./expread.y"
 { int len = sizeof (struct type *) * ++(yyvsp[-2].ivec[0]);
 		  yyval.tvec = (struct type **)xrealloc (yyvsp[-2].tvec, len);
 		  yyval.tvec[yyval.ivec[0]] = yyvsp[0].tval;
 		;
     break;}
 case 114:
-#line 910 "./expread.y"
+#line 909 "./expread.y"
 { yyval.sval = yyvsp[0].ssym.stoken; ;
     break;}
 case 115:
-#line 911 "./expread.y"
+#line 910 "./expread.y"
 { yyval.sval = yyvsp[0].ssym.stoken; ;
     break;}
 case 116:
-#line 912 "./expread.y"
+#line 911 "./expread.y"
 { yyval.sval = yyvsp[0].tsym.stoken; ;
     break;}
 case 117:
-#line 913 "./expread.y"
+#line 912 "./expread.y"
 { yyval.sval = yyvsp[0].ssym.stoken; ;
     break;}
 case 118:
-#line 914 "./expread.y"
+#line 913 "./expread.y"
 { yyval.sval = yyvsp[0].ssym.stoken; ;
     break;}
 }
    /* the action file gets copied in in place of this dollarsign */
-#line 423 "/usr/unsupported/lib/bison.simple"
+#line 423 "/usr/latest/lib/bison.simple"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -1885,7 +1884,7 @@ yyerrhandle:
   yystate = yyn;
   goto yynewstate;
 }
-#line 929 "./expread.y"
+#line 928 "./expread.y"
 
 
 /* Begin counting arguments for a function call,