Update.

2001-05-11  Andreas Jaeger  <aj@suse.de>

	* sysdeps/unix/sysv/linux/configure.in: Check binutils version on
	MIPS.

	* sysdeps/mips/rtld-ldscript.in: Removed unneeded binary output
	format directive.  Patch by Steven J. Hill <sjhill@cotw.com>.

4 files changed, 74 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index ec658a397c..deb157bcd4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-05-11  Andreas Jaeger  <aj@suse.de>
+
+	* sysdeps/unix/sysv/linux/configure.in: Check binutils version on
+	MIPS.
+
+	* sysdeps/mips/rtld-ldscript.in: Removed unneeded binary output
+	format directive.  Patch by Steven J. Hill <sjhill@cotw.com>.
+
 2001-05-11  Roland McGrath  <roland@frob.com>
 
 	* sysdeps/mach/hurd/Makefile ($(link-rpcuserlibs)): Don't use
diff --git a/FAQ.in b/FAQ.in
index 7c2458780a..cbe55ea871 100644
--- a/FAQ.in
+++ b/FAQ.in
@@ -366,11 +366,11 @@ newer.
 
 ??mips	Which tools should I use for MIPS?
 
-{AJ} You should use the current development version of gcc 2.97 from CVS.
-gcc 2.95.x does not work correctly on mips-linux.
+{AJ} You should use the current development version of gcc 3.0 or newer from
+CVS.  gcc 2.95.x does not work correctly on mips-linux.
 
-You need also recent binutils, anything before and including 2.10 will not
-work correctly.  Either try the Linux binutils 2.10.0.33 from HJ Lu or the
+You need also recent binutils, anything before and including 2.11 will not
+work correctly.  Either try the Linux binutils 2.11.90.0.5 from HJ Lu or the
 current development version of binutils from CVS.
 
 Please note that `make check' might fail for a number of the math tests
diff --git a/sysdeps/mips/rtld-ldscript.in b/sysdeps/mips/rtld-ldscript.in
index 7c9f65f3e7..c9b5e71195 100644
--- a/sysdeps/mips/rtld-ldscript.in
+++ b/sysdeps/mips/rtld-ldscript.in
@@ -1,4 +1,3 @@
-OUTPUT_FORMAT("@@rtld-oformat@@")
 OUTPUT_ARCH(@@rtld-arch@@)
 ENTRY(@@rtld-entry@@)
 SECTIONS
diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure
index f852718906..04a2d1a37b 100644
--- a/sysdeps/unix/sysv/linux/configure
+++ b/sysdeps/unix/sysv/linux/configure
@@ -224,3 +224,65 @@ ${ac_prefix}/include directory out of the way." 1>&2; exit 1; }
     echo "$ac_t""ok" 1>&6
   fi
 fi
+
+case "$machine" in
+  mips*)
+	for ac_prog in $AS
+do
+# Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:236: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$AS"; then
+  ac_cv_prog_AS="$AS" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_AS="$ac_prog"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+AS="$ac_cv_prog_AS"
+if test -n "$AS"; then
+  echo "$ac_t""$AS" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+test -n "$AS" && break
+done
+
+if test -z "$AS"; then
+  ac_verc_fail=yes
+else
+  # Found it, now check the version.
+  echo $ac_n "checking version of $AS""... $ac_c" 1>&6
+echo "configure:270: checking version of $AS" >&5
+  ac_prog_version=`$AS --version 2>&1 | sed -n 's/^.*GNU assembler.* \([0-9]*\.[0-9.]*\(-ia64-[0-9]*\)*\).*$/\1/p'`
+  case $ac_prog_version in
+    '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
+    2.11.90.0.[5-9]* | 2.11.90.[1-9]* | 2.11.9[1-9]* | 2.11.[1-9]* | 2.1[2-9]*| 2.[2-9]*)
+       ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
+    *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
+
+  esac
+  echo "$ac_t""$ac_prog_version" 1>&6
+fi
+if test $ac_verc_fail = yes; then
+  echo "configure: warning: *** Your binutils versions are too old.  
+*** We strongly advise to update binutils.  For details check 
+*** the FAQ and INSTALL documents." 1>&2
+fi
+
+	;;
+esac
+s%@AS@%$AS%g