This patch removes the inclusion of the default manifest in final links for

the Cygwin and MinGW targets.  The manifest is now going to be handled by gcc.

	* scripttempl/pe.sc (R_RSRC): Remove default manifest.
	* scripttempl/pep.sc (R_RSRC): Remove default manifest.
This commit is contained in:
Nick Clifton 2014-04-08 17:45:33 +01:00
parent 61e2488cd8
commit 6c1799adab
3 changed files with 11 additions and 34 deletions

View File

@ -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):

View File

@ -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=

View File

@ -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=