[csl-arm-branch] Correct detection of binutils features in unified tree

[Phil Edwards <phil@codesourcery.com>]

This patch addresses the infrastructure issues in

    http://gcc.gnu.org/ml/gcc/2004-09/msg01159.html

It does /not/ try to add minimum version strings to the checks which are
missing them.  Since the infrastructure fixes let gcc correctly look at
binutils features, the version strings aren't needed for a unified tree.

(There are probably situations which the missing strings will still bite
people, but I'm not going to troll through binutils history looking for
when each of those features was added.)

Tested using current CVS binutils for arm-none-elf.  Okay?

At least one of these changes will aldo be applied to trunk; that patch
will come tomorrow after testing.


2004-10-05  Phil Edwards  <phil@codesourcery.com>

	* gcc/aclocal.m4 (_gcc_COMPUTE_GAS_VERSION):  Handle leading
	whitespace in binutils files (copy from trunk).
	* gcc/configure.ac (assembler check):  Always assign to gcc_cv_as.
	(linker check):  Handle leading whitespace in binutils files (copy
	from trunk).  Always assign to gcc_cv_ld.
	* gcc/configure:  Regenerated.


Index: gcc/aclocal.m4
===================================================================
RCS file: /cvs/gcc/gcc/gcc/aclocal.m4,v
retrieving revision 1.80.4.3
diff -u -p -r1.80.4.3 aclocal.m4
--- gcc/aclocal.m4	16 Aug 2004 17:12:52 -0000	1.80.4.3
+++ gcc/aclocal.m4	6 Oct 2004 00:08:02 -0000
@@ -676,7 +676,7 @@ for f in $gcc_cv_as_bfd_srcdir/configure
          $gcc_cv_as_gas_srcdir/configure \
          $gcc_cv_as_gas_srcdir/configure.in \
          $gcc_cv_as_gas_srcdir/Makefile.in ; do
-  gcc_cv_gas_version=`grep '^VERSION=[[0-9]]*\.[[0-9]]*' $f`
+  gcc_cv_gas_version=`sed -n -e 's/^[[ 	]]*\(VERSION=[[0-9]]*\.[[0-9]]*.*\)/\1/p' < $f`
   if test x$gcc_cv_gas_version != x; then
     break
   fi
Index: gcc/configure.ac
===================================================================
RCS file: /cvs/gcc/gcc/gcc/configure.ac,v
retrieving revision 2.19.2.4
diff -u -p -r2.19.2.4 configure.ac
--- gcc/configure.ac	10 Sep 2004 19:22:40 -0000	2.19.2.4
+++ gcc/configure.ac	6 Oct 2004 00:08:05 -0000
@@ -1586,6 +1586,7 @@ elif test -f $gcc_cv_as_gas_srcdir/confi
   _gcc_COMPUTE_GAS_VERSION
   rm -f as$host_exeext
   $symbolic_link ../gas/as-new$host_exeext as$host_exeext 2>/dev/null
+  gcc_cv_as=./as$host_exeext
   in_tree_gas_is_elf=no
   if grep 'obj_format = elf' ../gas/Makefile > /dev/null \
      || (grep 'obj_format = multi' ../gas/Makefile \
@@ -1696,7 +1697,7 @@ elif test -f $gcc_cv_ld_gld_srcdir/confi
 	for f in $gcc_cv_ld_bfd_srcdir/configure $gcc_cv_ld_gld_srcdir/configure $gcc_cv_ld_gld_srcdir/configure.in $gcc_cv_ld_gld_srcdir/Makefile.in
 	do
 changequote(,)dnl
-		gcc_cv_gld_version=`grep '^VERSION=[0-9]*\.[0-9]*' $f`
+		gcc_cv_gld_version=`sed -n -e 's/^[[ 	]]*\(VERSION=[[0-9]]*\.[[0-9]]*.*\)/\1/p' < $f`
 changequote([,])dnl
 		if test x$gcc_cv_gld_version != x; then
 			break
@@ -1709,6 +1710,7 @@ changequote([,])dnl
 	rm -f collect-ld$host_exeext
 	$symbolic_link ../ld/ld-new$host_exeext collect-ld$host_exeext \
 		2>/dev/null
+	gcc_cv_ld=./collect-ld$host_exeext
 fi
 
 if test "x$gcc_cv_ld" = x; then