From 2d3e7489984bf52a44b3e66eb5d484c3d2cba6ee Mon Sep 17 00:00:00 2001
From: guenther <guenther@openbsd.org>
Date: Sat, 9 Aug 2014 04:49:47 +0000
Subject: [PATCH] We don't use the __openbsd_randomdata_{start,end} symbols,
 but rather get that info via the PT_OPENBSD_RANDOM segment info, so kill the
 symbols While here, delete the commented out lines for __DYNAMIC as the
 question they ask is answered 'no'

ok matthew@ back in May
---
 gnu/usr.bin/binutils-2.17/ld/scripttempl/elf.sc | 6 ------
 gnu/usr.bin/binutils/ld/scripttempl/elf.sc      | 4 ----
 2 files changed, 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} :
   {
-- 
2.20.1