diff options
| author | Brendan Kehoe <brendan@lisa.cygnus.com> | 1997-09-17 18:05:58 +0000 |
|---|---|---|
| committer | Brendan Kehoe <brendan@gcc.gnu.org> | 1997-09-17 14:05:58 -0400 |
| commit | 8552680f15eba7e49bf72d9e00fd0c4615e9a07e (patch) | |
| tree | 6cbf26cc218d9cacb201a29ab18067ff6b002d7a | |
| parent | bf520cd90b6caf8eceae5bdbeff3da2d3f0a7d73 (diff) | |
| download | gcc-8552680f15eba7e49bf72d9e00fd0c4615e9a07e.zip gcc-8552680f15eba7e49bf72d9e00fd0c4615e9a07e.tar.gz gcc-8552680f15eba7e49bf72d9e00fd0c4615e9a07e.tar.bz2 | |
* Makefile.in (CONFLICTS): Fix s/r conflict count to 18.
From-SVN: r15514
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/Makefile.in | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 148691b..185f24b 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +1997-09-17 Brendan Kehoe <brendan@lisa.cygnus.com> + + * Makefile.in (CONFLICTS): Fix s/r conflict count to 18. + Tue Sep 16 14:06:56 1997 Jason Merrill <jason@yorick.cygnus.com> * call.c (build_new_op): Give better error for syntactically diff --git a/gcc/cp/Makefile.in b/gcc/cp/Makefile.in index b68779e..5394c26 100644 --- a/gcc/cp/Makefile.in +++ b/gcc/cp/Makefile.in @@ -201,7 +201,7 @@ parse.o : $(PARSE_C) $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../flags.h lex.h $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $(BIG_SWITCHFLAG) \ `echo $(PARSE_C) | sed 's,^\./,,'` -CONFLICTS = expect 20 shift/reduce conflicts and 39 reduce/reduce conflicts. +CONFLICTS = expect 18 shift/reduce conflicts and 39 reduce/reduce conflicts. $(PARSE_H) : $(PARSE_C) $(PARSE_C) : $(srcdir)/parse.y @echo $(CONFLICTS) |