diff options
| author | Nick Clifton <nickc@redhat.com> | 2014-03-19 08:51:20 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2014-03-19 08:51:20 +0000 |
| commit | 1d63324c56f29034782396ce7f25c09edd0cdc6e (patch) | |
| tree | 586816f37f7e0ab39b228af4006804e408bf824f /ld/scripttempl | |
| parent | 0172b6a7deca953ff33b4458da2f4e666bee7e51 (diff) | |
| download | gdb-1d63324c56f29034782396ce7f25c09edd0cdc6e.zip gdb-1d63324c56f29034782396ce7f25c09edd0cdc6e.tar.gz gdb-1d63324c56f29034782396ce7f25c09edd0cdc6e.tar.bz2 | |
Improve .rsrc section merging with better handling of the alignment adjustments
made between merged .rsrc sections.
* peXXigen.c (rsrc_align): New function. Attempts to cope with
alignment variances when .rsrc sections are merged.
(rsrc_process_section): Use rsrc_align.
* Makefile.am (default-manifest.o): Use WINDRES_FOR_TARGET.
* Makefile.in: Regenerate.
* emultempl/default-manifest.rc: Fix typo.
* scripttempl/pe.sc (R_RSRC): Fix default-manifest exclusion.
(.rsrc): Add SUBALIGN(4).
* scripttempl/pep.sc: Likewise.
Diffstat (limited to 'ld/scripttempl')
| -rw-r--r-- | ld/scripttempl/pe.sc | 4 | ||||
| -rw-r--r-- | ld/scripttempl/pep.sc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ld/scripttempl/pe.sc b/ld/scripttempl/pe.sc index 6cf59ea..4a1951c 100644 --- a/ld/scripttempl/pe.sc +++ b/ld/scripttempl/pe.sc @@ -54,7 +54,7 @@ if test "${RELOCATING}"; then binaries to run under Windows 8 (or later). It is included as the last resource file so that if the application has provided its own manifest then that one will take precedence. */ - *(EXCLUDE_FILE ($DEFAULT_MANIFEST) .rsrc) + *(EXCLUDE_FILE (*$DEFAULT_MANIFEST) .rsrc) *(SORT(.rsrc*)) KEEP ($DEFAULT_MANIFEST(.rsrc))" fi @@ -214,7 +214,7 @@ SECTIONS ${RELOCATING+ __end__ = .;} } - .rsrc ${RELOCATING+BLOCK(__section_alignment__)} : + .rsrc ${RELOCATING+BLOCK(__section_alignment__)} : SUBALIGN(4) { ${R_RSRC} } diff --git a/ld/scripttempl/pep.sc b/ld/scripttempl/pep.sc index 324a743..592489a 100644 --- a/ld/scripttempl/pep.sc +++ b/ld/scripttempl/pep.sc @@ -54,7 +54,7 @@ if test "${RELOCATING}"; then binaries to run under Windows 8 (or later). It is included as the last resource file so that if the application has provided its own manifest then that one will take precedence. */ - *(EXCLUDE_FILE ($DEFAULT_MANIFEST) .rsrc) + *(EXCLUDE_FILE (*$DEFAULT_MANIFEST) .rsrc) *(SORT(.rsrc*)) KEEP ($DEFAULT_MANIFEST(.rsrc))" fi @@ -219,7 +219,7 @@ SECTIONS ${RELOCATING+ __end__ = .;} } - .rsrc ${RELOCATING+BLOCK(__section_alignment__)} : + .rsrc ${RELOCATING+BLOCK(__section_alignment__)} : SUBALIGN(4) { ${R_RSRC} } |