diff options
| -rw-r--r-- | ld/ChangeLog | 7 | ||||
| -rw-r--r-- | ld/scripttempl/elf.sc | 12 |
2 files changed, 10 insertions, 9 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 646ab625551..5da509783a6 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,10 @@ +2005-05-10 Alan Modra <amodra@bigpond.net.au> + + * scripttempl/elf.sc (DATA_SEGMENT_RELRO_GOTPLT_END): Delete. + (DATA_SEGMENT_RELRO_END): Use SEPARATE_GOTPLT value. + (GOTPLT): Remove DATA_SEGMENT_RELRO_GOTPLT_END. Place after + DATA_SEGMENT_RELRO_END in script. + 2005-05-09 H.J. Lu <hongjiu.lu@intel.com> * emultempl/elf32.em (gld${EMULATION_NAME}_provide_bound_symbols): diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc index df79e7c43fe..c2a2dcf6635 100644 --- a/ld/scripttempl/elf.sc +++ b/ld/scripttempl/elf.sc @@ -94,16 +94,11 @@ test -z "$CREATE_SHLIB$CREATE_PIE" && test -n "$DATA_ADDR" && COMMONPAGESIZE="" test -n "$RELRO_NOW" && unset SEPARATE_GOTPLT DATA_SEGMENT_ALIGN="ALIGN(${SEGMENT_SIZE}) + (. & (${MAXPAGESIZE} - 1))" DATA_SEGMENT_RELRO_END="" -DATA_SEGMENT_RELRO_GOTPLT_END="" DATA_SEGMENT_END="" if test -n "${COMMONPAGESIZE}"; then DATA_SEGMENT_ALIGN="ALIGN (${SEGMENT_SIZE}) - ((${MAXPAGESIZE} - .) & (${MAXPAGESIZE} - 1)); . = DATA_SEGMENT_ALIGN (${MAXPAGESIZE}, ${COMMONPAGESIZE})" DATA_SEGMENT_END=". = DATA_SEGMENT_END (.);" - if test -n "${SEPARATE_GOTPLT}"; then - DATA_SEGMENT_RELRO_GOTPLT_END=". = DATA_SEGMENT_RELRO_END (${SEPARATE_GOTPLT}, .);" - else - DATA_SEGMENT_RELRO_END=". = DATA_SEGMENT_RELRO_END (0, .);" - fi + DATA_SEGMENT_RELRO_END=". = DATA_SEGMENT_RELRO_END (${SEPARATE_GOTPLT-0}, .);" fi INTERP=".interp ${RELOCATING-0} : { *(.interp) }" PLT=".plt ${RELOCATING-0} : { *(.plt) }" @@ -112,8 +107,7 @@ if test -z "$GOT"; then GOT=".got ${RELOCATING-0} : { *(.got.plt) *(.got) }" else GOT=".got ${RELOCATING-0} : { *(.got) }" - GOTPLT="${RELOCATING+${DATA_SEGMENT_RELRO_GOTPLT_END}} - .got.plt ${RELOCATING-0} : { *(.got.plt) }" + GOTPLT=".got.plt ${RELOCATING-0} : { *(.got.plt) }" fi fi DYNAMIC=".dynamic ${RELOCATING-0} : { *(.dynamic) }" @@ -351,8 +345,8 @@ cat <<EOF ${TEXT_DYNAMIC-${DYNAMIC}} ${NO_SMALL_DATA+${RELRO_NOW+${GOT}}} ${NO_SMALL_DATA+${RELRO_NOW-${SEPARATE_GOTPLT+${GOT}}}} - ${NO_SMALL_DATA+${RELRO_NOW-${SEPARATE_GOTPLT+${GOTPLT}}}} ${RELOCATING+${DATA_SEGMENT_RELRO_END}} + ${NO_SMALL_DATA+${RELRO_NOW-${SEPARATE_GOTPLT+${GOTPLT}}}} ${NO_SMALL_DATA+${RELRO_NOW-${SEPARATE_GOTPLT-${GOT}}}} ${DATA_PLT+${PLT_BEFORE_GOT-${PLT}}} |