[Haiku-commits] r31308 - buildtools/trunk/legacy/gcc/gcc

zooey at BerliOS zooey at mail.berlios.de
Mon Jun 29 11:08:34 CEST 2009


Author: zooey
Date: 2009-06-29 11:08:34 +0200 (Mon, 29 Jun 2009)
New Revision: 31308
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=31308&view=rev

Modified:
   buildtools/trunk/legacy/gcc/gcc/c-parse.y
Log:
* specify type for $$ in order to make newer bison versions happy,
  such that gcc2 can be compiled on haiku


Modified: buildtools/trunk/legacy/gcc/gcc/c-parse.y
===================================================================
--- buildtools/trunk/legacy/gcc/gcc/c-parse.y	2009-06-29 00:06:00 UTC (rev 31307)
+++ buildtools/trunk/legacy/gcc/gcc/c-parse.y	2009-06-29 09:08:34 UTC (rev 31308)
@@ -1332,7 +1332,7 @@
 
 structsp:
 	  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 
@@ -1344,7 +1344,7 @@
 	| struct_head identifier
 		{ $$ = xref_tag (RECORD_TYPE, $2); }
 	| union_head identifier '{'
-		{ $$ = start_struct (UNION_TYPE, $2); }
+		{ $<ttype>$ = start_struct (UNION_TYPE, $2); }
 	  component_decl_list '}' maybe_attribute
 		{ $$ = finish_struct ($<ttype>4, $5, chainon ($1, $7)); }
 	| union_head '{' component_decl_list '}' maybe_attribute
@@ -1355,13 +1355,13 @@
 		{ $$ = xref_tag (UNION_TYPE, $2); }
 	| enum_head identifier '{'
 		{ $<itype>3 = suspend_momentary ();
-		  $$ = start_enum ($2); }
+		  $<ttype>$ = start_enum ($2); }
 	  enumlist maybecomma_warn '}' maybe_attribute
 		{ $$= finish_enum ($<ttype>4, nreverse ($5), chainon ($1, $8));
 		  resume_momentary ($<itype>3); }
 	| enum_head '{'
 		{ $<itype>2 = suspend_momentary ();
-		  $$ = start_enum (NULL_TREE); }
+		  $<ttype>$ = start_enum (NULL_TREE); }
 	  enumlist maybecomma_warn '}' maybe_attribute
 		{ $$= finish_enum ($<ttype>3, nreverse ($4), chainon ($1, $7));
 		  resume_momentary ($<itype>2); }




More information about the Haiku-commits mailing list