PR binutils/13051
authorNick Clifton <nickc@redhat.com>
Tue, 11 Oct 2011 15:56:29 +0000 (15:56 +0000)
committerNick Clifton <nickc@redhat.com>
Tue, 11 Oct 2011 15:56:29 +0000 (15:56 +0000)
commitbfb6c1ab1ed502faa7c3764722a1f1661f6d44e8
tree1d8de29dde516f5b030ce2a485fa33e458477bd5
parent941b2081b1fd085fff7d323448672cedf18258db
PR binutils/13051
Fix a syntax error bug when compiling rc files with the VERSIONINFO resource
containing more than one language block inside a single StringFileInfo block.

* windint.h (rc_ver_stringtable): New structure definition.
(rc_ver_info): Use it.
* rcparse.y (verstringtable): New variable.
(verstringtables): New type.
(verstringtables:): New rule declaration.
(verblocks:): Use it.
* resrc.c (append_ver_stringtable): New function.
(append_ver_stringfileinfo): Update to use stringtables.
* windres.h (append_ver_stringfileinfo): Update declaration.
(append_ver_stringtable): New declaration.
* resrc.c (write_rc_versioninfo): Update to support multiple blocks.
* resbin.c (bin_to_res_version): Likewise.
(res_to_bin_versioninfo): Likewise.

* binutils-all\windres\version.rsd: Regenerate.
* binutils-all\windres\version_cat.rsd: Regenerate.
* binutils-all\windres\version_mlang.rc: Add new test.
* binutils-all\windres\version_mlang.rsd: Likewise.
binutils/ChangeLog
binutils/rcparse.y
binutils/resbin.c
binutils/resrc.c
binutils/testsuite/ChangeLog
binutils/testsuite/binutils-all/windres/version.rsd
binutils/testsuite/binutils-all/windres/version_cat.rsd
binutils/testsuite/binutils-all/windres/version_mlang.rc [new file with mode: 0644]
binutils/testsuite/binutils-all/windres/version_mlang.rsd [new file with mode: 0644]
binutils/windint.h
binutils/windres.h