diff options
| author | Alan Modra <amodra@gmail.com> | 2015-07-20 14:29:37 +0930 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2015-07-20 14:29:37 +0930 |
| commit | d9d11c361cc29bdac2d2d6c38bce329d25abf7af (patch) | |
| tree | ec86672b839a2212b797d4a6a0daa906769fa280 | |
| parent | e474ab13ec653d5d78489467f90669689191b31a (diff) | |
| download | binutils-gdb-d9d11c361cc29bdac2d2d6c38bce329d25abf7af.tar.gz | |
ALIGN change affects cris scripts
More fallout from a2c59f28. This one could have been fixed by simply
using ". = ALIGN (ABSOLUTE (.), 2);" but it's nicer to align the
section.
* emulparams/criself.sh (INIT_ADDR, FINI_ADDR): Define.
(INIT_START, FINI_START): Don't ALIGN.
* scriptempl/elf.sc (.init, .fini): Apply INIT_ADDR/FINI_ADDR.
| -rw-r--r-- | ld/ChangeLog | 6 | ||||
| -rw-r--r-- | ld/emulparams/criself.sh | 6 | ||||
| -rw-r--r-- | ld/scripttempl/elf.sc | 4 |
3 files changed, 12 insertions, 4 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index ba6eded1330..15137e24567 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,5 +1,11 @@ 2015-07-20 Alan Modra <amodra@gmail.com> + * emulparams/criself.sh (INIT_ADDR, FINI_ADDR): Define. + (INIT_START, FINI_START): Don't ALIGN. + * scriptempl/elf.sc (.init, .fini): Apply INIT_ADDR/FINI_ADDR. + +2015-07-20 Alan Modra <amodra@gmail.com> + * scripttempl/elf.sc (.ldata, .bss): Align absolute value of dot. * ldexp.c (is_align_conditional): Handle binary ALIGN. (exp_fold_tree_1): Move code setting SEC_KEEP for assignments to diff --git a/ld/emulparams/criself.sh b/ld/emulparams/criself.sh index 9c8ab317a3c..dcddc0fbbc3 100644 --- a/ld/emulparams/criself.sh +++ b/ld/emulparams/criself.sh @@ -55,8 +55,9 @@ OTHER_BSS_END_SYMBOLS=' ' OTHER_END_SYMBOLS='PROVIDE (__end = .);' +INIT_ADDR='ALIGN (2)' + INIT_START=' - . = ALIGN(2); ___init__start = .; PROVIDE (___do_global_ctors = .); ' @@ -66,8 +67,9 @@ INIT_END=' PROVIDE (___init__end = .); ' +FINI_ADDR='ALIGN (2)' + FINI_START=' - . = ALIGN (2); ___fini__start = .; PROVIDE (___do_global_dtors = .); ' diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc index 5a15a68916e..37e435110fe 100644 --- a/ld/scripttempl/elf.sc +++ b/ld/scripttempl/elf.sc @@ -474,7 +474,7 @@ emit_dyn() test -n "${NON_ALLOC_DYN}${SEPARATE_CODE}" || emit_dyn cat <<EOF - .init ${RELOCATING-0} : + .init ${RELOCATING-0}${RELOCATING+${INIT_ADDR}} : { ${RELOCATING+${INIT_START}} KEEP (*(SORT_NONE(.init))) @@ -495,7 +495,7 @@ cat <<EOF *(.gnu.warning) ${RELOCATING+${OTHER_TEXT_SECTIONS}} } ${FILL} - .fini ${RELOCATING-0} : + .fini ${RELOCATING-0}${RELOCATING+${FINI_ADDR}} : { ${RELOCATING+${FINI_START}} KEEP (*(SORT_NONE(.fini))) |