diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2004-05-25 20:41:55 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2004-05-25 20:41:55 +0000 |
| commit | 96e577cbbba94b53c4e78078d48ac90b9049af68 (patch) | |
| tree | b5f3847abbf3d41de091c26dd225fc2353e9d4f6 /gnu/usr.bin/binutils | |
| parent | eb758dbe9b0619b1f556461cbd8b19625970954a (diff) | |
provide a way data plt prepending got; drahn@ ok
Diffstat (limited to 'gnu/usr.bin/binutils')
| -rw-r--r-- | gnu/usr.bin/binutils/ld/emulparams/hppaobsd.sh | 2 | ||||
| -rw-r--r-- | gnu/usr.bin/binutils/ld/scripttempl/elf.sc | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/gnu/usr.bin/binutils/ld/emulparams/hppaobsd.sh b/gnu/usr.bin/binutils/ld/emulparams/hppaobsd.sh index 0bb50770ea9..c7f33d8b1df 100644 --- a/gnu/usr.bin/binutils/ld/emulparams/hppaobsd.sh +++ b/gnu/usr.bin/binutils/ld/emulparams/hppaobsd.sh @@ -11,7 +11,7 @@ ENTRY="__start" MACHINE=hppa1.1 # We use 1.1 specific features. OTHER_READONLY_SECTIONS=".PARISC.unwind ${RELOCATING-0} : { *(.PARISC.unwind) }" DATA_START_SYMBOLS='PROVIDE ($global$ = .);' -DATA_PLT= +DATA_NONEXEC_PLT= GENERATE_SHLIB_SCRIPT=yes . ${srcdir}/emulparams/elf_obsd.sh diff --git a/gnu/usr.bin/binutils/ld/scripttempl/elf.sc b/gnu/usr.bin/binutils/ld/scripttempl/elf.sc index f68adcaaaf4..fb4b168e350 100644 --- a/gnu/usr.bin/binutils/ld/scripttempl/elf.sc +++ b/gnu/usr.bin/binutils/ld/scripttempl/elf.sc @@ -264,7 +264,7 @@ cat <<EOF ${RELOCATING+${INIT_END}} } =${NOP-0} - ${DATA_PLT-${BSS_PLT-${PLT}}} + ${DATA_PLT-${DATA_NONEXEC_PLT-${BSS_PLT-${PLT}}}} .text ${RELOCATING-0} : { ${RELOCATING+${TEXT_START_SYMBOLS}} @@ -333,6 +333,7 @@ cat <<EOF ${DATA_PLT+${PLT}} ${DATA_PLT+${PAD_PLT+${PAD_PLT1}}} ${PAD_GOT+${PAD_GOT0}} + ${DATA_NONEXEC_PLT+${PLT}} ${RELOCATING+${OTHER_GOT_SYMBOLS}} .got ${RELOCATING-0} : { *(.got.plt) *(.got) } /* CTOR and DTOR relocated here to receive mprotect protection after, |