This is the mail archive of the binutils@sourceware.org mailing list for the binutils project.
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]
Fix PR 4515

From: Alan Modra <amodra at bigpond dot net dot au>
To: binutils at sourceware dot org
Date: Thu, 9 Aug 2007 20:30:38 +0930
Subject: Fix PR 4515
This fixes a bug I introduced 2001-08-08.  genscripts.sh relied on the
assignment of NONPAGED_TEXT_START_ADDR to TEXT_START_ADDR for the
ln -n script to be carried through to where the ld -N script is
generated.  By sourcing the emulparams customizer script again between
these two places, the assignment was lost.

The simple and obvious fix is to replicate the assignment before
generating the ld -N script, but I noticed many scripts that set 
NONPAGED_TEXT_START_ADDR unnecessarily and even a couple that set
NONPAGED_TEXT_START_ADDRESS.  So I decided to remove the variable.
Since genscripts.sh had some comments before the shared and pie
scripts indicating that TEXT_START_ADDR ought to remain set to
NONPAGED_TEXT_START_ADDRESS, my initial patch used:

	TEXT_START_ADDR=0x1020
	case ${LD_FLAG} in
	    n|N|*shared|*pie)	TEXT_START_ADDR=0x1000 ;;
	esac

However, it turns out that this isn't necessary.  Every target that
creates a shared lib or pie script either didn't set
NONPAGED_TEXT_START_ADDR or used one of the elf.sc versions that
use SHLIB_TEXT_START_ADDR for shared lib and pie.  Of course, it would
be possible to get rid of SHLIB_TEXT_START_ADDR too..

	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

Index: ld/genscripts.sh
===================================================================
RCS file: /cvs/src/src/ld/genscripts.sh,v
retrieving revision 1.24
diff -u -p -r1.24 genscripts.sh
--- ld/genscripts.sh	19 Jul 2007 19:56:10 -0000	1.24
+++ ld/genscripts.sh	9 Aug 2007 03:16:07 -0000
@@ -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"; the
   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}
Index: ld/ldint.texinfo
===================================================================
RCS file: /cvs/src/src/ld/ldint.texinfo,v
retrieving revision 1.11
diff -u -p -r1.11 ldint.texinfo
--- ld/ldint.texinfo	22 May 2007 09:16:39 -0000	1.11
+++ ld/ldint.texinfo	9 Aug 2007 03:16:08 -0000
@@ -214,12 +214,6 @@ Some @file{scripttempl} scripts use this
 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.
Index: ld/emulparams/arcelf.sh
===================================================================
RCS file: /cvs/src/src/ld/emulparams/arcelf.sh,v
retrieving revision 1.3
diff -u -p -r1.3 arcelf.sh
--- ld/emulparams/arcelf.sh	20 Jun 2006 02:22:14 -0000	1.3
+++ ld/emulparams/arcelf.sh	9 Aug 2007 03:16:08 -0000
@@ -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
Index: ld/emulparams/armaoutb.sh
===================================================================
RCS file: /cvs/src/src/ld/emulparams/armaoutb.sh,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 armaoutb.sh
--- ld/emulparams/armaoutb.sh	3 May 1999 07:29:07 -0000	1.1.1.1
+++ ld/emulparams/armaoutb.sh	9 Aug 2007 03:16:08 -0000
@@ -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
Index: ld/emulparams/armaoutl.sh
===================================================================
RCS file: /cvs/src/src/ld/emulparams/armaoutl.sh,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 armaoutl.sh
--- ld/emulparams/armaoutl.sh	3 May 1999 07:29:07 -0000	1.1.1.1
+++ ld/emulparams/armaoutl.sh	9 Aug 2007 03:16:08 -0000
@@ -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
Index: ld/emulparams/armnbsd.sh
===================================================================
RCS file: /cvs/src/src/ld/emulparams/armnbsd.sh,v
retrieving revision 1.1
diff -u -p -r1.1 armnbsd.sh
--- ld/emulparams/armnbsd.sh	24 Aug 1999 15:17:23 -0000	1.1
+++ ld/emulparams/armnbsd.sh	9 Aug 2007 03:16:08 -0000
@@ -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
Index: ld/emulparams/bfin.sh
===================================================================
RCS file: /cvs/src/src/ld/emulparams/bfin.sh,v
retrieving revision 1.5
diff -u -p -r1.5 bfin.sh
--- ld/emulparams/bfin.sh	6 Aug 2006 05:23:16 -0000	1.5
+++ ld/emulparams/bfin.sh	9 Aug 2007 03:16:08 -0000
@@ -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
Index: ld/emulparams/coff_sparc.sh
===================================================================
RCS file: /cvs/src/src/ld/emulparams/coff_sparc.sh,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 coff_sparc.sh
--- ld/emulparams/coff_sparc.sh	3 May 1999 07:29:07 -0000	1.1.1.1
+++ ld/emulparams/coff_sparc.sh	9 Aug 2007 03:16:08 -0000
@@ -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
Index: ld/emulparams/crisaout.sh
===================================================================
RCS file: /cvs/src/src/ld/emulparams/crisaout.sh,v
retrieving revision 1.1
diff -u -p -r1.1 crisaout.sh
--- ld/emulparams/crisaout.sh	20 Jul 2000 17:16:06 -0000	1.1
+++ ld/emulparams/crisaout.sh	9 Aug 2007 03:16:08 -0000
@@ -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
Index: ld/emulparams/elf32_sparc.sh
===================================================================
RCS file: /cvs/src/src/ld/emulparams/elf32_sparc.sh,v
retrieving revision 1.6
diff -u -p -r1.6 elf32_sparc.sh
--- ld/emulparams/elf32_sparc.sh	27 Apr 2007 00:09:31 -0000	1.6
+++ ld/emulparams/elf32_sparc.sh	9 Aug 2007 03:16:08 -0000
@@ -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=
Index: ld/emulparams/elf32am33lin.sh
===================================================================
RCS file: /cvs/src/src/ld/emulparams/elf32am33lin.sh,v
retrieving revision 1.2
diff -u -p -r1.2 elf32am33lin.sh
--- ld/emulparams/elf32am33lin.sh	30 May 2006 16:45:32 -0000	1.2
+++ ld/emulparams/elf32am33lin.sh	9 Aug 2007 03:16:08 -0000
@@ -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
Index: ld/emulparams/elf32b4300.sh
===================================================================
RCS file: /cvs/src/src/ld/emulparams/elf32b4300.sh,v
retrieving revision 1.4
diff -u -p -r1.4 elf32b4300.sh
--- ld/emulparams/elf32b4300.sh	30 Nov 2002 08:39:46 -0000	1.4
+++ ld/emulparams/elf32b4300.sh	9 Aug 2007 03:16:08 -0000
@@ -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
Index: ld/emulparams/elf32bmip.sh
===================================================================
RCS file: /cvs/src/src/ld/emulparams/elf32bmip.sh,v
retrieving revision 1.15
diff -u -p -r1.15 elf32bmip.sh
--- ld/emulparams/elf32bmip.sh	27 Apr 2007 00:09:31 -0000	1.15
+++ ld/emulparams/elf32bmip.sh	9 Aug 2007 03:16:08 -0000
@@ -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=
Index: ld/emulparams/elf32mcore.sh
===================================================================
RCS file: /cvs/src/src/ld/emulparams/elf32mcore.sh,v
retrieving revision 1.15
diff -u -p -r1.15 elf32mcore.sh
--- ld/emulparams/elf32mcore.sh	30 May 2006 16:45:32 -0000	1.15
+++ ld/emulparams/elf32mcore.sh	9 Aug 2007 03:16:09 -0000
@@ -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
 
Index: ld/emulparams/elf32vax.sh
===================================================================
RCS file: /cvs/src/src/ld/emulparams/elf32vax.sh,v
retrieving revision 1.2
diff -u -p -r1.2 elf32vax.sh
--- ld/emulparams/elf32vax.sh	30 May 2006 16:45:32 -0000	1.2
+++ ld/emulparams/elf32vax.sh	9 Aug 2007 03:16:09 -0000
@@ -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
Index: ld/emulparams/elf32xtensa.sh
===================================================================
RCS file: /cvs/src/src/ld/emulparams/elf32xtensa.sh,v
retrieving revision 1.11
diff -u -p -r1.11 elf32xtensa.sh
--- ld/emulparams/elf32xtensa.sh	11 Jun 2007 23:46:32 -0000	1.11
+++ ld/emulparams/elf32xtensa.sh	9 Aug 2007 03:16:09 -0000
@@ -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=
Index: ld/emulparams/elf64_s390.sh
===================================================================
RCS file: /cvs/src/src/ld/emulparams/elf64_s390.sh,v
retrieving revision 1.10
diff -u -p -r1.10 elf64_s390.sh
--- ld/emulparams/elf64_s390.sh	30 May 2006 16:45:32 -0000	1.10
+++ ld/emulparams/elf64_s390.sh	9 Aug 2007 03:16:09 -0000
@@ -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
Index: ld/emulparams/elf64_sparc.sh
===================================================================
RCS file: /cvs/src/src/ld/emulparams/elf64_sparc.sh,v
retrieving revision 1.10
diff -u -p -r1.10 elf64_sparc.sh
--- ld/emulparams/elf64_sparc.sh	30 May 2006 16:45:32 -0000	1.10
+++ ld/emulparams/elf64_sparc.sh	9 Aug 2007 03:16:09 -0000
@@ -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
 
Index: ld/emulparams/elf64alpha.sh
===================================================================
RCS file: /cvs/src/src/ld/emulparams/elf64alpha.sh,v
retrieving revision 1.14
diff -u -p -r1.14 elf64alpha.sh
--- ld/emulparams/elf64alpha.sh	30 May 2006 16:45:32 -0000	1.14
+++ ld/emulparams/elf64alpha.sh	9 Aug 2007 03:16:09 -0000
@@ -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
Index: ld/emulparams/elf_i386.sh
===================================================================
RCS file: /cvs/src/src/ld/emulparams/elf_i386.sh,v
retrieving revision 1.7
diff -u -p -r1.7 elf_i386.sh
--- ld/emulparams/elf_i386.sh	30 May 2006 16:45:32 -0000	1.7
+++ ld/emulparams/elf_i386.sh	9 Aug 2007 03:16:09 -0000
@@ -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
Index: ld/emulparams/elf_i386_be.sh
===================================================================
RCS file: /cvs/src/src/ld/emulparams/elf_i386_be.sh,v
retrieving revision 1.4
diff -u -p -r1.4 elf_i386_be.sh
--- ld/emulparams/elf_i386_be.sh	30 May 2006 16:45:32 -0000	1.4
+++ ld/emulparams/elf_i386_be.sh	9 Aug 2007 03:16:09 -0000
@@ -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=
Index: ld/emulparams/elf_i386_chaos.sh
===================================================================
RCS file: /cvs/src/src/ld/emulparams/elf_i386_chaos.sh,v
retrieving revision 1.5
diff -u -p -r1.5 elf_i386_chaos.sh
--- ld/emulparams/elf_i386_chaos.sh	30 May 2006 16:45:32 -0000	1.5
+++ ld/emulparams/elf_i386_chaos.sh	9 Aug 2007 03:16:09 -0000
@@ -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
Index: ld/emulparams/elf_i386_ldso.sh
===================================================================
RCS file: /cvs/src/src/ld/emulparams/elf_i386_ldso.sh,v
retrieving revision 1.4
diff -u -p -r1.4 elf_i386_ldso.sh
--- ld/emulparams/elf_i386_ldso.sh	30 May 2006 16:45:32 -0000	1.4
+++ ld/emulparams/elf_i386_ldso.sh	9 Aug 2007 03:16:09 -0000
@@ -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
Index: ld/emulparams/elf_i386_vxworks.sh
===================================================================
RCS file: /cvs/src/src/ld/emulparams/elf_i386_vxworks.sh,v
retrieving revision 1.2
diff -u -p -r1.2 elf_i386_vxworks.sh
--- ld/emulparams/elf_i386_vxworks.sh	30 May 2006 16:45:32 -0000	1.2
+++ ld/emulparams/elf_i386_vxworks.sh	9 Aug 2007 03:16:09 -0000
@@ -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
Index: ld/emulparams/elf_s390.sh
===================================================================
RCS file: /cvs/src/src/ld/emulparams/elf_s390.sh,v
retrieving revision 1.7
diff -u -p -r1.7 elf_s390.sh
--- ld/emulparams/elf_s390.sh	30 May 2006 16:45:32 -0000	1.7
+++ ld/emulparams/elf_s390.sh	9 Aug 2007 03:16:09 -0000
@@ -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
Index: ld/emulparams/elf_x86_64.sh
===================================================================
RCS file: /cvs/src/src/ld/emulparams/elf_x86_64.sh,v
retrieving revision 1.19
diff -u -p -r1.19 elf_x86_64.sh
--- ld/emulparams/elf_x86_64.sh	18 Oct 2006 16:24:01 -0000	1.19
+++ ld/emulparams/elf_x86_64.sh	9 Aug 2007 03:16:09 -0000
@@ -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
Index: ld/emulparams/i386aout.sh
===================================================================
RCS file: /cvs/src/src/ld/emulparams/i386aout.sh,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 i386aout.sh
--- ld/emulparams/i386aout.sh	3 May 1999 07:29:07 -0000	1.1.1.1
+++ ld/emulparams/i386aout.sh	9 Aug 2007 03:16:09 -0000
@@ -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
Index: ld/emulparams/i386bsd.sh
===================================================================
RCS file: /cvs/src/src/ld/emulparams/i386bsd.sh,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 i386bsd.sh
--- ld/emulparams/i386bsd.sh	3 May 1999 07:29:07 -0000	1.1.1.1
+++ ld/emulparams/i386bsd.sh	9 Aug 2007 03:16:09 -0000
@@ -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
Index: ld/emulparams/i386go32.sh
===================================================================
RCS file: /cvs/src/src/ld/emulparams/i386go32.sh,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 i386go32.sh
--- ld/emulparams/i386go32.sh	3 May 1999 07:29:07 -0000	1.1.1.1
+++ ld/emulparams/i386go32.sh	9 Aug 2007 03:16:09 -0000
@@ -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
 
Index: ld/emulparams/i386linux.sh
===================================================================
RCS file: /cvs/src/src/ld/emulparams/i386linux.sh,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 i386linux.sh
--- ld/emulparams/i386linux.sh	3 May 1999 07:29:07 -0000	1.1.1.1
+++ ld/emulparams/i386linux.sh	9 Aug 2007 03:16:09 -0000
@@ -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
Index: ld/emulparams/i386lynx.sh
===================================================================
RCS file: /cvs/src/src/ld/emulparams/i386lynx.sh,v
retrieving revision 1.3
diff -u -p -r1.3 i386lynx.sh
--- ld/emulparams/i386lynx.sh	30 May 2006 16:45:32 -0000	1.3
+++ ld/emulparams/i386lynx.sh	9 Aug 2007 03:16:09 -0000
@@ -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
Index: ld/emulparams/i386mach.sh
===================================================================
RCS file: /cvs/src/src/ld/emulparams/i386mach.sh,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 i386mach.sh
--- ld/emulparams/i386mach.sh	3 May 1999 07:29:07 -0000	1.1.1.1
+++ ld/emulparams/i386mach.sh	9 Aug 2007 03:16:09 -0000
@@ -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
Index: ld/emulparams/i386moss.sh
===================================================================
RCS file: /cvs/src/src/ld/emulparams/i386moss.sh,v
retrieving revision 1.3
diff -u -p -r1.3 i386moss.sh
--- ld/emulparams/i386moss.sh	30 May 2006 16:45:32 -0000	1.3
+++ ld/emulparams/i386moss.sh	9 Aug 2007 03:16:09 -0000
@@ -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
Index: ld/emulparams/i386msdos.sh
===================================================================
RCS file: /cvs/src/src/ld/emulparams/i386msdos.sh,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 i386msdos.sh
--- ld/emulparams/i386msdos.sh	3 May 1999 07:29:07 -0000	1.1.1.1
+++ ld/emulparams/i386msdos.sh	9 Aug 2007 03:16:09 -0000
@@ -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
Index: ld/emulparams/i386nto.sh
===================================================================
RCS file: /cvs/src/src/ld/emulparams/i386nto.sh,v
retrieving revision 1.2
diff -u -p -r1.2 i386nto.sh
--- ld/emulparams/i386nto.sh	30 May 2006 16:45:32 -0000	1.2
+++ ld/emulparams/i386nto.sh	9 Aug 2007 03:16:09 -0000
@@ -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
Index: ld/emulparams/i386nw.sh
===================================================================
RCS file: /cvs/src/src/ld/emulparams/i386nw.sh,v
retrieving revision 1.3
diff -u -p -r1.3 i386nw.sh
--- ld/emulparams/i386nw.sh	30 May 2006 16:45:32 -0000	1.3
+++ ld/emulparams/i386nw.sh	9 Aug 2007 03:16:09 -0000
@@ -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
Index: ld/emulparams/m68k4knbsd.sh
===================================================================
RCS file: /cvs/src/src/ld/emulparams/m68k4knbsd.sh,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 m68k4knbsd.sh
--- ld/emulparams/m68k4knbsd.sh	3 May 1999 07:29:07 -0000	1.1.1.1
+++ ld/emulparams/m68k4knbsd.sh	9 Aug 2007 03:16:09 -0000
@@ -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
Index: ld/emulparams/m68kaout.sh
===================================================================
RCS file: /cvs/src/src/ld/emulparams/m68kaout.sh,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 m68kaout.sh
--- ld/emulparams/m68kaout.sh	3 May 1999 07:29:07 -0000	1.1.1.1
+++ ld/emulparams/m68kaout.sh	9 Aug 2007 03:16:09 -0000
@@ -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
Index: ld/emulparams/m68kelf.sh
===================================================================
RCS file: /cvs/src/src/ld/emulparams/m68kelf.sh,v
retrieving revision 1.5
diff -u -p -r1.5 m68kelf.sh
--- ld/emulparams/m68kelf.sh	30 May 2006 16:45:32 -0000	1.5
+++ ld/emulparams/m68kelf.sh	9 Aug 2007 03:16:09 -0000
@@ -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
Index: ld/emulparams/m68klinux.sh
===================================================================
RCS file: /cvs/src/src/ld/emulparams/m68klinux.sh,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 m68klinux.sh
--- ld/emulparams/m68klinux.sh	3 May 1999 07:29:07 -0000	1.1.1.1
+++ ld/emulparams/m68klinux.sh	9 Aug 2007 03:16:09 -0000
@@ -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
Index: ld/emulparams/m68knbsd.sh
===================================================================
RCS file: /cvs/src/src/ld/emulparams/m68knbsd.sh,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 m68knbsd.sh
--- ld/emulparams/m68knbsd.sh	3 May 1999 07:29:07 -0000	1.1.1.1
+++ ld/emulparams/m68knbsd.sh	9 Aug 2007 03:16:09 -0000
@@ -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
Index: ld/emulparams/ns32knbsd.sh
===================================================================
RCS file: /cvs/src/src/ld/emulparams/ns32knbsd.sh,v
retrieving revision 1.3
diff -u -p -r1.3 ns32knbsd.sh
--- ld/emulparams/ns32knbsd.sh	31 Jul 2002 12:50:09 -0000	1.3
+++ ld/emulparams/ns32knbsd.sh	9 Aug 2007 03:16:09 -0000
@@ -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
Index: ld/emulparams/pc532macha.sh
===================================================================
RCS file: /cvs/src/src/ld/emulparams/pc532macha.sh,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 pc532macha.sh
--- ld/emulparams/pc532macha.sh	3 May 1999 07:29:07 -0000	1.1.1.1
+++ ld/emulparams/pc532macha.sh	9 Aug 2007 03:16:09 -0000
@@ -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
Index: ld/emulparams/ppclynx.sh
===================================================================
RCS file: /cvs/src/src/ld/emulparams/ppclynx.sh,v
retrieving revision 1.2
diff -u -p -r1.2 ppclynx.sh
--- ld/emulparams/ppclynx.sh	30 May 2006 16:45:32 -0000	1.2
+++ ld/emulparams/ppclynx.sh	9 Aug 2007 03:16:09 -0000
@@ -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
Index: ld/emulparams/ppcnw.sh
===================================================================
RCS file: /cvs/src/src/ld/emulparams/ppcnw.sh,v
retrieving revision 1.2
diff -u -p -r1.2 ppcnw.sh
--- ld/emulparams/ppcnw.sh	30 May 2006 16:45:32 -0000	1.2
+++ ld/emulparams/ppcnw.sh	9 Aug 2007 03:16:09 -0000
@@ -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
Index: ld/emulparams/scoreelf.sh
===================================================================
RCS file: /cvs/src/src/ld/emulparams/scoreelf.sh,v
retrieving revision 1.1
diff -u -p -r1.1 scoreelf.sh
--- ld/emulparams/scoreelf.sh	16 Sep 2006 23:51:49 -0000	1.1
+++ ld/emulparams/scoreelf.sh	9 Aug 2007 03:16:09 -0000
@@ -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;
Index: ld/emulparams/sparcaout.sh
===================================================================
RCS file: /cvs/src/src/ld/emulparams/sparcaout.sh,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 sparcaout.sh
--- ld/emulparams/sparcaout.sh	3 May 1999 07:29:07 -0000	1.1.1.1
+++ ld/emulparams/sparcaout.sh	9 Aug 2007 03:16:09 -0000
@@ -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
Index: ld/emulparams/sparclinux.sh
===================================================================
RCS file: /cvs/src/src/ld/emulparams/sparclinux.sh,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 sparclinux.sh
--- ld/emulparams/sparclinux.sh	3 May 1999 07:29:07 -0000	1.1.1.1
+++ ld/emulparams/sparclinux.sh	9 Aug 2007 03:16:09 -0000
@@ -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
Index: ld/emulparams/sun3.sh
===================================================================
RCS file: /cvs/src/src/ld/emulparams/sun3.sh,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 sun3.sh
--- ld/emulparams/sun3.sh	3 May 1999 07:29:07 -0000	1.1.1.1
+++ ld/emulparams/sun3.sh	9 Aug 2007 03:16:09 -0000
@@ -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
Index: ld/emulparams/sun4.sh
===================================================================
RCS file: /cvs/src/src/ld/emulparams/sun4.sh,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 sun4.sh
--- ld/emulparams/sun4.sh	3 May 1999 07:29:07 -0000	1.1.1.1
+++ ld/emulparams/sun4.sh	9 Aug 2007 03:16:09 -0000
@@ -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
Index: ld/emulparams/tic80coff.sh
===================================================================
RCS file: /cvs/src/src/ld/emulparams/tic80coff.sh,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 tic80coff.sh
--- ld/emulparams/tic80coff.sh	3 May 1999 07:29:07 -0000	1.1.1.1
+++ ld/emulparams/tic80coff.sh	9 Aug 2007 03:16:09 -0000
@@ -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.
 #
Index: ld/emulparams/vaxnbsd.sh
===================================================================
RCS file: /cvs/src/src/ld/emulparams/vaxnbsd.sh,v
retrieving revision 1.1
diff -u -p -r1.1 vaxnbsd.sh
--- ld/emulparams/vaxnbsd.sh	30 May 2002 02:40:03 -0000	1.1
+++ ld/emulparams/vaxnbsd.sh	9 Aug 2007 03:16:09 -0000
@@ -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
Index: ld/emulparams/vsta.sh
===================================================================
RCS file: /cvs/src/src/ld/emulparams/vsta.sh,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 vsta.sh
--- ld/emulparams/vsta.sh	3 May 1999 07:29:07 -0000	1.1.1.1
+++ ld/emulparams/vsta.sh	9 Aug 2007 03:16:09 -0000
@@ -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
 

-- 
Alan Modra
Australia Development Lab, IBM
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]