From 16c1c9d6a6f485af1b5b1a54a74dc1ebb25b16c0 Mon Sep 17 00:00:00 2001 From: Chen Gang Date: Wed, 1 Apr 2015 11:29:46 +0100 Subject: Prevent multiple definitions for _HEAP_START, _HEAP_MAX, and _STACK_START when performing a relocatable link with a tic6x target. * emulparams/elf32_tic6x_le.sh: Skip OTHER_BSS_SECTIONS for relocating operation. --- ld/ChangeLog | 5 +++++ ld/emulparams/elf32_tic6x_le.sh | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index b8c506f2cf2..718cdb694e0 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,8 @@ +2015-04-01 Chen Gang + + * emulparams/elf32_tic6x_le.sh: Skip OTHER_BSS_SECTIONS for + relocating operation. + 2015-04-01 Alan Modra * ldlang.c (lang_size_sections): When alignment of sections diff --git a/ld/emulparams/elf32_tic6x_le.sh b/ld/emulparams/elf32_tic6x_le.sh index dfd64c12c47..efd7b246026 100644 --- a/ld/emulparams/elf32_tic6x_le.sh +++ b/ld/emulparams/elf32_tic6x_le.sh @@ -44,7 +44,12 @@ OTHER_READWRITE_SECTIONS=".fardata ${RELOCATING-0} : { *(.fardata${RELOCATING+ . OTHER_READWRITE_RELOC_SECTIONS=" .rel.fardata ${RELOCATING-0} : { *(.rel.fardata${RELOCATING+ .rel.fardata.*}) } .rela.fardata ${RELOCATING-0} : { *(.rela.fardata${RELOCATING+ .rela.fardata.*}) }" -case ${target} in +# For relocating operation, skip OTHER_BSS_SECTIONS, or will cause multiple definition. +if [ ${RELOCATING-0} ]; then + OTHER_BSS_SECTIONS=""; +else + case ${target} in + *-elf) OTHER_BSS_SECTIONS=" .heap : @@ -60,5 +65,6 @@ case ${target} in _STACK_START = .; }" ;; -esac + esac +fi ATTRS_SECTIONS='.c6xabi.attributes 0 : { KEEP (*(.c6xabi.attributes)) KEEP (*(.gnu.attributes)) }' -- cgit v1.2.1