aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ld/ChangeLog5
-rw-r--r--ld/scripttempl/elf.sc11
2 files changed, 6 insertions, 10 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog
index f9c1071..096d1fe 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-03 H.J. Lu <hjl@gnu.org>
+
+ * 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 <jakub@redhat.com>
* scripttempl/elf.sc (DYNAMIC_PAD): New variable.
diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc
index e32348c..3c1bfb4 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.*)} }"