Cygnus<->FSF merge for gcc-2.5.5

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@6154 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 09762ab..6a45cd6 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -835,7 +835,7 @@ cp-parse.o : $(srcdir)/cp-parse.c $(CONFIG_H) $(CPLUS_TREE_H) flags.h cp-lex.h
   `echo $(srcdir)/cp-parse.c | sed 's,^\./,,'`
 
 $(srcdir)/cp-parse.c $(srcdir)/cp-parse.h : $(srcdir)/cp-parse.y
-       @echo expect 29 shift/reduce conflicts and 13 reduce/reduce conflicts
+       @echo expect 27 shift/reduce conflicts and 14 reduce/reduce conflicts
        cd $(srcdir); $(BISON) $(BISONFLAGS) -d -o cp-parse.c cp-parse.y
        cd $(srcdir); grep '^#define[   ]*YYEMPTY' cp-parse.c >>cp-parse.h