* Makefile.in (distclean): Remove y.tab.h.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a5f8bbfde7ca84c90d7eb81b64a6e91d98ef3d89..64c469bc7570f900bb077575ac3ed61f53770014 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,18 @@
+<<<<<<< ChangeLog
+Fri Jul  2 18:22:54 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+       * Makefile.in (distclean): Remove y.tab.h.
+
+=======
+Fri Jul  2 14:55:48 1993  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+       * exec.c (exec_file_command):  Remove Mar 28 hack as BFD handles
+       file updates properly now.
+       * mipsread.c (mips_coff_new_init):  Force reevaluation of sigtramp
+       addresses if switching to a new symbol file.
+       * dbxread.c (process_one_symbol):  Avoid dereferencing NULL
+       symbols that might be returned from define_symbol.
+
 Fri Jul  2 13:33:12 1993  Steve Chamberlain  (sac@phydeaux.cygnus.com)
 
        New target macros for getting at the pc, sp and fp.
@@ -16,6 +31,7 @@ Fri Jul  2 13:33:12 1993  Steve Chamberlain  (sac@phydeaux.cygnus.com)
        * config/alpha/xm-alpha.h: Add MAKEVA_END.
        * config/h8500/tm-h8500.h: Define new macros.
 
+>>>>>>> 1.1453
 Fri Jul  2 13:51:04 1993  Ian Lance Taylor  (ian@cygnus.com)
 
        * configure.in (mipos-*-riscos*): New host and target; use riscos.

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 7f1e8241dec3fa8af61a33668d4b8af0c95964fb..583500227a19880a52e258a9396be2e566545a66 100644 (file)
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -639,7 +639,7 @@ clean:
 distclean: clean
        @$(MAKE) $(FLAGS_TO_PASS) DO=distclean "DODIRS=$(SUBDIRS)" subdir_do 
        rm -f nm.h tm.h xm.h config.status
-       rm -f y.output yacc.acts yacc.tmp
+       rm -f y.output yacc.acts yacc.tmp y.tab.h
        rm -f Makefile
 
 realclean: clean
@@ -846,9 +846,12 @@ ALLPARAM = config/a29k/nm-ultra3.h config/a29k/tm-a29k.h \
        config/m68k/xm-sun2.h config/m68k/xm-sun3.h config/m68k/xm-sun3os4.h \
        config/m88k/nm-m88k.h config/m88k/tm-delta88.h config/m88k/tm-m88k.h \
        config/m88k/xm-delta88.h config/m88k/xm-m88k.h config/mips/nm-irix3.h \
-       config/mips/nm-irix4.h config/mips/nm-mips.h config/mips/tm-bigmips.h \
+       config/mips/nm-irix4.h config/mips/nm-mips.h config/mips/nm-riscos.h \
+       config/mips/nm-news-mips.h config/mips/tm-bigmips.h \
        config/mips/tm-irix3.h config/mips/tm-mips.h config/mips/xm-irix3.h \
-       config/mips/xm-irix4.h config/mips/xm-mips.h config/nm-sysv4.h \
+       config/mips/xm-irix4.h config/mips/xm-mips.h config/mips/xm-riscos.h \
+       config/mips/xm-news-mips.h \
+       config/nm-sysv4.h \
        config/none/nm-none.h config/none/tm-none.h config/none/xm-none.h \
        config/ns32k/nm-umax.h config/ns32k/tm-merlin.h config/ns32k/tm-umax.h \
        config/ns32k/xm-merlin.h config/ns32k/xm-umax.h config/pa/nm-hppab.h \