diff options
| author | Uros Bizjak <ubizjak@gmail.com> | 2010-02-18 22:42:23 +0100 |
|---|---|---|
| committer | Uros Bizjak <uros@gcc.gnu.org> | 2010-02-18 22:42:23 +0100 |
| commit | 1a242e3cea4a90d5fa893e2509174c8a2e9a0aaa (patch) | |
| tree | 35a4d9e0d7268f07b72c6054b28c4c96c2c3356b | |
| parent | 3378b6fa11d580d859b6bc8af7a5228fed4ff791 (diff) | |
| download | gcc-1a242e3cea4a90d5fa893e2509174c8a2e9a0aaa.zip gcc-1a242e3cea4a90d5fa893e2509174c8a2e9a0aaa.tar.gz gcc-1a242e3cea4a90d5fa893e2509174c8a2e9a0aaa.tar.bz2 | |
configure.ac (gnu-unique-object): Wrap regexps using [] in changequote block.
* configure.ac (gnu-unique-object): Wrap regexps using [] in
changequote block.
(__stack_chk_fail): Ditto. Remove quadrigraphs.
* configure: Regenerated.
From-SVN: r156876
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rwxr-xr-x | gcc/configure | 4 | ||||
| -rw-r--r-- | gcc/configure.ac | 16 |
3 files changed, 19 insertions, 8 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 64ca853..f7b78f9 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2010-02-18 Uros Bizjak <ubizjak@gmail.com> + + * configure.ac (gnu-unique-object): Wrap regexps using [] in + changequote block. + (__stack_chk_fail): Ditto. Remove quadrigraphs. + * configure: Regenerated. + 2010-02-18 Ulrich Weigand <Ulrich.Weigand@de.ibm.com> * config/spu/spu-c.c (spu_resolve_overloaded_builtin): Call diff --git a/gcc/configure b/gcc/configure index 4fc3b10..92ee2e9 100755 --- a/gcc/configure +++ b/gcc/configure @@ -24221,8 +24221,8 @@ if test $gcc_cv_as_gnu_unique_object = yes; then # Also check for ld.so support, i.e. glibc 2.11 or higher. if test x$host = x$build -a x$host = x$target && glibcver=`ldd --version 2>/dev/null | sed 's/.* //;q'`; then - glibcmajor=`expr "$glibcver" : "\(0-9*\)"` - glibcminor=`expr "$glibcver" : "2-9*\.\(0-9*\)"` + glibcmajor=`expr "$glibcver" : "\([0-9]*\)"` + glibcminor=`expr "$glibcver" : "[2-9]*\.\([0-9]*\)"` glibcnum=`expr $glibcmajor \* 1000 + $glibcminor` if test "$glibcnum" -ge 2011 ; then enable_gnu_unique_object=yes diff --git a/gcc/configure.ac b/gcc/configure.ac index b75cc76..621740f 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -3568,8 +3568,10 @@ Valid choices are 'yes' and 'no'.]) ;; # Also check for ld.so support, i.e. glibc 2.11 or higher. [if test x$host = x$build -a x$host = x$target && glibcver=`ldd --version 2>/dev/null | sed 's/.* //;q'`; then +changequote(,)dnl glibcmajor=`expr "$glibcver" : "\([0-9]*\)"` glibcminor=`expr "$glibcver" : "[2-9]*\.\([0-9]*\)"` +changequote([,])dnl glibcnum=`expr $glibcmajor \* 1000 + $glibcminor` if test "$glibcnum" -ge 2011 ; then enable_gnu_unique_object=yes @@ -3869,25 +3871,27 @@ AC_CACHE_CHECK(__stack_chk_fail in target C library, fi # glibc 2.4 and later provides __stack_chk_fail and # either __stack_chk_guard, or TLS access to stack guard canary. +changequote(,)dnl if test -f $glibc_header_dir/features.h \ - && $EGREP '^@<:@ @:>@*#[ ]*define[ ]+__GNU_LIBRARY__[ ]+([1-9][0-9]|[6-9])' \ + && $EGREP '^[ ]*#[ ]*define[ ]+__GNU_LIBRARY__[ ]+([1-9][0-9]|[6-9])' \ $glibc_header_dir/features.h > /dev/null; then - if $EGREP '^@<:@ @:>@*#[ ]*define[ ]+__GLIBC__[ ]+([1-9][0-9]|[3-9])' \ + if $EGREP '^[ ]*#[ ]*define[ ]+__GLIBC__[ ]+([1-9][0-9]|[3-9])' \ $glibc_header_dir/features.h > /dev/null; then gcc_cv_libc_provides_ssp=yes - elif $EGREP '^@<:@ @:>@*#[ ]*define[ ]+__GLIBC__[ ]+2' \ + elif $EGREP '^[ ]*#[ ]*define[ ]+__GLIBC__[ ]+2' \ $glibc_header_dir/features.h > /dev/null \ - && $EGREP '^@<:@ @:>@*#[ ]*define[ ]+__GLIBC_MINOR__[ ]+([1-9][0-9]|[4-9])' \ + && $EGREP '^[ ]*#[ ]*define[ ]+__GLIBC_MINOR__[ ]+([1-9][0-9]|[4-9])' \ $glibc_header_dir/features.h > /dev/null; then gcc_cv_libc_provides_ssp=yes - elif $EGREP '^@<:@ @:>@*#[ ]*define[ ]+__UCLIBC__[ ]+1' \ + elif $EGREP '^[ ]*#[ ]*define[ ]+__UCLIBC__[ ]+1' \ $glibc_header_dir/features.h > /dev/null && \ test -f $glibc_header_dir/bits/uClibc_config.h && \ - $EGREP '^@<:@ @:>@*#[ ]*define[ ]+__UCLIBC_HAS_SSP__[ ]+1' \ + $EGREP '^[ ]*#[ ]*define[ ]+__UCLIBC_HAS_SSP__[ ]+1' \ $glibc_header_dir/bits/uClibc_config.h > /dev/null; then gcc_cv_libc_provides_ssp=yes fi fi +changequote([,])dnl ;; *-*-gnu*) # Avoid complicated tests (see |