From: David Edelsohn Date: Sat, 25 Nov 1995 02:37:58 +0000 (+0000) Subject: * scripttempl/pe.sc: Two .junk's is too much junk. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d87e370ba88aa4c0ad282d52dd801daebcd4116a;p=binutils-gdb.git * scripttempl/pe.sc: Two .junk's is too much junk. --- diff --git a/ld/ChangeLog b/ld/ChangeLog index fe66ae54a7a..5c4c98f5ddd 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,7 @@ +Fri Nov 24 18:35:35 1995 Doug Evans + + * scripttempl/pe.sc: Two .junk's is too much junk. + Tue Nov 21 16:14:32 1995 Ian Lance Taylor * configure.in: Use BFD_NEED_DECLARATION. diff --git a/ld/scripttempl/pe.sc b/ld/scripttempl/pe.sc index cc9e78ecf3f..626885f50f7 100644 --- a/ld/scripttempl/pe.sc +++ b/ld/scripttempl/pe.sc @@ -12,33 +12,54 @@ ENTRY(_mainCRTStartup) SECTIONS { - .text ${RELOCATING+ 0x401000} : + .text ${RELOCATING+ __image_base__ + __section_alignment__ } : { ${RELOCATING+ *(.init);} *(.text) - ${CONSTRUCTING+ ___CTOR_LIST__ = .; LONG (-1); *(.ctor); LONG (0); } - ${CONSTRUCTING+ ___DTOR_LIST__ = .; LONG (-1); *(.dtor); LONG (0); } + ${CONSTRUCTING+ ___CTOR_LIST__ = .; __CTOR_LIST__ = . ; + LONG (-1); *(.ctors); *(.ctor); LONG (0); } + ${CONSTRUCTING+ ___DTOR_LIST__ = .; __DTOR_LIST__ = . ; + LONG (-1); *(.dtors); *(.dtor); LONG (0); } ${RELOCATING+ *(.fini);} ${RELOCATING+ etext = .}; } - .bss BLOCK(0x1000) : + .bss BLOCK(__section_alignment__) : { - *(.bss) + __bss_start__ = . ; + *(.bss) ; *(COMMON); + __bss_end__ = . ; + } + .data BLOCK(__section_alignment__) : + { + __data_start__ = . ; + *(.data); + *(.data2); + __data_end__ = . ; } - .rdata BLOCK(0x1000) : + .rdata BLOCK(__section_alignment__) : { *(.rdata) ; } - .data BLOCK(0x1000) : { - *(.data) - *(.data2) + + + + .edata BLOCK(__section_alignment__) : { + *(.edata) ; + } + + .junk BLOCK(__section_alignment__) : { + *(.debug\$S) + *(.debug\$T) + *(.debug\$F) + *(.drectve) ; } - .idata BLOCK(0x1000) : + + .idata BLOCK(__section_alignment__) : { *(.idata\$2) *(.idata\$3) @@ -48,7 +69,7 @@ SECTIONS *(.idata\$7) ; } - .CRT BLOCK(0x1000) : + .CRT BLOCK(__section_alignment__) : { *(.CRT\$XCA) *(.CRT\$XCC) @@ -65,33 +86,35 @@ SECTIONS *(.CRT\$XTZ) ; } - .rsrc BLOCK(0x1000) : + .rsrc BLOCK(__section_alignment__) : { *(.rsrc\$01) *(.rsrc\$02) ; } - .reloc BLOCK(0x1000) : - { - *(.reloc) - ; - } - .junk BLOCK(0x1000) : - { - *(.debug\$S) - *(.debug\$T) - *(.debug\$F) - *(.drectve) - ; + + .endjunk BLOCK(__section_alignment__) : + { + ${RELOCATING+ end = .}; } - .stab 0 ${RELOCATING+(NOLOAD)} : + + .stab BLOCK(__section_alignment__) ${RELOCATING+(NOLOAD)} : { [ .stab ] } - .stabstr 0 ${RELOCATING+(NOLOAD)} : + .stabstr BLOCK(__section_alignment__) ${RELOCATING+(NOLOAD)} : { [ .stabstr ] } + + + .reloc BLOCK(__section_alignment__) : + { + *(.reloc) + ; + } + + } EOF