From a2df430c5ac46e674fd6a8f20683089a7f4c93a0 Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Mon, 2 Nov 2009 17:14:49 -0500
Subject: [PATCH] * c-parse.in (structsp_attr): Fix for bison 2.4.1 pedantry.

From-SVN: r153828
---
 gcc/ChangeLog  | 4 ++++
 gcc/c-parse.in | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d17872fec44b..a899efb1ec77 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2009-11-02  Jason Merrill  <jason@redhat.com>
+
+	* c-parse.in (structsp_attr): Fix for bison 2.4.1 pedantry.
+
 2006-04-25  Nick Clifton  <nickc@redhat.com>
 
 	* config/m32r/m32r.c (gen_compare): Fix reg/smallconst equal code,
diff --git a/gcc/c-parse.in b/gcc/c-parse.in
index 66d27ac0322f..35bc3f8c1dd6 100644
--- a/gcc/c-parse.in
+++ b/gcc/c-parse.in
@@ -1730,7 +1730,7 @@ enum_head:
 
 structsp_attr:
 	  struct_head identifier '{'
-		{ $$ = start_struct (RECORD_TYPE, $2);
+		{ $<ttype>$ = start_struct (RECORD_TYPE, $2);
 		  /* Start scope of tag before parsing components.  */
 		}
 	  component_decl_list '}' maybe_attribute
@@ -1741,7 +1741,7 @@ structsp_attr:
 				      nreverse ($3), chainon ($1, $5));
 		}
 	| union_head identifier '{'
-		{ $$ = start_struct (UNION_TYPE, $2); }
+		{ $<ttype>$ = start_struct (UNION_TYPE, $2); }
 	  component_decl_list '}' maybe_attribute
 		{ $$ = finish_struct ($<ttype>4, nreverse ($5),
 				      chainon ($1, $7)); }
@@ -1750,12 +1750,12 @@ structsp_attr:
 				      nreverse ($3), chainon ($1, $5));
 		}
 	| enum_head identifier '{'
-		{ $$ = start_enum ($2); }
+		{ $<ttype>$ = start_enum ($2); }
 	  enumlist maybecomma_warn '}' maybe_attribute
 		{ $$ = finish_enum ($<ttype>4, nreverse ($5),
 				    chainon ($1, $8)); }
 	| enum_head '{'
-		{ $$ = start_enum (NULL_TREE); }
+		{ $<ttype>$ = start_enum (NULL_TREE); }
 	  enumlist maybecomma_warn '}' maybe_attribute
 		{ $$ = finish_enum ($<ttype>3, nreverse ($4),
 				    chainon ($1, $7)); }
-- 
2.47.2