diff options
-rw-r--r-- | gnu/usr.bin/binutils-2.17/ld/scripttempl/elf.sc | 6 | ||||
-rw-r--r-- | gnu/usr.bin/binutils/ld/scripttempl/elf.sc | 4 |
2 files changed, 0 insertions, 10 deletions
diff --git a/gnu/usr.bin/binutils-2.17/ld/scripttempl/elf.sc b/gnu/usr.bin/binutils-2.17/ld/scripttempl/elf.sc index b2f0686ba63..d036c6318f0 100644 --- a/gnu/usr.bin/binutils-2.17/ld/scripttempl/elf.sc +++ b/gnu/usr.bin/binutils-2.17/ld/scripttempl/elf.sc @@ -408,16 +408,10 @@ cat <<EOF KEEP (*(SORT(.fini_array.*))) ${RELOCATING+${CREATE_SHLIB-PROVIDE_HIDDEN (__fini_array_end = .);}} } - /* If the randomdata_{start,end} symbols are inside the block then ld - always reserves a program header slot for a PT_OPENBSD_RANDOMIZE entry, - which for /boot shifts the address biosboot has to use even though - the slot isn't actually used */ - ${RELOCATING+${CREATE_SHLIB-PROVIDE_HIDDEN (__openbsd_randomdata_start = .);}} .openbsd.randomdata ${RELOCATING-0} : { *(.openbsd.randomdata${RELOCATING+ .openbsd.randomdata.*}) } - ${RELOCATING+${CREATE_SHLIB-PROVIDE_HIDDEN (__openbsd_randomdata_end = .);}} ${PAD_CDTOR-${SMALL_DATA_CTOR-${RELOCATING+${CTOR}}}} ${PAD_CDTOR-${SMALL_DATA_DTOR-${RELOCATING+${DTOR}}}} .jcr ${RELOCATING-0} : { KEEP (*(.jcr)) } diff --git a/gnu/usr.bin/binutils/ld/scripttempl/elf.sc b/gnu/usr.bin/binutils/ld/scripttempl/elf.sc index 031bab72c04..0d046674258 100644 --- a/gnu/usr.bin/binutils/ld/scripttempl/elf.sc +++ b/gnu/usr.bin/binutils/ld/scripttempl/elf.sc @@ -181,8 +181,6 @@ OUTPUT_ARCH(${OUTPUT_ARCH}) ENTRY(${ENTRY}) ${RELOCATING+${LIB_SEARCH_DIRS}} -${RELOCATING+/* Do we need any of these for elf? - __DYNAMIC = 0; ${STACKZERO+${STACKZERO}} ${SHLIB_PATH+${SHLIB_PATH}} */} ${RELOCATING+${EXECUTABLE_SYMBOLS}} ${RELOCATING+${INPUT_FILES}} ${RELOCATING- /* For some reason, the Solaris linker makes bad executables @@ -319,12 +317,10 @@ cat <<EOF .fini_array ${RELOCATING-0} : { *(.fini_array) } ${RELOCATING+${CREATE_SHLIB-PROVIDE (__fini_array_end = .);}} - ${RELOCATING+${CREATE_SHLIB-PROVIDE (__openbsd_randomdata_start = .);}} .openbsd.randomdata ${RELOCATING-0} : { *(.openbsd.randomdata${RELOCATING+ .openbsd.randomdata.*}) } - ${RELOCATING+${CREATE_SHLIB-PROVIDE (__openbsd_randomdata_end = .);}} .data ${RELOCATING-0} : { |