diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/aclocal.m4 | 2 | ||||
| -rwxr-xr-x | gcc/configure | 4 | ||||
| -rw-r--r-- | gcc/configure.ac | 2 |
4 files changed, 11 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 8088c0c..6a273d2 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2004-09-17 Hans-Peter Nilsson <hp@bitrange.com> + + * configure.ac (gcc_cv_gld_version): Handle whitespace before + "VERSION=". + * aclocal.m4 (_gcc_COMPUTE_GAS_VERSION): Ditto. + * configure: Regenerate. + 2004-09-17 J"orn Rennecke <joern.rennecke@superh.com> * sh.c (sh_gimplify_va_arg_expr): Don't call pass_by_reference. diff --git a/gcc/aclocal.m4 b/gcc/aclocal.m4 index 6f1679e..ba49bf4 100644 --- a/gcc/aclocal.m4 +++ b/gcc/aclocal.m4 @@ -570,7 +570,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 diff --git a/gcc/configure b/gcc/configure index 8a20fd3..1f9443c 100755 --- a/gcc/configure +++ b/gcc/configure @@ -10099,7 +10099,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 @@ -10234,7 +10234,7 @@ elif test -f $gcc_cv_ld_gld_srcdir/configure.in \ fi 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 - 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` if test x$gcc_cv_gld_version != x; then break fi diff --git a/gcc/configure.ac b/gcc/configure.ac index 1ae739e..e7a8466 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -1872,7 +1872,7 @@ elif test -f $gcc_cv_ld_gld_srcdir/configure.in \ 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 |