PR 4515

	* genscripts.sh: Delete all references to NONPAGED_TEXT_START_ADDR.
	* ldint.texinfo: Likewise.
	* emulparams/armaoutb.sh (NONPAGED_TEXT_START_ADDRESS): Delete.
	* emulparams/armaoutl.sh: Likewise.
	* emulparams/arcelf.sh (NONPAGED_TEXT_START_ADDR): Delete.
	* emulparams/bfin.sh: Likewise
	* emulparams/crisaout.sh: Likewise
	* emulparams/elf32_sparc.sh: Likewise
	* emulparams/elf32am33lin.sh: Likewise
	* emulparams/elf32b4300.sh: Likewise
	* emulparams/elf32bmip.sh: Likewise
	* emulparams/elf32mcore.sh: Likewise
	* emulparams/elf32xtensa.sh: Likewise
	* emulparams/elf64_s390.sh: Likewise
	* emulparams/elf64_sparc.sh: Likewise
	* emulparams/elf64alpha.sh: Likewise
	* emulparams/elf_i386.sh: Likewise
	* emulparams/elf_i386_be.sh: Likewise
	* emulparams/elf_i386_chaos.sh: Likewise
	* emulparams/elf_i386_ldso.sh: Likewise
	* emulparams/elf_i386_vxworks.sh: Likewise
	* emulparams/elf_s390.sh: Likewise
	* emulparams/elf_x86_64.sh: Likewise
	* emulparams/i386aout.sh: Likewise
	* emulparams/i386moss.sh: Likewise
	* emulparams/i386msdos.sh: Likewise
	* emulparams/i386nto.sh: Likewise
	* emulparams/i386nw.sh: Likewise
	* emulparams/m68kaout.sh: Likewise
	* emulparams/m68kelf.sh: Likewise
	* emulparams/ppcnw.sh: Likewise
	* emulparams/sun4.sh: Likewise
	* emulparams/tic80coff.sh: Likewise
	* emulparams/vaxnbsd.sh: Likewise
	* emulparams/armnbsd.sh (NONPAGED_TEXT_START_ADDR): Delete.
	(TEXT_START_ADDR): Set for -n, -N.
	* emulparams/coff_sparc.sh: Likewise
	* emulparams/elf32vax.sh: Likewise
	* emulparams/i386bsd.sh: Likewise
	* emulparams/i386go32.sh: Likewise
	* emulparams/i386linux.sh: Likewise
	* emulparams/i386lynx.sh: Likewise
	* emulparams/i386mach.sh: Likewise
	* emulparams/m68k4knbsd.sh: Likewise
	* emulparams/m68klinux.sh: Likewise
	* emulparams/m68knbsd.sh: Likewise
	* emulparams/ns32knbsd.sh: Likewise
	* emulparams/pc532macha.sh: Likewise
	* emulparams/ppclynx.sh: Likewise
	* emulparams/scoreelf.sh: Likewise
	* emulparams/sparcaout.sh: Likewise
	* emulparams/sparclinux.sh: Likewise
	* emulparams/sun3.sh: Likewise
	* emulparams/vsta.sh: Likewise

54 files changed, 119 insertions, 69 deletions

diff --git a/ld/ChangeLog b/ld/ChangeLog
index be87b5572a2..11de68ad1ef 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,4 +1,62 @@
-2007-08-07	Ralf Corsépius <ralf.corsepius@rtems.org>
+2007-08-09  Alan Modra  <amodra@bigpond.net.au>
+
+	PR 4515
+	* genscripts.sh: Delete all references to NONPAGED_TEXT_START_ADDR.
+	* ldint.texinfo: Likewise.
+	* emulparams/armaoutb.sh (NONPAGED_TEXT_START_ADDRESS): Delete.
+	* emulparams/armaoutl.sh: Likewise.
+	* emulparams/arcelf.sh (NONPAGED_TEXT_START_ADDR): Delete.
+	* emulparams/bfin.sh: Likewise
+	* emulparams/crisaout.sh: Likewise
+	* emulparams/elf32_sparc.sh: Likewise
+	* emulparams/elf32am33lin.sh: Likewise
+	* emulparams/elf32b4300.sh: Likewise
+	* emulparams/elf32bmip.sh: Likewise
+	* emulparams/elf32mcore.sh: Likewise
+	* emulparams/elf32xtensa.sh: Likewise
+	* emulparams/elf64_s390.sh: Likewise
+	* emulparams/elf64_sparc.sh: Likewise
+	* emulparams/elf64alpha.sh: Likewise
+	* emulparams/elf_i386.sh: Likewise
+	* emulparams/elf_i386_be.sh: Likewise
+	* emulparams/elf_i386_chaos.sh: Likewise
+	* emulparams/elf_i386_ldso.sh: Likewise
+	* emulparams/elf_i386_vxworks.sh: Likewise
+	* emulparams/elf_s390.sh: Likewise
+	* emulparams/elf_x86_64.sh: Likewise
+	* emulparams/i386aout.sh: Likewise
+	* emulparams/i386moss.sh: Likewise
+	* emulparams/i386msdos.sh: Likewise
+	* emulparams/i386nto.sh: Likewise
+	* emulparams/i386nw.sh: Likewise
+	* emulparams/m68kaout.sh: Likewise
+	* emulparams/m68kelf.sh: Likewise
+	* emulparams/ppcnw.sh: Likewise
+	* emulparams/sun4.sh: Likewise
+	* emulparams/tic80coff.sh: Likewise
+	* emulparams/vaxnbsd.sh: Likewise
+	* emulparams/armnbsd.sh (NONPAGED_TEXT_START_ADDR): Delete.
+	(TEXT_START_ADDR): Set for -n, -N.
+	* emulparams/coff_sparc.sh: Likewise
+	* emulparams/elf32vax.sh: Likewise
+	* emulparams/i386bsd.sh: Likewise
+	* emulparams/i386go32.sh: Likewise
+	* emulparams/i386linux.sh: Likewise
+	* emulparams/i386lynx.sh: Likewise
+	* emulparams/i386mach.sh: Likewise
+	* emulparams/m68k4knbsd.sh: Likewise
+	* emulparams/m68klinux.sh: Likewise
+	* emulparams/m68knbsd.sh: Likewise
+	* emulparams/ns32knbsd.sh: Likewise
+	* emulparams/pc532macha.sh: Likewise
+	* emulparams/ppclynx.sh: Likewise
+	* emulparams/scoreelf.sh: Likewise
+	* emulparams/sparcaout.sh: Likewise
+	* emulparams/sparclinux.sh: Likewise
+	* emulparams/sun3.sh: Likewise
+	* emulparams/vsta.sh: Likewise
+
+2007-08-07  Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* configure.tgt: Add bfin-*rtems*.
 
diff --git a/ld/emulparams/arcelf.sh b/ld/emulparams/arcelf.sh
index 6c524c9a762..31db4a9be11 100644
--- a/ld/emulparams/arcelf.sh
+++ b/ld/emulparams/arcelf.sh
@@ -6,7 +6,6 @@ LITTLE_OUTPUT_FORMAT="elf32-littlearc"
 BIG_OUTPUT_FORMAT="elf32-bigarc"
 TEXT_START_ADDR=0x0
 MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
-NONPAGED_TEXT_START_ADDR=0x0
 ARCH=arc
 MACHINE=
 ENTRY=start
diff --git a/ld/emulparams/armaoutb.sh b/ld/emulparams/armaoutb.sh
index 59ab6f14f60..efef2c327d9 100644
--- a/ld/emulparams/armaoutb.sh
+++ b/ld/emulparams/armaoutb.sh
@@ -2,6 +2,5 @@ SCRIPT_NAME=armaout
 OUTPUT_FORMAT="a.out-arm-big"
 HEADER_START_ADDR=0x8000
 TEXT_START_ADDR=0x8000
-NONPAGED_TEXT_START_ADDRESS=0x8000
 TARGET_PAGE_SIZE=32768
 ARCH=arm
diff --git a/ld/emulparams/armaoutl.sh b/ld/emulparams/armaoutl.sh
index 9501f33ec2a..5eccc4c1b8f 100644
--- a/ld/emulparams/armaoutl.sh
+++ b/ld/emulparams/armaoutl.sh
@@ -2,6 +2,5 @@ SCRIPT_NAME=armaout
 OUTPUT_FORMAT="a.out-arm-little"
 HEADER_START_ADDR=0x8000
 TEXT_START_ADDR=0x8000
-NONPAGED_TEXT_START_ADDRESS=0x8000
 TARGET_PAGE_SIZE=32768
 ARCH=arm
diff --git a/ld/emulparams/armnbsd.sh b/ld/emulparams/armnbsd.sh
index fc2779164a0..dd4768daace 100644
--- a/ld/emulparams/armnbsd.sh
+++ b/ld/emulparams/armnbsd.sh
@@ -1,7 +1,9 @@
 SCRIPT_NAME=aout
 TEXT_START_ADDR=0x1020
+case ${LD_FLAG} in
+    n|N)	TEXT_START_ADDR=0x1000 ;;
+esac
 OUTPUT_FORMAT="a.out-arm-netbsd"
 TARGET_PAGE_SIZE=0x1000
 ARCH=arm
 EXECUTABLE_SYMBOLS='__DYNAMIC = 0;'
-NONPAGED_TEXT_START_ADDR=0x1000
diff --git a/ld/emulparams/bfin.sh b/ld/emulparams/bfin.sh
index 73e2b946a5a..1c764e8f9af 100755
--- a/ld/emulparams/bfin.sh
+++ b/ld/emulparams/bfin.sh
@@ -3,7 +3,6 @@ OUTPUT_FORMAT="elf32-bfin"
 TEXT_START_ADDR=0x0
 MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
 TARGET_PAGE_SIZE=0x1000
-NONPAGED_TEXT_START_ADDR=${TEXT_START_ADDR}
 ARCH=bfin
 MACHINE=
 ENTRY=__start
diff --git a/ld/emulparams/coff_sparc.sh b/ld/emulparams/coff_sparc.sh
index 0cf852a7b21..d66cf616415 100644
--- a/ld/emulparams/coff_sparc.sh
+++ b/ld/emulparams/coff_sparc.sh
@@ -3,5 +3,7 @@ OUTPUT_FORMAT="coff-sparc"
 # following are dubious (borrowed from sparc lynx)
 TARGET_PAGE_SIZE=0x1000
 TEXT_START_ADDR=0
-NONPAGED_TEXT_START_ADDR=0x1000
+case ${LD_FLAG} in
+    n|N)	TEXT_START_ADDR=0x1000 ;;
+esac
 ARCH=sparc
diff --git a/ld/emulparams/crisaout.sh b/ld/emulparams/crisaout.sh
index bb9135aa81b..625e90fd5ef 100644
--- a/ld/emulparams/crisaout.sh
+++ b/ld/emulparams/crisaout.sh
@@ -3,5 +3,4 @@ SCRIPT_NAME=crisaout
 OUTPUT_FORMAT="a.out-cris"
 TARGET_PAGE_SIZE=2
 TEXT_START_ADDR=0
-NONPAGED_TEXT_START_ADDR=0
 ARCH=cris
diff --git a/ld/emulparams/elf32_sparc.sh b/ld/emulparams/elf32_sparc.sh
index d09d9dc7edb..3db6d8838d1 100644
--- a/ld/emulparams/elf32_sparc.sh
+++ b/ld/emulparams/elf32_sparc.sh
@@ -6,7 +6,6 @@ OUTPUT_FORMAT="elf32-sparc"
 TEXT_START_ADDR=0x10000
 MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
 COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)"
-NONPAGED_TEXT_START_ADDR=0x10000
 ALIGNMENT=8
 ARCH=sparc
 MACHINE=
diff --git a/ld/emulparams/elf32am33lin.sh b/ld/emulparams/elf32am33lin.sh
index 31dbc70b882..2f8b9624aa5 100644
--- a/ld/emulparams/elf32am33lin.sh
+++ b/ld/emulparams/elf32am33lin.sh
@@ -2,7 +2,6 @@ SCRIPT_NAME=elf
 OUTPUT_FORMAT="elf32-am33lin"
 TEXT_START_ADDR=0x8000000
 MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
-NONPAGED_TEXT_START_ADDR=0x8000000
 ARCH=mn10300
 MACHINE=
 NOP=0xcbcb
diff --git a/ld/emulparams/elf32b4300.sh b/ld/emulparams/elf32b4300.sh
index d3e43547dd3..52fa2950a75 100644
--- a/ld/emulparams/elf32b4300.sh
+++ b/ld/emulparams/elf32b4300.sh
@@ -4,7 +4,6 @@
 EMBEDDED=yes
 . ${srcdir}/emulparams/elf32bmip.sh
 TEXT_START_ADDR=0xa0020000
-unset NONPAGED_TEXT_START_ADDR
 unset SHLIB_TEXT_START_ADDR
 EXECUTABLE_SYMBOLS='_DYNAMIC_LINK = 0;'
 DYNAMIC_LINK=FALSE
diff --git a/ld/emulparams/elf32bmip.sh b/ld/emulparams/elf32bmip.sh
index ce33674cf93..bcb85090012 100644
--- a/ld/emulparams/elf32bmip.sh
+++ b/ld/emulparams/elf32bmip.sh
@@ -10,7 +10,6 @@ TEXT_START_ADDR=0x0400000
 test -n "${EMBEDDED}" || DATA_ADDR=0x10000000
 MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
 COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)"
-NONPAGED_TEXT_START_ADDR=0x0400000
 SHLIB_TEXT_START_ADDR=0x5ffe0000
 TEXT_DYNAMIC=
 INITIAL_READONLY_SECTIONS=
diff --git a/ld/emulparams/elf32mcore.sh b/ld/emulparams/elf32mcore.sh
index 6d9f2d6a992..31d65dc8838 100644
--- a/ld/emulparams/elf32mcore.sh
+++ b/ld/emulparams/elf32mcore.sh
@@ -6,7 +6,6 @@ PAGE_SIZE=0x1000
 TARGET_PAGE_SIZE=0x400
 MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
 TEXT_START_ADDR=0
-NONPAGED_TEXT_START_ADDR=0
 ARCH=mcore
 EMBEDDED=yes
 
diff --git a/ld/emulparams/elf32vax.sh b/ld/emulparams/elf32vax.sh
index 42e846f22e2..4c6ef397173 100644
--- a/ld/emulparams/elf32vax.sh
+++ b/ld/emulparams/elf32vax.sh
@@ -1,8 +1,10 @@
 SCRIPT_NAME=elf
 OUTPUT_FORMAT="elf32-vax"
 TEXT_START_ADDR=0x10000
+case ${LD_FLAG} in
+    n|N)	TEXT_START_ADDR=0x1000 ;;
+esac
 MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
-NONPAGED_TEXT_START_ADDR=0x1000
 ARCH=vax
 MACHINE=
 NOP=0x0101
diff --git a/ld/emulparams/elf32xtensa.sh b/ld/emulparams/elf32xtensa.sh
index 185da49dfbb..c5c522ad9f2 100644
--- a/ld/emulparams/elf32xtensa.sh
+++ b/ld/emulparams/elf32xtensa.sh
@@ -5,7 +5,6 @@ OUTPUT_FORMAT=undefined
 BIG_OUTPUT_FORMAT="elf32-xtensa-be"
 LITTLE_OUTPUT_FORMAT="elf32-xtensa-le"
 TEXT_START_ADDR=0x400000
-NONPAGED_TEXT_START_ADDR=0x400000
 MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
 ARCH=xtensa
 MACHINE=
diff --git a/ld/emulparams/elf64_s390.sh b/ld/emulparams/elf64_s390.sh
index a26bbb63e0d..ede836ccf2c 100644
--- a/ld/emulparams/elf64_s390.sh
+++ b/ld/emulparams/elf64_s390.sh
@@ -4,7 +4,6 @@ OUTPUT_FORMAT="elf64-s390"
 TEXT_START_ADDR=0x80000000
 MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
 COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)"
-NONPAGED_TEXT_START_ADDR=0x80000000
 ARCH="s390:64-bit"
 MACHINE=
 NOP=0x07070707
diff --git a/ld/emulparams/elf64_sparc.sh b/ld/emulparams/elf64_sparc.sh
index cef4bff96e1..03cab9efd32 100644
--- a/ld/emulparams/elf64_sparc.sh
+++ b/ld/emulparams/elf64_sparc.sh
@@ -15,11 +15,9 @@ NO_SMALL_DATA=yes
 case "$target" in
   sparc*-solaris*)
     TEXT_START_ADDR=0x100000000
-    NONPAGED_TEXT_START_ADDR=0x100000000
     ;;
   *)
     TEXT_START_ADDR=0x100000
-    NONPAGED_TEXT_START_ADDR=0x100000
     ;;
 esac
 
diff --git a/ld/emulparams/elf64alpha.sh b/ld/emulparams/elf64alpha.sh
index 2c3b7d4dd2b..a42e75d0358 100644
--- a/ld/emulparams/elf64alpha.sh
+++ b/ld/emulparams/elf64alpha.sh
@@ -7,7 +7,6 @@ OUTPUT_FORMAT="elf64-alpha"
 TEXT_START_ADDR="0x120000000"
 MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
 COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)"
-NONPAGED_TEXT_START_ADDR="0x120000000"
 ARCH=alpha
 MACHINE=
 GENERATE_SHLIB_SCRIPT=yes
diff --git a/ld/emulparams/elf_i386.sh b/ld/emulparams/elf_i386.sh
index bdeaebb3084..908515a7adb 100644
--- a/ld/emulparams/elf_i386.sh
+++ b/ld/emulparams/elf_i386.sh
@@ -3,7 +3,6 @@ OUTPUT_FORMAT="elf32-i386"
 TEXT_START_ADDR=0x08048000
 MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
 COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)"
-NONPAGED_TEXT_START_ADDR=0x08048000
 ARCH=i386
 MACHINE=
 NOP=0x90909090
diff --git a/ld/emulparams/elf_i386_be.sh b/ld/emulparams/elf_i386_be.sh
index 460707fc484..b61738c4a0c 100644
--- a/ld/emulparams/elf_i386_be.sh
+++ b/ld/emulparams/elf_i386_be.sh
@@ -1,8 +1,6 @@
 SCRIPT_NAME=elf
 OUTPUT_FORMAT="elf32-i386"
 TEXT_START_ADDR=0x80000000
-#SHLIB_TEXT_START_ADDR=0x80000000
-NONPAGED_TEXT_START_ADDR=0x80000000
 MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
 ARCH=i386
 MACHINE=
diff --git a/ld/emulparams/elf_i386_chaos.sh b/ld/emulparams/elf_i386_chaos.sh
index a652913f86e..1322174a165 100644
--- a/ld/emulparams/elf_i386_chaos.sh
+++ b/ld/emulparams/elf_i386_chaos.sh
@@ -2,7 +2,6 @@ SCRIPT_NAME=elf_chaos
 OUTPUT_FORMAT="elf32-i386"
 TEXT_START_ADDR=0x40000000
 MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
-NONPAGED_TEXT_START_ADDR=0x40000000
 ARCH=i386
 MACHINE=
 NOP=0x90909090
diff --git a/ld/emulparams/elf_i386_ldso.sh b/ld/emulparams/elf_i386_ldso.sh
index d62184fc9c2..b4ac9603a4f 100644
--- a/ld/emulparams/elf_i386_ldso.sh
+++ b/ld/emulparams/elf_i386_ldso.sh
@@ -2,7 +2,6 @@ SCRIPT_NAME=elf
 OUTPUT_FORMAT="elf32-i386"
 TEXT_START_ADDR=0x08048000
 MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
-NONPAGED_TEXT_START_ADDR=0x08048000
 ARCH=i386
 MACHINE=
 NOP=0x90909090
diff --git a/ld/emulparams/elf_i386_vxworks.sh b/ld/emulparams/elf_i386_vxworks.sh
index cb36283da4f..90a98b3dcf3 100644
--- a/ld/emulparams/elf_i386_vxworks.sh
+++ b/ld/emulparams/elf_i386_vxworks.sh
@@ -3,7 +3,6 @@ OUTPUT_FORMAT="elf32-i386-vxworks"
 TEXT_START_ADDR=0x08048000
 MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
 COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)"
-NONPAGED_TEXT_START_ADDR=0x08048000
 ARCH=i386
 MACHINE=
 NOP=0x90909090
diff --git a/ld/emulparams/elf_s390.sh b/ld/emulparams/elf_s390.sh
index d958504a834..e252e8e09f6 100644
--- a/ld/emulparams/elf_s390.sh
+++ b/ld/emulparams/elf_s390.sh
@@ -3,7 +3,6 @@ OUTPUT_FORMAT="elf32-s390"
 TEXT_START_ADDR=0x00400000
 MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
 COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)"
-NONPAGED_TEXT_START_ADDR=0x00400000
 ARCH="s390:31-bit"
 MACHINE=
 NOP=0x07070707
diff --git a/ld/emulparams/elf_x86_64.sh b/ld/emulparams/elf_x86_64.sh
index 449ccc90bd8..cdd41195ca7 100644
--- a/ld/emulparams/elf_x86_64.sh
+++ b/ld/emulparams/elf_x86_64.sh
@@ -4,7 +4,6 @@ OUTPUT_FORMAT="elf64-x86-64"
 TEXT_START_ADDR=0x400000
 MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
 COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)"
-NONPAGED_TEXT_START_ADDR=0x400000
 ARCH="i386:x86-64"
 MACHINE=
 NOP=0x90909090
diff --git a/ld/emulparams/i386aout.sh b/ld/emulparams/i386aout.sh
index dc9e5546145..d682e7cba87 100644
--- a/ld/emulparams/i386aout.sh
+++ b/ld/emulparams/i386aout.sh
@@ -2,5 +2,7 @@ SCRIPT_NAME=aout
 OUTPUT_FORMAT="a.out-i386"
 TARGET_PAGE_SIZE=0x1000
 TEXT_START_ADDR=0
-NONPAGED_TEXT_START_ADDR=0x1000
+case ${LD_FLAG} in
+    n|N)	TEXT_START_ADDR=0x1000 ;;
+esac
 ARCH=i386
diff --git a/ld/emulparams/i386bsd.sh b/ld/emulparams/i386bsd.sh
index e0c0e2fab6c..23ab852a4d7 100644
--- a/ld/emulparams/i386bsd.sh
+++ b/ld/emulparams/i386bsd.sh
@@ -2,5 +2,7 @@ SCRIPT_NAME=aout
 OUTPUT_FORMAT="a.out-i386-bsd"
 TARGET_PAGE_SIZE=0x1000
 TEXT_START_ADDR=0
-NONPAGED_TEXT_START_ADDR=0x1000
+case ${LD_FLAG} in
+    n|N)	TEXT_START_ADDR=0x1000 ;;
+esac
 ARCH=i386
diff --git a/ld/emulparams/i386go32.sh b/ld/emulparams/i386go32.sh
index 0ef16c4d37c..104209fcec7 100644
--- a/ld/emulparams/i386go32.sh
+++ b/ld/emulparams/i386go32.sh
@@ -2,7 +2,9 @@ SCRIPT_NAME=i386go32
 OUTPUT_FORMAT="coff-go32"
 TEXT_START_ADDR=0x10a8
 TARGET_PAGE_SIZE=0x1000
+case ${LD_FLAG} in
+    n|N)	TEXT_START_ADDR=0 ;;
+esac
 SEGMENT_SIZE=0x200
-NONPAGED_TEXT_START_ADDR=0x0
 ARCH=i386
 
diff --git a/ld/emulparams/i386linux.sh b/ld/emulparams/i386linux.sh
index a416422d92f..7b7463a1128 100644
--- a/ld/emulparams/i386linux.sh
+++ b/ld/emulparams/i386linux.sh
@@ -2,6 +2,8 @@ SCRIPT_NAME=aout
 OUTPUT_FORMAT="a.out-i386-linux"
 TARGET_PAGE_SIZE=0x1000
 TEXT_START_ADDR=0x1020
-NONPAGED_TEXT_START_ADDR=0
+case ${LD_FLAG} in
+    n|N)	TEXT_START_ADDR=0 ;;
+esac
 ARCH=i386
 TEMPLATE_NAME=linux
diff --git a/ld/emulparams/i386lynx.sh b/ld/emulparams/i386lynx.sh
index 18e0860c0f5..6d9d9fe11d6 100644
--- a/ld/emulparams/i386lynx.sh
+++ b/ld/emulparams/i386lynx.sh
@@ -4,8 +4,10 @@ ENTRY=_main
 TEXT_BASE=0x0
 DYN_TEXT_BASE=0x00400000
 TEXT_START_ADDR="(DEFINED(_DYNAMIC) ? ${DYN_TEXT_BASE} : ${TEXT_BASE})"
+case ${LD_FLAG} in
+    n|N)	TEXT_START_ADDR=0x1000 ;;
+esac
 MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
-NONPAGED_TEXT_START_ADDR=0x1000
 ARCH=i386
 MACHINE=
 NOP=0x9090
diff --git a/ld/emulparams/i386mach.sh b/ld/emulparams/i386mach.sh
index b7cb2764f59..dc446021e2c 100644
--- a/ld/emulparams/i386mach.sh
+++ b/ld/emulparams/i386mach.sh
@@ -1,7 +1,9 @@
 SCRIPT_NAME=aout
 OUTPUT_FORMAT="a.out-mach3"
 TEXT_START_ADDR=0x10020
-NONPAGED_TEXT_START_ADDR=0x10000
+case ${LD_FLAG} in
+    n|N)	TEXT_START_ADDR=0x10000 ;;
+esac
 SEGMENT_SIZE=0x1000
 PAD_TEXT=t
 ARCH=i386
diff --git a/ld/emulparams/i386moss.sh b/ld/emulparams/i386moss.sh
index 659c7f2c9d5..81161b7b5ae 100644
--- a/ld/emulparams/i386moss.sh
+++ b/ld/emulparams/i386moss.sh
@@ -2,7 +2,6 @@ SCRIPT_NAME=elf
 OUTPUT_FORMAT="elf32-i386"
 TEXT_START_ADDR=0x00002000
 MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
-NONPAGED_TEXT_START_ADDR=0x00002000
 ARCH=i386
 MACHINE=
 NOP=0x90909090
diff --git a/ld/emulparams/i386msdos.sh b/ld/emulparams/i386msdos.sh
index 9311fa1fe5a..293bf68f16a 100644
--- a/ld/emulparams/i386msdos.sh
+++ b/ld/emulparams/i386msdos.sh
@@ -1,7 +1,6 @@
 SCRIPT_NAME=i386msdos
 OUTPUT_FORMAT="msdos"
 TEXT_START_ADDR=0x0
-NONPAGED_TEXT_START_ADDR=0x0
 SEGMENT_SIZE=0x10
 PAD_TEXT=t
 ARCH=i386
diff --git a/ld/emulparams/i386nto.sh b/ld/emulparams/i386nto.sh
index 256d4c8d141..078289c384b 100644
--- a/ld/emulparams/i386nto.sh
+++ b/ld/emulparams/i386nto.sh
@@ -3,8 +3,6 @@ OUTPUT_FORMAT="elf32-i386"
 TEXT_START_ADDR=0x08048000
 TEXT_START_SYMBOLS='_btext = .;'
 MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
-NONPAGED_TEXT_START_ADDR=0x08048000
-#SHLIB_TEXT_START_ADDR=0xb0300000
 ARCH=i386
 MACHINE=
 NOP=0x9090
diff --git a/ld/emulparams/i386nw.sh b/ld/emulparams/i386nw.sh
index dd5558cf000..e1897bef957 100644
--- a/ld/emulparams/i386nw.sh
+++ b/ld/emulparams/i386nw.sh
@@ -2,7 +2,6 @@ SCRIPT_NAME=nw
 OUTPUT_FORMAT="elf32-i386"
 TEXT_START_ADDR=0x08000000
 MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
-NONPAGED_TEXT_START_ADDR=0x08000000
 ARCH=i386
 NOP=0x90909090
 TEMPLATE_NAME=elf32
diff --git a/ld/emulparams/m68k4knbsd.sh b/ld/emulparams/m68k4knbsd.sh
index 1bc24c0e9b9..d160264a132 100644
--- a/ld/emulparams/m68k4knbsd.sh
+++ b/ld/emulparams/m68k4knbsd.sh
@@ -1,6 +1,8 @@
 SCRIPT_NAME=aout
 TEXT_START_ADDR=0x1020
-NONPAGED_TEXT_START_ADDR=0x1000
+case ${LD_FLAG} in
+    n|N)	TEXT_START_ADDR=0x1000 ;;
+esac
 OUTPUT_FORMAT="a.out-m68k4k-netbsd"
 TARGET_PAGE_SIZE=0x1000
 ARCH=m68k
diff --git a/ld/emulparams/m68kaout.sh b/ld/emulparams/m68kaout.sh
index 9bfaaf719a3..09e6c72b4bd 100644
--- a/ld/emulparams/m68kaout.sh
+++ b/ld/emulparams/m68kaout.sh
@@ -3,5 +3,4 @@ OUTPUT_FORMAT="a.out-zero-big"
 TEXT_START_ADDR=0x2020
 TARGET_PAGE_SIZE=0x2000
 SEGMENT_SIZE=0x20000
-NONPAGED_TEXT_START_ADDR=0x2000
 ARCH=m68k
diff --git a/ld/emulparams/m68kelf.sh b/ld/emulparams/m68kelf.sh
index 4771f6b50fa..3cda61fc05e 100644
--- a/ld/emulparams/m68kelf.sh
+++ b/ld/emulparams/m68kelf.sh
@@ -2,7 +2,6 @@ SCRIPT_NAME=elf
 OUTPUT_FORMAT="elf32-m68k"
 TEXT_START_ADDR=0x80000000
 MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
-NONPAGED_TEXT_START_ADDR=${TEXT_START_ADDR}
 ARCH=m68k
 MACHINE=
 NOP=0x4e754e75
diff --git a/ld/emulparams/m68klinux.sh b/ld/emulparams/m68klinux.sh
index 56c3dad9bfc..924fdbee56d 100644
--- a/ld/emulparams/m68klinux.sh
+++ b/ld/emulparams/m68klinux.sh
@@ -2,6 +2,8 @@ SCRIPT_NAME=aout
 OUTPUT_FORMAT="a.out-m68k-linux"
 TARGET_PAGE_SIZE=0x1000
 TEXT_START_ADDR=0x1020
-NONPAGED_TEXT_START_ADDR=0
+case ${LD_FLAG} in
+    n|N)	TEXT_START_ADDR=0 ;;
+esac
 ARCH=m68k
 TEMPLATE_NAME=linux
diff --git a/ld/emulparams/m68knbsd.sh b/ld/emulparams/m68knbsd.sh
index a742807ddd9..fcda407f47c 100644
--- a/ld/emulparams/m68knbsd.sh
+++ b/ld/emulparams/m68knbsd.sh
@@ -1,6 +1,8 @@
 SCRIPT_NAME=aout
 TEXT_START_ADDR=0x2020
-NONPAGED_TEXT_START_ADDR=0x2000
+case ${LD_FLAG} in
+    n|N)	TEXT_START_ADDR=0x2000 ;;
+esac
 OUTPUT_FORMAT="a.out-m68k-netbsd"
 TARGET_PAGE_SIZE=0x2000
 ARCH=m68k
diff --git a/ld/emulparams/ns32knbsd.sh b/ld/emulparams/ns32knbsd.sh
index 2ded301471f..12e4b09a01f 100644
--- a/ld/emulparams/ns32knbsd.sh
+++ b/ld/emulparams/ns32knbsd.sh
@@ -1,8 +1,10 @@
 SCRIPT_NAME=aout
 TEXT_START_ADDR=0x1020
+case ${LD_FLAG} in
+    n|N)	TEXT_START_ADDR=0x1000 ;;
+esac
 OUTPUT_FORMAT="a.out-ns32k-netbsd"
 TARGET_PAGE_SIZE=0x1000
 ARCH=ns32k
 EXECUTABLE_SYMBOLS='__DYNAMIC = 0;'
-NONPAGED_TEXT_START_ADDR=0x1000
 EXTRA_EM_FILE=netbsd
diff --git a/ld/emulparams/pc532macha.sh b/ld/emulparams/pc532macha.sh
index 9c1d0791c8d..2b70618d112 100644
--- a/ld/emulparams/pc532macha.sh
+++ b/ld/emulparams/pc532macha.sh
@@ -2,5 +2,7 @@ SCRIPT_NAME=aout
 OUTPUT_FORMAT="a.out-pc532-mach"
 TARGET_PAGE_SIZE=0x1000
 TEXT_START_ADDR="0x10020"
-NONPAGED_TEXT_START_ADDR=0x10000
+case ${LD_FLAG} in
+    n|N)	TEXT_START_ADDR=0x10000 ;;
+esac
 ARCH=ns32k
diff --git a/ld/emulparams/ppclynx.sh b/ld/emulparams/ppclynx.sh
index 5c5769ea796..42039082a2c 100644
--- a/ld/emulparams/ppclynx.sh
+++ b/ld/emulparams/ppclynx.sh
@@ -4,7 +4,9 @@ TEXT_BASE=0x00002000
 DYN_TEXT_BASE=0x00400000
 TEXT_START_ADDR="(DEFINED(_DYNAMIC) ? ${DYN_TEXT_BASE} : ${TEXT_BASE})"
 MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
-NONPAGED_TEXT_START_ADDR=0x1000
+case ${LD_FLAG} in
+    n|N)	TEXT_START_ADDR=0x1000 ;;
+esac
 ARCH=powerpc
 MACHINE=
 TEMPLATE_NAME=elf32
diff --git a/ld/emulparams/ppcnw.sh b/ld/emulparams/ppcnw.sh
index 14b2745caad..e7d197d5cc1 100644
--- a/ld/emulparams/ppcnw.sh
+++ b/ld/emulparams/ppcnw.sh
@@ -3,5 +3,4 @@ OUTPUT_FORMAT="elf32-powerpc"
 TEXT_START_ADDR=0x0400000
 DATA_ADDR=0x10000000
 MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
-NONPAGED_TEXT_START_ADDR=0x0400000
 ARCH=powerpc
diff --git a/ld/emulparams/scoreelf.sh b/ld/emulparams/scoreelf.sh
index e138de2b30e..0ca5e56a1f8 100644
--- a/ld/emulparams/scoreelf.sh
+++ b/ld/emulparams/scoreelf.sh
@@ -7,8 +7,10 @@ LITTLE_OUTPUT_FORMAT="elf32-littlescore"
 GROUP="-lm -lc -lglsim -lgcc -lstdc++"
 
 TEXT_START_ADDR=0x00000000
+case ${LD_FLAG} in
+    n|N)	TEXT_START_ADDR=0x0400000 ;;
+esac
 MAXPAGESIZE=256
-NONPAGED_TEXT_START_ADDR=0x0400000
 SHLIB_TEXT_START_ADDR=0x5ffe0000
 OTHER_GOT_SYMBOLS='
   _gp = ALIGN(16) + 0x3ff0;
diff --git a/ld/emulparams/sparcaout.sh b/ld/emulparams/sparcaout.sh
index 429b925c18c..e1090646465 100644
--- a/ld/emulparams/sparcaout.sh
+++ b/ld/emulparams/sparcaout.sh
@@ -3,6 +3,8 @@ OUTPUT_FORMAT="a.out-sunos-big"
 BIG_OUTPUT_FORMAT="a.out-sunos-big"
 LITTLE_OUTPUT_FORMAT="a.out-sparc-little"
 TEXT_START_ADDR=0x2020
+case ${LD_FLAG} in
+    n|N)	TEXT_START_ADDR=0x2000 ;;
+esac
 TARGET_PAGE_SIZE=0x2000
-NONPAGED_TEXT_START_ADDR=0x2000
 ARCH=sparc
diff --git a/ld/emulparams/sparclinux.sh b/ld/emulparams/sparclinux.sh
index 7ccb0bec90c..e2164bcc9e2 100644
--- a/ld/emulparams/sparclinux.sh
+++ b/ld/emulparams/sparclinux.sh
@@ -2,6 +2,8 @@ SCRIPT_NAME=aout
 OUTPUT_FORMAT="a.out-sparc-linux"
 TARGET_PAGE_SIZE=0x1000
 TEXT_START_ADDR=0x1020
-NONPAGED_TEXT_START_ADDR=0
+case ${LD_FLAG} in
+    n|N)	TEXT_START_ADDR=0 ;;
+esac
 ARCH=sparc
 TEMPLATE_NAME=linux
diff --git a/ld/emulparams/sun3.sh b/ld/emulparams/sun3.sh
index db0f71f3abd..64c0c466664 100644
--- a/ld/emulparams/sun3.sh
+++ b/ld/emulparams/sun3.sh
@@ -1,8 +1,10 @@
 SCRIPT_NAME=aout
 OUTPUT_FORMAT="a.out-sunos-big"
 TEXT_START_ADDR=0x2020
+case ${LD_FLAG} in
+    n|N)	TEXT_START_ADDR=0x2000 ;;
+esac
 TARGET_PAGE_SIZE=0x2000
 SEGMENT_SIZE=0x20000
-NONPAGED_TEXT_START_ADDR=0x2000
 ARCH=m68k
 TEMPLATE_NAME=sunos
diff --git a/ld/emulparams/sun4.sh b/ld/emulparams/sun4.sh
index bd42775331b..6cfbccc2bab 100644
--- a/ld/emulparams/sun4.sh
+++ b/ld/emulparams/sun4.sh
@@ -2,7 +2,6 @@ SCRIPT_NAME=aout
 OUTPUT_FORMAT="a.out-sunos-big"
 TEXT_START_ADDR=0x2020
 TARGET_PAGE_SIZE=0x2000
-NONPAGED_TEXT_START_ADDR=0x2000
 ALIGNMENT=8
 ARCH=sparc
 TEMPLATE_NAME=sunos
diff --git a/ld/emulparams/tic80coff.sh b/ld/emulparams/tic80coff.sh
index 70703231fd5..088e9b03478 100644
--- a/ld/emulparams/tic80coff.sh
+++ b/ld/emulparams/tic80coff.sh
@@ -39,12 +39,6 @@ ARCH=tic80
 #
 TEXT_START_ADDR=0x2000000
 
-# If this is defined, the genscripts.sh script sets TEXT_START_ADDR to
-# its value before running the scripttempl script for the -n and -N
-# options.
-#
-# NONPAGED_TEXT_START_ADDR=
-
 # The genscripts.sh script uses this to set the default value of 
 # DATA_ALIGNMENT when running the scripttempl script.
 #
diff --git a/ld/emulparams/vaxnbsd.sh b/ld/emulparams/vaxnbsd.sh
index b16813fdcdf..2d26831f7ca 100644
--- a/ld/emulparams/vaxnbsd.sh
+++ b/ld/emulparams/vaxnbsd.sh
@@ -4,4 +4,3 @@ OUTPUT_FORMAT="a.out-vax-netbsd"
 TARGET_PAGE_SIZE=0x1000
 ARCH=vax
 EXECUTABLE_SYMBOLS='__DYNAMIC = 0;'
-NONPAGED_TEXT_START_ADDR=0x1000
diff --git a/ld/emulparams/vsta.sh b/ld/emulparams/vsta.sh
index cc6249bea43..0610f305bb0 100644
--- a/ld/emulparams/vsta.sh
+++ b/ld/emulparams/vsta.sh
@@ -3,6 +3,8 @@ OUTPUT_FORMAT="a.out-i386"
 TEXT_START_ADDR=0x1020
 TARGET_PAGE_SIZE=0x1000
 SEGMENT_SIZE=0x400000
-NONPAGED_TEXT_START_ADDR=0x0
+case ${LD_FLAG} in
+    n|N)	TEXT_START_ADDR=0 ;;
+esac
 ARCH=i386
 
diff --git a/ld/genscripts.sh b/ld/genscripts.sh
index 17c516c4790..d78ffce3c23 100755
--- a/ld/genscripts.sh
+++ b/ld/genscripts.sh
@@ -289,7 +289,6 @@ RELOCATING=" "
 
 LD_FLAG=n
 DATA_ALIGNMENT=${DATA_ALIGNMENT_n}
-TEXT_START_ADDR=${NONPAGED_TEXT_START_ADDR-${TEXT_START_ADDR}}
 ( echo "/* Script for -n: mix text and data on same page */"
   . ${CUSTOMIZER_SCRIPT} ${EMULATION_NAME}
   . ${srcdir}/scripttempl/${SCRIPT_NAME}.sc
@@ -327,7 +326,6 @@ if test -n "$GENERATE_SHLIB_SCRIPT"; then
   LD_FLAG=shared
   DATA_ALIGNMENT=${DATA_ALIGNMENT_s-${DATA_ALIGNMENT_}}
   CREATE_SHLIB=" "
-  # Note that TEXT_START_ADDR is set to NONPAGED_TEXT_START_ADDR.
   (
     echo "/* Script for ld --shared: link shared library */"
     . ${CUSTOMIZER_SCRIPT} ${EMULATION_NAME}
@@ -360,7 +358,6 @@ if test -n "$GENERATE_PIE_SCRIPT"; then
   LD_FLAG=pie
   DATA_ALIGNMENT=${DATA_ALIGNMENT_s-${DATA_ALIGNMENT_}}
   CREATE_PIE=" "
-  # Note that TEXT_START_ADDR is set to NONPAGED_TEXT_START_ADDR.
   (
     echo "/* Script for ld -pie: link position independent executable */"
     . ${CUSTOMIZER_SCRIPT} ${EMULATION_NAME}
diff --git a/ld/ldint.texinfo b/ld/ldint.texinfo
index 85d736b088c..81a5adab7ff 100644
--- a/ld/ldint.texinfo
+++ b/ld/ldint.texinfo
@@ -214,12 +214,6 @@ Some @file{scripttempl} scripts use this to set the entry address, in an
 Some @file{scripttempl} scripts use this to set the start address of the
 @samp{.text} section.
 
-@item NONPAGED_TEXT_START_ADDR
-If this is defined, the @file{genscripts.sh} script sets
-@code{TEXT_START_ADDR} to its value before running the
-@file{scripttempl} script for the @code{-n} and @code{-N} options
-(@pxref{linker scripts}).
-
 @item SEGMENT_SIZE
 The @file{genscripts.sh} script uses this to set the default value of
 @code{DATA_ALIGNMENT} when running the @file{scripttempl} script.