2d3181c7c4
The special case for .init and .fini in update_wild_statements is ineffective for .init or .fini wildcards inside other output sections. The special case needs to be on the wildcard, not the output section. This patch is belt and braces, both fixing update_wild_statements and the scripts. * scripttempl/alpha.sc, * scripttempl/armbpabi.sc, * scripttempl/crisaout.sc, * scripttempl/elf32cr16.sc, * scripttempl/elf32crx.sc, * scripttempl/elf32xc16x.sc, * scripttempl/elf32xc16xl.sc, * scripttempl/elf32xc16xs.sc, * scripttempl/elf64hppa.sc, * scripttempl/elf_chaos.sc, * scripttempl/elfarc.sc, * scripttempl/elfarcv2.sc, * scripttempl/elfd30v.sc, * scripttempl/elfm68hc11.sc, * scripttempl/elfm68hc12.sc, * scripttempl/elfm9s12z.sc, * scripttempl/elfmicroblaze.sc, * scripttempl/elfxgate.sc, * scripttempl/elfxtensa.sc, * scripttempl/epiphany_4x4.sc, * scripttempl/ft32.sc, * scripttempl/i386beos.sc, * scripttempl/iq2000.sc, * scripttempl/mcorepe.sc, * scripttempl/mep.sc, * scripttempl/mips.sc, * scripttempl/moxie.sc, * scripttempl/pe.sc, * scripttempl/pep.sc, * scripttempl/ppcpe.sc, * scripttempl/tic4xcoff.sc, * scripttempl/tic80coff.sc, * scripttempl/v850.sc, * scripttempl/v850_rh850.sc, * scripttempl/visium.sc, * scripttempl/xstormy16.sc: Add KEEP and SORT_NONE to .init and .fini wildcards. * scripttempl/elf32xc16x.sc, * scripttempl/elf32xc16xl.sc, * scripttempl/elf32xc16xs.sc: Add .fini wildcard. * scripttempl/elf_chaos.sc: Add .init output section. * scripttempl/elfd30v.sc: Remove duplicate .init. * scripttempl/elfm68hc11.sc, * scripttempl/elfm68hc12.sc, * scripttempl/elfm9s12z.sc, * scripttempl/elfxgate.sc: Remove duplicate .init, and add .fini wildcard. * scripttempl/ppcpe.sc (INIT, FINI): Delete. * ldlang.c (update_wild_statements): Special case .init and .fini in the wildcard, not the output section.
79 lines
1.5 KiB
Scala
79 lines
1.5 KiB
Scala
TORS=".tors :
|
|
{
|
|
___ctors = . ;
|
|
*(.ctors)
|
|
___ctors_end = . ;
|
|
___dtors = . ;
|
|
*(.dtors)
|
|
___dtors_end = . ;
|
|
. = ALIGN(4);
|
|
} ${RELOCATING+ > ram}"
|
|
|
|
cat <<EOF
|
|
OUTPUT_FORMAT("${OUTPUT_FORMAT}")
|
|
OUTPUT_ARCH(${ARCH})
|
|
${LIB_SEARCH_DIRS}
|
|
EOF
|
|
|
|
test -n "${RELOCATING}" && cat <<EOF
|
|
/* Allow the command line to override the memory region sizes. */
|
|
__PMSIZE = DEFINED(__PMSIZE) ? __PMSIZE : 256K;
|
|
__RAMSIZE = DEFINED(__RAMSIZE) ? __RAMSIZE : 64K;
|
|
|
|
MEMORY
|
|
{
|
|
flash (rx) : ORIGIN = 0, LENGTH = __PMSIZE
|
|
ram (rw!x) : ORIGIN = 0x800000, LENGTH = __RAMSIZE
|
|
}
|
|
EOF
|
|
|
|
cat <<EOF
|
|
SECTIONS
|
|
{
|
|
.text :
|
|
{
|
|
*(.text${RELOCATING+*})
|
|
${RELOCATING+*(.strings)
|
|
*(._pm*)
|
|
KEEP (*(SORT_NONE(.init)))
|
|
KEEP (*(SORT_NONE(.fini)))
|
|
_etext = .;
|
|
. = ALIGN(4);}
|
|
} ${RELOCATING+ > flash}
|
|
${CONSTRUCTING+${TORS}}
|
|
.data : ${RELOCATING+ AT (ADDR (.text) + SIZEOF (.text))}
|
|
{
|
|
*(.data)
|
|
${RELOCATING+*(.rodata)
|
|
*(.rodata*)
|
|
_edata = .;
|
|
. = ALIGN(4);}
|
|
} ${RELOCATING+ > ram}
|
|
.bss ${RELOCATING+ SIZEOF(.data) + ADDR(.data)} :
|
|
{
|
|
${RELOCATING+ _bss_start = . ; }
|
|
*(.bss)
|
|
${RELOCATING+*(COMMON)
|
|
_end = .;
|
|
. = ALIGN(4);}
|
|
} ${RELOCATING+ > ram}
|
|
|
|
${RELOCATING+ __data_load_start = LOADADDR(.data); }
|
|
${RELOCATING+ __data_load_end = __data_load_start + SIZEOF(.data); }
|
|
|
|
.stab 0 ${RELOCATING+(NOLOAD)} :
|
|
{
|
|
*(.stab)
|
|
}
|
|
.stabstr 0 ${RELOCATING+(NOLOAD)} :
|
|
{
|
|
*(.stabstr)
|
|
}
|
|
EOF
|
|
|
|
. $srcdir/scripttempl/DWARF.sc
|
|
|
|
cat <<EOF
|
|
}
|
|
EOF
|