configure.ac (__stack_chk_fail): Add detecion for availability of SSP in uClibc by...

2008-01-27  Bernhard Fischer  <aldot@gcc.gnu.org>

	* configure.ac (__stack_chk_fail): Add detecion for availability
	of SSP in uClibc by checking if __UCLIBC_HAS_SSP__ is defined.
	* configure: Regenerate.

From-SVN: r131884

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 67c51c421fd413ce71cfd9832ec0b5c6c900caec..4a404c65f907902f1dae12de9a615657e3b080bd 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-27  Bernhard Fischer  <aldot@gcc.gnu.org>
+
+       * configure.ac (__stack_chk_fail): Add detecion for availability
+       of SSP in uClibc by checking if __UCLIBC_HAS_SSP__ is defined.
+       * configure: Regenerate.
+
 2008-01-26  Maxim Kuvyrkov  <maxim@codesourcery.com>
 
        PR middle-end/34688

diff --git a/gcc/configure b/gcc/configure
index 034bfad2bab2f0c72b3c18c2d4619fb885def9d9..5581fd628d2ba915e87fea9f160f4e2bfb366993 100755 (executable)
--- a/gcc/configure
+++ b/gcc/configure
@@ -16662,8 +16662,14 @@ else
             && $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' \
+            $glibc_header_dir/features.h > /dev/null && \
+            test -f $glibc_header_dir/bits/uClibc_config.h && \
+            $EGREP '^[         ]*#[    ]*define[       ]+__UCLIBC_HAS_SSP__[   ]+1' \
+            $glibc_header_dir/bits/uClibc_config.h > /dev/null; then
+         gcc_cv_libc_provides_ssp=yes
        fi
-        fi
+      fi
        ;;
        *-*-darwin*)
         echo "$as_me:$LINENO: checking for __stack_chk_fail" >&5

diff --git a/gcc/configure.ac b/gcc/configure.ac
index ae786d663fbfe389c46b9b470dc878b6ae73bfa0..18406c7221f4e700ce56788a15de8eeae86fa627 100644 (file)
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -3398,8 +3398,14 @@ AC_CACHE_CHECK(__stack_chk_fail in target C library,
             && $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' \
+            $glibc_header_dir/features.h > /dev/null && \
+            test -f $glibc_header_dir/bits/uClibc_config.h && \
+            $EGREP '^@<:@      @:>@*#[         ]*define[       ]+__UCLIBC_HAS_SSP__[   ]+1' \
+            $glibc_header_dir/bits/uClibc_config.h > /dev/null; then
+         gcc_cv_libc_provides_ssp=yes
        fi
-        fi
+      fi
        ;;
        *-*-darwin*)
         AC_CHECK_FUNC(__stack_chk_fail,[gcc_cv_libc_provides_ssp=yes],