2009-11-09 Tristan Gingold <gingold@adacore.com>

[deliverable/binutils-gdb.git] / ld / scripttempl / i386go32.sc

diff --git a/ld/scripttempl/i386go32.sc b/ld/scripttempl/i386go32.sc
index 0d97fd3a89955b673c19dae36ec207813f5dc865..e5bcf2ac5705607f94332cf63e901ed88ac0d005 100644 (file)
--- a/ld/scripttempl/i386go32.sc
+++ b/ld/scripttempl/i386go32.sc
@@ -5,33 +5,43 @@ EXE=${CONSTRUCTING+${RELOCATING+-exe}}
 
 # These are substituted in as variables in order to get '}' in a shell
 # conditional expansion.
-CTOR='.ctor : { *(.ctor) }'
-DTOR='.dtor : { *(.dtor) }'
+CTOR='.ctor : {
+    *(SORT(.ctors.*))
+    *(.ctor)
+  }'
+DTOR='.dtor : {
+    *(SORT(.dtors.*))
+    *(.dtor)
+  }'
 
 cat <<EOF
 OUTPUT_FORMAT("${OUTPUT_FORMAT}${EXE}")
 
-ENTRY(${ENTRY})
+${RELOCATING+ENTRY (${ENTRY})}
 
 SECTIONS
 {
   .text ${RELOCATING+ ${TARGET_PAGE_SIZE}+SIZEOF_HEADERS} : {
     *(.text)
+    ${RELOCATING+*(.text.*)}
     ${RELOCATING+*(.gnu.linkonce.t*)}
     *(.const*)
     *(.ro*)
     ${RELOCATING+*(.gnu.linkonce.r*)}
-    ${RELOCATING+etext  =  . ; _etext = .};
+    ${RELOCATING+etext  =  . ; PROVIDE(_etext = .) ;}
     ${RELOCATING+. = ALIGN(${SEGMENT_SIZE});}
   }
   .data ${RELOCATING+ ${DATA_ALIGNMENT}} : {
     ${RELOCATING+djgpp_first_ctor = . ;
+    *(SORT(.ctors.*))
     *(.ctor)
     djgpp_last_ctor = . ;}
     ${RELOCATING+djgpp_first_dtor = . ;
+    *(SORT(.dtors.*))
     *(.dtor)
     djgpp_last_dtor = . ;}
     *(.data)
+    ${RELOCATING+*(.data.*)}
 
     ${RELOCATING+*(.gcc_exc*)}
     ${RELOCATING+___EH_FRAME_BEGIN__ = . ;}
@@ -40,17 +50,30 @@ SECTIONS
     ${RELOCATING+LONG(0);}
 
     ${RELOCATING+*(.gnu.linkonce.d*)}
-    ${RELOCATING+edata  =  . ; _edata = .};
+    ${RELOCATING+edata  =  . ; PROVIDE(_edata = .) ;}
     ${RELOCATING+. = ALIGN(${SEGMENT_SIZE});}
   }
   ${CONSTRUCTING+${RELOCATING-$CTOR}}
   ${CONSTRUCTING+${RELOCATING-$DTOR}}
   .bss ${RELOCATING+ SIZEOF(.data) + ADDR(.data)} :
   {                                    
-    *(.bss)
+    *(.bss${RELOCATING+ .bss.* .gnu.linkonce.b.*})
     *(COMMON)
-    ${RELOCATING+ end = . ; _end = .};
+    ${RELOCATING+ end = . ; PROVIDE(_end = .) ;}
     ${RELOCATING+ . = ALIGN(${SEGMENT_SIZE});}
   }
+  /* Stabs debugging sections.  */
+  .stab 0 : { *(.stab) }
+  .stabstr 0 : { *(.stabstr) }
+  /* DWARF 2 */
+  .debug_aranges  0 : { *(.debug_aranges) }
+  .debug_pubnames 0 : { *(.debug_pubnames) }
+  .debug_info     0 : { *(.debug_info) *(.gnu.linkonce.wi.*) }
+  .debug_abbrev   0 : { *(.debug_abbrev) }
+  .debug_line     0 : { *(.debug_line) }
+  .debug_frame    0 : { *(.debug_frame) }
+  .debug_str      0 : { *(.debug_str) }
+  .debug_loc      0 : { *(.debug_loc) }
+  .debug_macinfo  0 : { *(.debug_macinfo) }
 }
 EOF