aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorBrendan Kehoe <brendan@gcc.gnu.org>1993-11-24 00:13:59 -0500
committerBrendan Kehoe <brendan@gcc.gnu.org>1993-11-24 00:13:59 -0500
commit0776af7805bf15e1a3f5a25a7e0f4b43b4bd497b (patch)
treeeed02895d16e240ef3a8dfb03f50b7fad8b84d73 /gcc
parent692e06f5f255875809d744c4a439619c85b13271 (diff)
downloadgcc-0776af7805bf15e1a3f5a25a7e0f4b43b4bd497b.zip
gcc-0776af7805bf15e1a3f5a25a7e0f4b43b4bd497b.tar.gz
gcc-0776af7805bf15e1a3f5a25a7e0f4b43b4bd497b.tar.bz2
Cygnus<->FSF merge for gcc-2.5.5
From-SVN: r6154
Diffstat (limited to 'gcc')
-rw-r--r--gcc/Makefile.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 09762ab..6a45cd6 100644
--- 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