* emulparams/criself.sh (EXECUTABLE_SYMBOLS): Cannot provide

	correct value of __Stext here.
	(TEXT_START_SYMBOLS): Define; always define __Stext, to start of
	.startup section.

	* emulparams/crislinux.sh: Remove FIXME.

2 files changed, 7 insertions, 7 deletions

diff --git a/ld/emulparams/criself.sh b/ld/emulparams/criself.sh
index 4acd56a35b..b2576342a1 100644
--- a/ld/emulparams/criself.sh
+++ b/ld/emulparams/criself.sh
@@ -15,14 +15,16 @@ TEXT_START_ADDR=0
 # Put crt0 for flash/eprom etc. in this section.
 INITIAL_READONLY_SECTIONS='.startup : { KEEP(*(.startup)) }'
 
-# TEXT_START_SYMBOLS doesn't get what we want which is the start of
-# all read-only sections; there's at least .init and .fini before it.
-# We have to resort to trickery.
-#
+# Setting __Stext to . in TEXT_START_SYMBOLS doesn't get what we want
+# most of the time, which is the start of all read-only sections;
+# there's at least .startup and .init before it.  We have to resort to
+# trickery.  Note that __Stext is always defined, not PROVIDE:d, since
+# external tools look for it.
+TEXT_START_SYMBOLS='__Stext = ADDR (.startup);'
+
 # The __start dance is to get us through assumptions about entry
 # symbols, and to clear _start for normal use with sane programs.
 EXECUTABLE_SYMBOLS='
-PROVIDE (__Stext = .);
 __start = DEFINED(__start) ? __start : 
   DEFINED(_start) ? _start : 
     DEFINED(start) ? start :
diff --git a/ld/emulparams/crislinux.sh b/ld/emulparams/crislinux.sh
index 6be4f5803f..c5ff27f568 100644
--- a/ld/emulparams/crislinux.sh
+++ b/ld/emulparams/crislinux.sh
@@ -16,8 +16,6 @@ TEXT_START_ADDR=0x80000
 
 MAXPAGESIZE=8192
 
-# FIXME: GOT, PLT...
-
 # We don't do the hoops through DEFINED to provide [_]*start, as it
 # doesn't work with --gc-sections, and the start-name is pretty fixed
 # anyway.