OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix duplicated assignments to __rel_iplt and __rela_iplt symbols

Browse Source 
and fix more nds32 dependencies.

	* scripttempl/elf.sc: Edit out __rela_iplt symbol assignments from
	.rel sections, and __rel_iplt from .rela sections.
	* scripttempl/nds32elf.sc: Likewise.
	* Makefile.am (ends32*.c): Depend on nds32elf.sc.
	* Makefile.in: Regenerate.
This commit is contained in:
Alan Modra 2014-06-16 22:21:16 +09:30
parent 85024cd8bc
commit e1279d1d6b
5 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ld/ChangeLog
View File

@ -1,3 +1,11 @@
2014-06-16 Alan Modra <amodra@gmail.com>
* scripttempl/elf.sc: Edit out __rela_iplt symbol assignments from
.rel sections, and __rel_iplt from .rela sections.
* scripttempl/nds32elf.sc: Likewise.
* Makefile.am (ends32*.c) Depend on nds32elf.sc.
* Makefile.in: Regenerate.
2014-06-13 Alan Modra <amodra@gmail.com>
PR 17047

12
ld/Makefile.am
View File

@ -1490,27 +1490,27 @@ emsp430X.c: $(srcdir)/emulparams/msp430.sh $(srcdir)/emulparams/msp430X.sh \
ends32elf.c: $(srcdir)/emulparams/nds32elf.sh \
$(ELF_DEPS) $(srcdir)/emultempl/nds32elf.em \
$(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
$(srcdir)/scripttempl/nds32elf.sc ${GEN_DEPENDS}
ends32elf16m.c: $(srcdir)/emulparams/nds32elf16m.sh \
$(ELF_DEPS) $(srcdir)/emultempl/nds32elf.em \
$(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
$(srcdir)/scripttempl/nds32elf.sc ${GEN_DEPENDS}
ends32belf.c: $(srcdir)/emulparams/nds32belf.sh \
$(ELF_DEPS) $(srcdir)/emultempl/nds32elf.em \
$(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
$(srcdir)/scripttempl/nds32elf.sc ${GEN_DEPENDS}
ends32belf16m.c: $(srcdir)/emulparams/nds32belf16m.sh \
$(ELF_DEPS) $(srcdir)/emultempl/nds32elf.em \
$(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
$(srcdir)/scripttempl/nds32elf.sc ${GEN_DEPENDS}
ends32elf_linux.c: $(srcdir)/emulparams/nds32elf_linux.sh \
$(ELF_DEPS) $(srcdir)/emultempl/nds32elf.em \
$(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
$(srcdir)/scripttempl/nds32elf.sc ${GEN_DEPENDS}
ends32belf_linux.c: $(srcdir)/emulparams/nds32belf_linux.sh \
$(ELF_DEPS) $(srcdir)/emultempl/nds32elf.em \
$(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
$(srcdir)/scripttempl/nds32elf.sc ${GEN_DEPENDS}
enews.c: $(srcdir)/emulparams/news.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}

12
ld/Makefile.in
View File

@ -2928,27 +2928,27 @@ emsp430X.c: $(srcdir)/emulparams/msp430.sh $(srcdir)/emulparams/msp430X.sh \
ends32elf.c: $(srcdir)/emulparams/nds32elf.sh \
$(ELF_DEPS) $(srcdir)/emultempl/nds32elf.em \
$(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
$(srcdir)/scripttempl/nds32elf.sc ${GEN_DEPENDS}
ends32elf16m.c: $(srcdir)/emulparams/nds32elf16m.sh \
$(ELF_DEPS) $(srcdir)/emultempl/nds32elf.em \
$(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
$(srcdir)/scripttempl/nds32elf.sc ${GEN_DEPENDS}
ends32belf.c: $(srcdir)/emulparams/nds32belf.sh \
$(ELF_DEPS) $(srcdir)/emultempl/nds32elf.em \
$(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
$(srcdir)/scripttempl/nds32elf.sc ${GEN_DEPENDS}
ends32belf16m.c: $(srcdir)/emulparams/nds32belf16m.sh \
$(ELF_DEPS) $(srcdir)/emultempl/nds32elf.em \
$(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
$(srcdir)/scripttempl/nds32elf.sc ${GEN_DEPENDS}
ends32elf_linux.c: $(srcdir)/emulparams/nds32elf_linux.sh \
$(ELF_DEPS) $(srcdir)/emultempl/nds32elf.em \
$(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
$(srcdir)/scripttempl/nds32elf.sc ${GEN_DEPENDS}
ends32belf_linux.c: $(srcdir)/emulparams/nds32belf_linux.sh \
$(ELF_DEPS) $(srcdir)/emultempl/nds32elf.em \
$(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
$(srcdir)/scripttempl/nds32elf.sc ${GEN_DEPENDS}
enews.c: $(srcdir)/emulparams/news.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}

8
ld/scripttempl/elf.sc
View File

@ -410,13 +410,13 @@ cat >> ldscripts/dyntmp.$$ <<EOF
.rel.dyn ${RELOCATING-0} :
{
EOF
sed -e '/^[ ]*[{}][ ]*$/d;/:[ ]*$/d;/\.rela\./d;s/^.*: { *\(.*\)}$/ \1/' $COMBRELOC >> ldscripts/dyntmp.$$
sed -e '/^[ ]*[{}][ ]*$/d;/:[ ]*$/d;/\.rela\./d;/__rela_iplt_/d;s/^.*: { *\(.*\)}$/ \1/' $COMBRELOC >> ldscripts/dyntmp.$$
cat >> ldscripts/dyntmp.$$ <<EOF
}
.rela.dyn ${RELOCATING-0} :
{
EOF
sed -e '/^[ ]*[{}][ ]*$/d;/:[ ]*$/d;/\.rel\./d;s/^.*: { *\(.*\)}/ \1/' $COMBRELOC >> ldscripts/dyntmp.$$
sed -e '/^[ ]*[{}][ ]*$/d;/:[ ]*$/d;/\.rel\./d;/__rel_iplt_/d;s/^.*: { *\(.*\)}/ \1/' $COMBRELOC >> ldscripts/dyntmp.$$
cat >> ldscripts/dyntmp.$$ <<EOF
}
EOF
@ -446,10 +446,10 @@ emit_dyn()
cat ldscripts/dyntmp.$$
else
if test -z "${NO_REL_RELOCS}"; then
sed -e '/^[ ]*\.rela\.[^}]*$/,/}/d' -e '/^[ ]*\.rela\./d' ldscripts/dyntmp.$$
sed -e '/^[ ]*\.rela\.[^}]*$/,/}/d;/^[ ]*\.rela\./d;/__rela_iplt_/d' ldscripts/dyntmp.$$
fi
if test -z "${NO_RELA_RELOCS}"; then
sed -e '/^[ ]*\.rel\.[^}]*$/,/}/d' -e '/^[ ]*\.rel\./d' ldscripts/dyntmp.$$
sed -e '/^[ ]*\.rel\.[^}]*$/,/}/d;/^[ ]*\.rel\./d;/__rel_iplt_/d' ldscripts/dyntmp.$$
fi
fi
rm -f ldscripts/dyntmp.$$

8
ld/scripttempl/nds32elf.sc
View File

@ -361,13 +361,13 @@ cat >> ldscripts/dyntmp.$$ <<EOF
.rel.dyn ${RELOCATING-0} :
{
EOF
sed -e '/^[ ]*[{}][ ]*$/d;/:[ ]*$/d;/\.rela\./d;s/^.*: { *\(.*\)}$/ \1/' $COMBRELOC >> ldscripts/dyntmp.$$
sed -e '/^[ ]*[{}][ ]*$/d;/:[ ]*$/d;/\.rela\./d;/__rela_iplt_/d;s/^.*: { *\(.*\)}$/ \1/' $COMBRELOC >> ldscripts/dyntmp.$$
cat >> ldscripts/dyntmp.$$ <<EOF
}
.rela.dyn ${RELOCATING-0} :
{
EOF
sed -e '/^[ ]*[{}][ ]*$/d;/:[ ]*$/d;/\.rel\./d;s/^.*: { *\(.*\)}/ \1/' $COMBRELOC >> ldscripts/dyntmp.$$
sed -e '/^[ ]*[{}][ ]*$/d;/:[ ]*$/d;/\.rel\./d;/__rel_iplt_/d;s/^.*: { *\(.*\)}/ \1/' $COMBRELOC >> ldscripts/dyntmp.$$
cat >> ldscripts/dyntmp.$$ <<EOF
}
EOF
@ -397,10 +397,10 @@ emit_dyn()
cat ldscripts/dyntmp.$$
else
if test -z "${NO_REL_RELOCS}"; then
sed -e '/^[ ]*\.rela\.[^}]*$/,/}/d' -e '/^[ ]*\.rela\./d' ldscripts/dyntmp.$$
sed -e '/^[ ]*\.rela\.[^}]*$/,/}/d;/^[ ]*\.rela\./d;/__rela_iplt_/d' ldscripts/dyntmp.$$
fi
if test -z "${NO_RELA_RELOCS}"; then
sed -e '/^[ ]*\.rel\.[^}]*$/,/}/d' -e '/^[ ]*\.rel\./d' ldscripts/dyntmp.$$
sed -e '/^[ ]*\.rel\.[^}]*$/,/}/d;/^[ ]*\.rel\./d;/__rel_iplt_/d' ldscripts/dyntmp.$$
fi
fi
rm -f ldscripts/dyntmp.$$