diff --git a/ld/ChangeLog b/ld/ChangeLog
index d39c512f70..0df214ddd8 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,12 @@
+2001-12-04  Hans-Peter Nilsson  <hp@axis.com>
+
+	* emulparams/criself.sh (NO_SMALL_DATA): Set, to yes.
+	(OTHER_BSS_END_SYMBOLS): Don't refer to .sbss when setting
+	__Sbss.
+	(OTHER_END_SYMBOLS): Fix formatting.
+	* emulparams/crislinux.sh (NO_SMALL_DATA): Set, to yes.
+	(OTHER_END_SYMBOLS): Fix formatting.
+
 2001-12-04  Alan Modra  <amodra@bigpond.net.au>
 
 	* ldexp.c (exp_print_token): Correct "table" entry for RSHIFT.
diff --git a/ld/emulparams/criself.sh b/ld/emulparams/criself.sh
index f9612818f5..91fdcc5980 100644
--- a/ld/emulparams/criself.sh
+++ b/ld/emulparams/criself.sh
@@ -45,7 +45,7 @@ OTHER_SDATA_SECTIONS="${RELOCATING+PROVIDE (__Edata = .);}"
 OTHER_BSS_END_SYMBOLS='
  PROVIDE (__Ebss = .);
  PROVIDE (__end = .);
- __Sbss = SIZEOF (.sbss) != 0 ? ADDR (.sbss) : ADDR (.bss);
+ __Sbss = ADDR (.bss);
  PROVIDE (_bss_start = __Sbss);
 '
 
@@ -96,7 +96,9 @@ CTOR_END='
 '
 
 # Also add the other symbols provided for rsim/xsim and elinux.
-OTHER_END_SYMBOLS="
+OTHER_END_SYMBOLS='
   PROVIDE (__Eall = .);
   PROVIDE (__Endmem = 0x10000000); 
-  PROVIDE (__Stacksize = 0);"
+  PROVIDE (__Stacksize = 0);
+'
+NO_SMALL_DATA=yes
diff --git a/ld/emulparams/crislinux.sh b/ld/emulparams/crislinux.sh
index 259670d1d8..e54f5fbca4 100644
--- a/ld/emulparams/crislinux.sh
+++ b/ld/emulparams/crislinux.sh
@@ -31,7 +31,9 @@ OTHER_BSS_SYMBOLS='PROVIDE (__Sbss = .);'
 OTHER_BSS_END_SYMBOLS='PROVIDE (__Ebss = .);'
 
 # Also add the other symbols provided for rsim/xsim and elinux.
-OTHER_END_SYMBOLS="
+OTHER_END_SYMBOLS='
   PROVIDE (__Eall = .);
   PROVIDE (__Endmem = 0x10000000); 
-  PROVIDE (__Stacksize = 0);"
+  PROVIDE (__Stacksize = 0);
+'
+NO_SMALL_DATA=yes