From: Kai Tietz <kai.tietz@onevision.com>
Date: Tue, 11 Sep 2007 14:05:09 +0000 (+0000)
Subject: PR/5020: STRINGTABLE doesn't work in 2.18 windres.
X-Git-Tag: sid-snapshot-20071001~243
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d6d25f2043da6141ae2458e9546c32135efe75dc;p=external%2Fbinutils.git

PR/5020: STRINGTABLE doesn't work in 2.18 windres.
---

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 5dcedfb..f3438f1 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,7 @@
+2007-09-11  Kai Tietz  <kai.tietz@onevision.com>
+
+	* rcparse.y: (string_data): Removed ill token removal.
+
 2007-09-10  Alan Modra  <amodra@bigpond.net.au>
 
 	PR 5011
diff --git a/binutils/rcparse.y b/binutils/rcparse.y
index 64ea966..00a060d 100644
--- a/binutils/rcparse.y
+++ b/binutils/rcparse.y
@@ -1263,17 +1263,18 @@ string_data:
 	| string_data numexpr res_unicode_string_concat
 	  {
 	    define_stringtable (&sub_res_info, $2, $3);
-	    if (yychar != YYEMPTY)
-	      YYERROR;
 	    rcparse_discard_strings ();
 	  }
 	| string_data numexpr ',' res_unicode_string_concat
 	  {
 	    define_stringtable (&sub_res_info, $2, $4);
-	    if (yychar != YYEMPTY)
-	      YYERROR;
 	    rcparse_discard_strings ();
 	  }
+	| string_data error
+	  {
+	    rcparse_warning (_("invalid stringtable resource."));
+	    abort ();
+	  }
 	;
 
 rcdata_id: