diff options
| author | Hans-Peter Nilsson <hp@bitrange.com> | 2012-10-11 00:52:26 +0000 |
|---|---|---|
| committer | Hans-Peter Nilsson <hp@gcc.gnu.org> | 2012-10-11 00:52:26 +0000 |
| commit | 81179208c066d1bbd1f47c3e3c6c863f418fdd3e (patch) | |
| tree | caab9a75374f7e11793ed8f8ccf2951b10f99ca8 /gcc/acinclude.m4 | |
| parent | f4ffd857779932b963c03b595ae320a2bb396282 (diff) | |
| download | gcc-81179208c066d1bbd1f47c3e3c6c863f418fdd3e.zip gcc-81179208c066d1bbd1f47c3e3c6c863f418fdd3e.tar.gz gcc-81179208c066d1bbd1f47c3e3c6c863f418fdd3e.tar.bz2 | |
acinclude.m4 (_gcc_COMPUTE_GAS_VERSION): Allow a single character to quote the VERSION= contents.
* acinclude.m4 (_gcc_COMPUTE_GAS_VERSION): Allow a single
character to quote the VERSION= contents. Sanity-check contents.
* configure.ac ("what linker to use" ld version extraction): Ditto.
* configure: Regenerate.
From-SVN: r192342
Diffstat (limited to 'gcc/acinclude.m4')
| -rw-r--r-- | gcc/acinclude.m4 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gcc/acinclude.m4 b/gcc/acinclude.m4 index c24464b..fe7c5b6 100644 --- a/gcc/acinclude.m4 +++ b/gcc/acinclude.m4 @@ -393,11 +393,15 @@ 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=`sed -n -e 's/^[[ ]]*\(VERSION=[[0-9]]*\.[[0-9]]*.*\)/\1/p' < $f` + gcc_cv_gas_version=`sed -n -e 's/^[[ ]]*VERSION=[[^0-9A-Za-z_]]*\([[0-9]]*\.[[0-9]]*.*\)/VERSION=\1/p' < $f` if test x$gcc_cv_gas_version != x; then break fi done +case $gcc_cv_gas_version in + VERSION=[[0-9]]*) ;; + *) AC_MSG_ERROR([[cannot find version of in-tree assembler]]);; +esac gcc_cv_gas_major_version=`expr "$gcc_cv_gas_version" : "VERSION=\([[0-9]]*\)"` gcc_cv_gas_minor_version=`expr "$gcc_cv_gas_version" : "VERSION=[[0-9]]*\.\([[0-9]]*\)"` gcc_cv_gas_patch_version=`expr "$gcc_cv_gas_version" : "VERSION=[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)"` |