diff options
Diffstat (limited to 'ld')
| -rw-r--r-- | ld/ChangeLog | 5 | ||||
| -rw-r--r-- | ld/scripttempl/pe.sc | 20 | ||||
| -rw-r--r-- | ld/scripttempl/pep.sc | 20 |
3 files changed, 11 insertions, 34 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index cdba250..54aa6cd 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,8 @@ +2014-04-08 Nick Clifton <nickc@redhat.com> + + * scripttempl/pe.sc (R_RSRC): Remove default manifest. + * scripttempl/pep.sc (R_RSRC): Remove default manifest. + 2014-04-08 Jon TURNEY <jon.turney@dronecode.org.uk> * emultempl/elf32.em (id_note_section_size, read_hex, write_build_id): diff --git a/ld/scripttempl/pe.sc b/ld/scripttempl/pe.sc index e9e5f64..579c0c8 100644 --- a/ld/scripttempl/pe.sc +++ b/ld/scripttempl/pe.sc @@ -44,23 +44,9 @@ if test "${RELOCATING}"; then *(.tls$) *(SORT(.tls$*)) *(.tls$ZZZ)' - if test -z "$DEFAULT_MANIFEST"; then - R_RSRC=' - *(.rsrc) - *(.rsrc$*)' - else - R_RSRC=" - /* The default manifest contains information necessary for - 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. - - Note - the .rsrc section merging code relies upon the fact - that the input .rsrc sections are *not* sorted. */ - *(EXCLUDE_FILE (*$DEFAULT_MANIFEST) .rsrc) - *(.rsrc*) - KEEP ($DEFAULT_MANIFEST(.rsrc))" - fi + R_RSRC=' + *(.rsrc) + *(.rsrc$*)' else R_TEXT= R_DATA= diff --git a/ld/scripttempl/pep.sc b/ld/scripttempl/pep.sc index 5f97d31..a71dd21 100644 --- a/ld/scripttempl/pep.sc +++ b/ld/scripttempl/pep.sc @@ -44,23 +44,9 @@ if test "${RELOCATING}"; then *(.tls$) *(SORT(.tls$*)) *(.tls$ZZZ)' - if test -z "$DEFAULT_MANIFEST"; then - R_RSRC=' - *(.rsrc) - *(.rsrc$*)' - else - R_RSRC=" - /* The default manifest contains information necessary for - 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. - - Note - the .rsrc section merging code relies upon the fact - that the input .rsrc sections are *not* sorted. */ - *(EXCLUDE_FILE (*$DEFAULT_MANIFEST) .rsrc) - *(.rsrc*) - KEEP ($DEFAULT_MANIFEST(.rsrc))" - fi + R_RSRC=' + *(.rsrc) + *(.rsrc$*)' else R_TEXT= R_DATA= |