diff options
| author | Kai Tietz <kai.tietz@onevision.com> | 2007-09-11 14:05:09 +0000 |
|---|---|---|
| committer | Kai Tietz <kai.tietz@onevision.com> | 2007-09-11 14:05:09 +0000 |
| commit | d6d25f2043da6141ae2458e9546c32135efe75dc (patch) | |
| tree | b09b5b6a71d26b743673f67e5a226a8a1af55bc9 /binutils | |
| parent | 84e7906ea01a52faf30e4bddf4f553d0cec59238 (diff) | |
| download | gdb-d6d25f2043da6141ae2458e9546c32135efe75dc.zip gdb-d6d25f2043da6141ae2458e9546c32135efe75dc.tar.gz gdb-d6d25f2043da6141ae2458e9546c32135efe75dc.tar.bz2 | |
PR/5020: STRINGTABLE doesn't work in 2.18 windres.
Diffstat (limited to 'binutils')
| -rw-r--r-- | binutils/ChangeLog | 4 | ||||
| -rw-r--r-- | binutils/rcparse.y | 9 |
2 files changed, 9 insertions, 4 deletions
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: |