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.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index cdba250b17e11d7cf103a04b9db37c27a76255c8..54aa6cdd04da1e6fe7097ebc97812c63514f619c 100644 (file)
--- 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 e9e5f646b6de49f8930940c59cc99fd769c21d08..579c0c8f59672f176bcb055adf16d4957dac9dd5 100644 (file)
--- 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 5f97d31b301275a190a01666972c65cf9cb63f7e..a71dd21b32c1d188fd7344cbee266f9658d1fa1d 100644 (file)
--- 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=