diff options
| author | drow <drow@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-08-23 17:42:08 +0000 |
|---|---|---|
| committer | drow <drow@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-08-23 17:42:08 +0000 |
| commit | b29dc6144f4e0f43b2970a6150393f18026c72ba (patch) | |
| tree | fa8cf18a8165c60429742925fc1d314a1344142b | |
| parent | d0ff4e646322cf50ab9f0c32d7a83876795eb584 (diff) | |
| download | gcc-b29dc6144f4e0f43b2970a6150393f18026c72ba.tar.gz | |
* configure.ac (leb128): Modify sed statement to work with any binutils
version string.
* configure: Regenerate
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@127745 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rwxr-xr-x | gcc/configure | 13 | ||||
| -rw-r--r-- | gcc/configure.ac | 13 |
3 files changed, 26 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 756ad1aa592..0fa68c41ba3 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2007-08-23 Brian Sidebotham <brian.sidebotham@gmail.com> + + * configure.ac (leb128): Modify sed statement to work with any binutils + version string. + * configure: Regenerate + 2007-08-23 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> * config/arc/arc-protos.h arc_select_cc_mode, gen_compare_reg): diff --git a/gcc/configure b/gcc/configure index 4c07ea00306..82e4edda316 100755 --- a/gcc/configure +++ b/gcc/configure @@ -14135,9 +14135,16 @@ L2:' > conftest.s # arbitrary sections are supported and try the test. as_ver=`$gcc_cv_as --version 2>/dev/null | sed 1q` if echo "$as_ver" | grep GNU > /dev/null; then - 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/'` + as_vers=`echo $as_ver | sed -n \ + -e 's,^.*[ ]\([0-9][0-9]*\.[0-9][0-9]*\)$,\1,p' \ + -e 's,^.*[ ]\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\)$,\1,p' \ + -e 's,^.*[ ]\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\)$,\1,p' \ + -e 's,^.*[ ]\([0-9][0-9]*\.[0-9][0-9]*\)[ ].*$,\1,p' \ + -e 's,^.*[ ]\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\)[ ].*$,\1,p' \ + -e 's,^.*[ ]\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\)[ ].*$,\1,p' \ + -e 's,^.*[ ]\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\)[ -].*$,\1,p'` + as_major=`expr "$as_vers" : '\([0-9]*\)'` + as_minor=`expr "$as_vers" : '[0-9]*\.\([0-9]*\)'` if test $as_major -eq 2 && test $as_minor -lt 11 then : else gcc_cv_as_leb128=yes diff --git a/gcc/configure.ac b/gcc/configure.ac index 23683d1ee66..b01f5c061ca 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -2133,9 +2133,16 @@ L2:], as_ver=`$gcc_cv_as --version 2>/dev/null | sed 1q` if echo "$as_ver" | grep GNU > /dev/null; then changequote(,)dnl - 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/'` + as_vers=`echo $as_ver | sed -n \ + -e 's,^.*[ ]\([0-9][0-9]*\.[0-9][0-9]*\)$,\1,p' \ + -e 's,^.*[ ]\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\)$,\1,p' \ + -e 's,^.*[ ]\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\)$,\1,p' \ + -e 's,^.*[ ]\([0-9][0-9]*\.[0-9][0-9]*\)[ ].*$,\1,p' \ + -e 's,^.*[ ]\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\)[ ].*$,\1,p' \ + -e 's,^.*[ ]\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\)[ ].*$,\1,p' \ + -e 's,^.*[ ]\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\)[ -].*$,\1,p'` + as_major=`expr "$as_vers" : '\([0-9]*\)'` + as_minor=`expr "$as_vers" : '[0-9]*\.\([0-9]*\)'` changequote([,])dnl if test $as_major -eq 2 && test $as_minor -lt 11 then : |