commit 9f50f141d47319a8ccae674c39fbfdb3760f1770
author Bill Wendling <isanbard@gmail.com> Fri Mar 28 21:54:00 2008 +0000
committer Bill Wendling <isanbard@gmail.com> Fri Mar 28 21:54:00 2008 +0000
tree b4f7d686427246829d5ae3bf4990eb6bcbfa5179
parent 151ed216d1f123712770a34262a59f179cf03239

Grep should be on the same line.

llvm-svn: 48925

llvm-gcc-4.2/gcc/configure

diff --git a/llvm-gcc-4.2/gcc/configure b/llvm-gcc-4.2/gcc/configure
index 2c88c70..f892d2f 100755
--- a/llvm-gcc-4.2/gcc/configure
+++ b/llvm-gcc-4.2/gcc/configure
@@ -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

llvm-gcc-4.2/gcc/configure.ac

diff --git a/llvm-gcc-4.2/gcc/configure.ac b/llvm-gcc-4.2/gcc/configure.ac
index 9e236c3..23cb1d6 100644
--- a/llvm-gcc-4.2/gcc/configure.ac
+++ b/llvm-gcc-4.2/gcc/configure.ac
@@ -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