diff options
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rwxr-xr-x | gcc/configure | 2 | ||||
| -rw-r--r-- | gcc/configure.in | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 195d90a8c34..12a84cd9d0e 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2001-10-30 Zack Weinberg <zack@codesourcery.com> + + * configure.in: Correct previous change: don't assume that + gas's version number _isn't_ the last thing on the line, or + isn't the only number on the line, either. + * configure: Regenerate. + 2001-10-30 Kazu Hirata <kazu@hxi.com> * cfgcleanup.c: Fix a comment typo. diff --git a/gcc/configure b/gcc/configure index 9ddc44ff67f..5c2141d42c2 100755 --- a/gcc/configure +++ b/gcc/configure @@ -7207,7 +7207,7 @@ EOF # arbitrary sections are supported and try the test. as_ver=`$gcc_cv_as --version 2>/dev/null | head -1` if echo "$as_ver" | grep GNU > /dev/null; then - as_ver=`echo $as_ver | sed -e 's/.* \([0-9.][0-9.]*\) .*/\1/'` + as_ver=`echo $as_ver | sed -e 's/GNU assembler \([0-9.][0-9.]*\).*/\1/'` as_major=`echo $as_ver | sed 's/\..*//'` as_minor=`echo $as_ver | sed 's/[^.]*\.\([0-9]*\).*/\1/'` if test $as_major -eq 2 -a $as_minor -lt 11; then diff --git a/gcc/configure.in b/gcc/configure.in index 2e32cf1ed9e..96518c3b0b1 100644 --- a/gcc/configure.in +++ b/gcc/configure.in @@ -1383,7 +1383,7 @@ EOF as_ver=`$gcc_cv_as --version 2>/dev/null | head -1` if echo "$as_ver" | grep GNU > /dev/null; then changequote(,)dnl - as_ver=`echo $as_ver | sed -e 's/.* \([0-9.][0-9.]*\) .*/\1/'` + as_ver=`echo $as_ver | sed -e 's/GNU assembler \([0-9.][0-9.]*\).*/\1/'` as_major=`echo $as_ver | sed 's/\..*//'` as_minor=`echo $as_ver | sed 's/[^.]*\.\([0-9]*\).*/\1/'` changequote([,])dnl |