[llvm-commits] [llvm-gcc-4.2] r48925 - in /llvm-gcc-4.2/trunk/gcc: configure configure.ac

[Bill Wendling]

Author: void
Date: Fri Mar 28 16:54:00 2008
New Revision: 48925

URL: http://llvm.org/viewvc/llvm-project?rev=48925&view=rev
Log:
Grep should be on the same line.

Modified:
    llvm-gcc-4.2/trunk/gcc/configure
    llvm-gcc-4.2/trunk/gcc/configure.ac

Modified: llvm-gcc-4.2/trunk/gcc/configure
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/configure?rev=48925&r1=48924&r2=48925&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/configure (original)
+++ llvm-gcc-4.2/trunk/gcc/configure Fri Mar 28 16:54:00 2008
@@ -16454,17 +16454,14 @@
       # glibc 2.4 and later provides __stack_chk_fail and
       # either __stack_chk_guard, or TLS access to stack guard canary.
       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' \
              $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
         fi

Modified: llvm-gcc-4.2/trunk/gcc/configure.ac
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/configure.ac?rev=48925&r1=48924&r2=48925&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/configure.ac (original)
+++ llvm-gcc-4.2/trunk/gcc/configure.ac Fri Mar 28 16:54:00 2008
@@ -3339,17 +3339,14 @@
       # glibc 2.4 and later provides __stack_chk_fail and
       # either __stack_chk_guard, or TLS access to stack guard canary.
       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' \
              $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
         fi