Skip to content

R
riscv-gcc-1
Commit 8552680f by Brendan Kehoe Committed by Brendan Kehoe
Options

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

From-SVN: r15514
parent bf520cd9
Showing with 5 additions and 1 deletions
gcc/cp/ChangeLog
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> Tue Sep 16 14:06:56 1997 Jason Merrill <jason@yorick.cygnus.com>
* call.c (build_new_op): Give better error for syntactically * call.c (build_new_op): Give better error for syntactically
......
gcc/cp/Makefile.in
...@@ -201,7 +201,7 @@ parse.o : $(PARSE_C) $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../flags.h lex.h ...@@ -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) \ $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $(BIG_SWITCHFLAG) \
`echo $(PARSE_C) | sed 's,^\./,,'` `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_H) : $(PARSE_C)
$(PARSE_C) : $(srcdir)/parse.y $(PARSE_C) : $(srcdir)/parse.y
@echo $(CONFLICTS) @echo $(CONFLICTS)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment