From 63653551a88c797260c2928db2a9e1c799354a71 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Tue, 3 Jul 2001 23:22:20 +0000 Subject: [PATCH] 2001-07-03 H.J. Lu * scripttempl/elf.sc (DYNAMIC_PAD): Revert the change made on 2001-07-03. It creates dynamic entries even for static binaries. --- ld/ChangeLog | 5 +++++ ld/scripttempl/elf.sc | 11 +---------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index f9c10719f73..096d1fefc70 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,8 @@ +2001-07-03 H.J. Lu + + * scripttempl/elf.sc (DYNAMIC_PAD): Revert the change made on + 2001-07-03. It creates dynamic entries even for static binaries. + 2001-07-03 Jakub Jelinek * scripttempl/elf.sc (DYNAMIC_PAD): New variable. diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc index e32348c0a9e..3c1bfb40c19 100644 --- a/ld/scripttempl/elf.sc +++ b/ld/scripttempl/elf.sc @@ -32,8 +32,6 @@ # combination of .init sections. # FINI_START, FINI_END - statements just before and just after # combination of .fini sections. -# DYNAMIC_PAD - script to insert pad at end of .dynamic section. -# Setting this to " " will result in no .dynamic padding. # # When adding sections, do note that the names of some sections are used # when specifying the start address of the next. @@ -68,14 +66,7 @@ test -z "${ALIGNMENT}" && ALIGNMENT="${ELFSIZE} / 8" test "$LD_FLAG" = "N" && DATA_ADDR=. INTERP=".interp ${RELOCATING-0} : { *(.interp) }" PLT=".plt ${RELOCATING-0} : { *(.plt) }" -test -z "$DYNAMIC_PAD" && test -n "$RELOCATING" && DYNAMIC_PAD=" - /* Leave some space in .dynamic section, so that - post-linking utilities can add new dynamic tags. */ - FILL(0) . += 6 * ${ELFSIZE} / 4;" -DYNAMIC=".dynamic ${RELOCATING-0} : - { - *(.dynamic) $DYNAMIC_PAD - }" +DYNAMIC=".dynamic ${RELOCATING-0} : { *(.dynamic) }" RODATA=".rodata ${RELOCATING-0} : { *(.rodata) ${RELOCATING+*(.rodata.*)} ${RELOCATING+*(.gnu.linkonce.r.*)} }" SBSS2=".sbss2 ${RELOCATING-0} : { *(.sbss2) ${RELOCATING+*(.sbss2.*)} ${RELOCATING+*(.gnu.linkonce.sb2.*)} }" SDATA2=".sdata2 ${RELOCATING-0} : { *(.sdata2) ${RELOCATING+*(.sdata2.*)} ${RELOCATING+*(.gnu.linkonce.s2.*)} }" -- 2.30.2