OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* Makefile.in (CONFLICTS): Fix s/r conflict count to 18. 

From-SVN: r15514
This commit is contained in:
Brendan Kehoe 1997-09-17 18:05:58 +00:00 committed by Brendan Kehoe
parent bf520cd90b
commit 8552680f15
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcc/cp/ChangeLog
View File

@ -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

2
gcc/cp/Makefile.in
View File

@ -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)