diff --git a/ld/ChangeLog b/ld/ChangeLog
index e0ccf8baab..27af4c8b0b 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2003-07-04  J"orn Rennecke <joern.rennecke@superh.com>
+
+	* emulparams/shelf32.sh (STACK_ADDR): Don't define.
+	(OTHER_SECTIONS): Include .stack.
+	* emulparams/shelf64.sh (OTHER_SECTIONS): Likewise.
+
 2003-07-02  Jakub Jelinek  <jakub@redhat.com>
 
 	* emulparams/elf64_ia64.sh (OTHER_READONLY_SECTIONS): Don't include
diff --git a/ld/emulparams/shelf32.sh b/ld/emulparams/shelf32.sh
index c05da3f90b..757f6a7c93 100644
--- a/ld/emulparams/shelf32.sh
+++ b/ld/emulparams/shelf32.sh
@@ -3,7 +3,6 @@
 SCRIPT_NAME=elf
 OUTPUT_FORMAT=${OUTPUT_FORMAT-"elf32-sh64"}
 TEXT_START_ADDR=0x1000
-STACK_ADDR='ALIGN (0x40000) + 0x40000'
 MAXPAGESIZE=128
 ARCH=sh
 MACHINE=sh5
@@ -34,9 +33,21 @@ DTOR_END='___dtors_end = .;'
 # Do not use the varname=${varname-'string'} construct here; there are
 # problems with that on some shells (e.g. on Solaris) where there is a bug
 # that trigs when $varname contains a "}".
-OTHER_SECTIONS='
+# The effect of the .stack definition is like setting STACK_ADDR to 0x80000,
+# except that the setting can be overridden, e.g. --defsym _stack=0xff000,
+# and that we put an extra sentinal value at the bottom.
+# N.B. We can't use PROVIDE to set the default value in a symbol because
+# the address is needed to place the .stack section, which in turn is needed
+# to hold the sentinel value(s).
+OTHER_SECTIONS="
+ .stack ${RELOCATING-0}${RELOCATING+(DEFINED(_stack) ? _stack : ALIGN (0x40000) + 0x40000)} :
+  {
+    ${RELOCATING+_stack = .;}
+    *(.stack)
+    LONG(0xdeaddead)
+  }
  .cranges 0 : { *(.cranges) }
-'
+"
 
 # We need to adjust sizes in the .cranges section after relaxation, so
 # we need an after_allocation function, and it goes in this file.
diff --git a/ld/emulparams/shelf64.sh b/ld/emulparams/shelf64.sh
index 2c9a9c513b..61a0c8bea8 100644
--- a/ld/emulparams/shelf64.sh
+++ b/ld/emulparams/shelf64.sh
@@ -6,4 +6,11 @@ EXTRA_EM_FILE=
 . ${srcdir}/emulparams/shelf32.sh
 
 # We do not need .cranges
-OTHER_SECTIONS=''
+OTHER_SECTIONS="
+ .stack ${RELOCATING-0}${RELOCATING+(DEFINED(_stack) ? _stack : ALIGN (0x40000) + 0x40000)} :
+  {
+    ${RELOCATING+_stack = .;}
+    *(.stack)
+    LONG(0xdeaddead)
+  }
+"