From 3717e95b5d44462f1aabb6c68914b6a0b668d68e Mon Sep 17 00:00:00 2001
From: Fred Fish <fnf@specifix.com>
Date: Thu, 29 Apr 1993 19:05:22 +0000
Subject: [PATCH] Bump version to 4.8.4 for gdb 4.9 prerelease testing.

---
 gdb/ChangeLog   | 4 ++++
 gdb/Makefile.in | 9 ++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b07f9940885..831b09cd160 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+Thu Apr 29 12:03:23 1993  Fred Fish  (fnf@cygnus.com)
+
+	* Makefile.in (VERSION):  Bump to 4.8.4.
+
 Thu Apr 29 08:46:22 1993  Jim Kingdon  (kingdon@cygnus.com)
 
 	* stabsread.c (define_symbol): If unrecognized constant type,
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 195c2f9f894..bd107fad0bf 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -164,7 +164,7 @@ CDEPS = ${XM_CDEPS} ${TM_CDEPS} ${NAT_CDEPS} \
 ADD_FILES = ${REGEX} ${ALLOCA}  ${XM_ADD_FILES} ${TM_ADD_FILES} ${NAT_ADD_FILES}
 ADD_DEPS = ${REGEX1} ${ALLOCA1} ${XM_ADD_FILES} ${TM_ADD_FILES} ${NAT_ADD_FILES}
 
-VERSION = 4.8.3
+VERSION = 4.8.4
 DIST=gdb
 
 LINT=/usr/5bin/lint
@@ -753,7 +753,7 @@ version.c: Makefile
 c-exp.tab.o: c-exp.tab.c
 c-exp.tab.c: $(srcdir)/c-exp.y $(srcdir)/Makefile.in
 	@echo 'Expect 4 shift/reduce conflicts.'
-	${YACC} $(srcdir)/c-exp.y
+	${YACC} ${YFLAGS} $(srcdir)/c-exp.y
 	-sed -e '/extern.*malloc/d' \
 	     -e '/extern.*realloc/d' \
 	     -e '/extern.*free/d' \
@@ -769,8 +769,7 @@ c-exp.tab.c: $(srcdir)/c-exp.y $(srcdir)/Makefile.in
 # else.
 ch-exp.tab.o: ch-exp.tab.c
 ch-exp.tab.c: $(srcdir)/ch-exp.y $(srcdir)/Makefile.in
-	@echo 'Expect rules never reduced and {shift,reduce}/reduce conflicts.'
-	${YACC} $(srcdir)/ch-exp.y
+	${YACC} ${YFLAGS} $(srcdir)/ch-exp.y
 	-sed -e '/extern.*malloc/d' \
 	     -e '/extern.*realloc/d' \
 	     -e '/extern.*free/d' \
@@ -786,7 +785,7 @@ ch-exp.tab.c: $(srcdir)/ch-exp.y $(srcdir)/Makefile.in
 # else.
 m2-exp.tab.o: m2-exp.tab.c
 m2-exp.tab.c: $(srcdir)/m2-exp.y $(srcdir)/Makefile.in
-	${YACC} $(srcdir)/m2-exp.y
+	${YACC} ${YFLAGS} $(srcdir)/m2-exp.y
 	-sed -e '/extern.*malloc/d' \
 	     -e '/extern.*realloc/d' \
 	     -e '/extern.*free/d' \
-- 
2.30.2