1 files changed, 78 insertions, 45 deletions

diff --git a/contrib/binutils/ld/scripttempl/pe.sc b/contrib/binutils/ld/scripttempl/pe.sc
index 2adc3db..f5cfc70 100644
--- a/contrib/binutils/ld/scripttempl/pe.sc
+++ b/contrib/binutils/ld/scripttempl/pe.sc
@@ -1,7 +1,39 @@
 # Linker script for PE.
 
+if test -z "${RELOCATEABLE_OUTPUT_FORMAT}"; then
+  RELOCATEABLE_OUTPUT_FORMAT=${OUTPUT_FORMAT}
+fi
+
+# We can't easily and portably get an unquoted $ in a shell
+# substitution, so we do this instead.
+if test "${RELOCATING}"; then
+  R_TEXT='*(.text$*)'
+  R_DATA='*(.data$*)'
+  R_RDATA='*(.rdata$*)'
+  R_IDATA='
+    *(.idata$2)
+    *(.idata$3)
+    /* These zeroes mark the end of the import list.  */
+    LONG (0); LONG (0); LONG (0); LONG (0); LONG (0);
+    *(.idata$4)
+    *(.idata$5)
+    *(.idata$6)
+    *(.idata$7)'
+  R_CRT='*(.CRT$*)'
+  R_RSRC='*(.rsrc$*)'
+else
+  R_TEXT=
+  R_DATA=
+  R_RDATA=
+  R_IDATA=
+  R_CRT=
+  R_RSRC=
+fi
+
 cat <<EOF
-OUTPUT_FORMAT(${OUTPUT_FORMAT})
+${RELOCATING+OUTPUT_FORMAT(${OUTPUT_FORMAT})}
+${RELOCATING-OUTPUT_FORMAT(${RELOCATEABLE_OUTPUT_FORMAT})}
+
 ${LIB_SEARCH_DIRS}
 
 ENTRY(_mainCRTStartup)
@@ -12,6 +44,9 @@ SECTIONS
   {
     ${RELOCATING+ *(.init)}
     *(.text)
+    ${R_TEXT}
+    *(.glue_7t)
+    *(.glue_7)
     ${CONSTRUCTING+ ___CTOR_LIST__ = .; __CTOR_LIST__ = . ; 
 			LONG (-1); *(.ctors); *(.ctor); LONG (0); }
     ${CONSTRUCTING+ ___DTOR_LIST__ = .; __DTOR_LIST__ = . ; 
@@ -20,44 +55,46 @@ SECTIONS
     /* ??? Why is .gcc_exc here?  */
     ${RELOCATING+ *(.gcc_exc)}
     ${RELOCATING+ etext = .;}
-    /* Grouped section support currently must be explicitly provided for
-	in the linker script.  */
-    *(.text\$)
     *(.gcc_except_table)
   }
 
-  .bss BLOCK(__section_alignment__)  :
-  {
-    __bss_start__ = . ;
-    *(.bss)
-    *(COMMON)
-    __bss_end__ = . ;
-  }
-  .data BLOCK(__section_alignment__) : 
+  /* The Cygwin32 library uses a section to avoid copying certain data
+     on fork.  This used to be named ".data$nocopy".  The linker used
+     to include this between __data_start__ and __data_end__, but that
+     breaks building the cygwin32 dll.  Instead, we name the section
+     ".data_cygwin_nocopy" and explictly include it after __data_end__. */
+
+  .data ${RELOCATING+BLOCK(__section_alignment__)} : 
   {
-    __data_start__ = . ; 
+    ${RELOCATING+__data_start__ = . ;}
     *(.data)
     *(.data2)
-    __data_end__ = . ; 
-    /* Grouped section support currently must be explicitly provided for
-	in the linker script.  */
-    *(.data\$)
+    ${R_DATA}
+    ${RELOCATING+__data_end__ = . ;}
+    ${RELOCATING+*(.data_cygwin_nocopy)}
+  }
+
+  .bss ${RELOCATING+BLOCK(__section_alignment__)} :
+  {
+    ${RELOCATING+__bss_start__ = . ;}
+    *(.bss)
+    *(COMMON)
+    ${RELOCATING+__bss_end__ = . ;}
   }
 
-  .rdata BLOCK(__section_alignment__) :
+  .rdata ${RELOCATING+BLOCK(__section_alignment__)} :
   {
     *(.rdata)
-    /* Grouped section support currently must be explicitly provided for
-	in the linker script.  */
-    *(.rdata\$)
+    ${R_RDATA}
+    *(.eh_frame)
   }
 
-  .edata BLOCK(__section_alignment__) :
+  .edata ${RELOCATING+BLOCK(__section_alignment__)} :
   {
     *(.edata)
   }
 
-  /DISCARD/ BLOCK(__section_alignment__) :
+  /DISCARD/ :
   {
     *(.debug\$S)
     *(.debug\$T)
@@ -65,48 +102,44 @@ SECTIONS
     *(.drectve)
   }
 
-  .idata BLOCK(__section_alignment__) :
+  .idata ${RELOCATING+BLOCK(__section_alignment__)} :
   {
     /* This cannot currently be handled with grouped sections.
 	See pe.em:sort_sections.  */
-    *(.idata\$2)
-    *(.idata\$3)
-    *(.idata\$4)
-    *(.idata\$5)
-    *(.idata\$6)
-    *(.idata\$7)
+    ${R_IDATA}
   }
-  .CRT BLOCK(__section_alignment__) :
+  .CRT ${RELOCATING+BLOCK(__section_alignment__)} :
   { 					
-    /* Grouped sections are used to handle .CRT\$foo.  */
-    *(.CRT\$)
-  }
-  .rsrc BLOCK(__section_alignment__) :
-  { 					
-    /* Grouped sections are used to handle .rsrc\$0[12].  */
-    *(.rsrc\$)
+    ${R_CRT}
   }
 
-  .endjunk BLOCK(__section_alignment__) :
+  .endjunk ${RELOCATING+BLOCK(__section_alignment__)} :
   {
     /* end is deprecated, don't use it */
     ${RELOCATING+ end = .;}
     ${RELOCATING+ __end__ = .;}
   }
 
-  .stab BLOCK(__section_alignment__)  ${RELOCATING+(NOLOAD)} : 
+  .reloc ${RELOCATING+BLOCK(__section_alignment__)} :
+  { 					
+    *(.reloc)
+  }
+
+  .rsrc ${RELOCATING+BLOCK(__section_alignment__)} :
+  { 					
+    *(.rsrc)
+    ${R_RSRC}
+  }
+
+  .stab ${RELOCATING+BLOCK(__section_alignment__)} ${RELOCATING+(NOLOAD)} :
   {
     [ .stab ]
   }
 
-  .stabstr BLOCK(__section_alignment__) ${RELOCATING+(NOLOAD)} :
+  .stabstr ${RELOCATING+BLOCK(__section_alignment__)} ${RELOCATING+(NOLOAD)} :
   {
     [ .stabstr ]
   }
 
-  .reloc BLOCK(__section_alignment__) :
-  { 					
-    *(.reloc)
-  }
 }
 EOF