From: Bernhard Fischer <aldot@gcc.gnu.org>
Date: Sun, 27 Jan 2008 16:43:07 +0000 (+0100)
Subject: configure.ac (__stack_chk_fail): Add detecion for availability of SSP in uClibc by... 
X-Git-Tag: releases/gcc-4.3.0~370
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fed6d628493ab74e3c2cb35a7d6f578c01c40d4d;p=thirdparty%2Fgcc.git

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

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 67c51c421fd4..4a404c65f907 100644
--- 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 034bfad2bab2..5581fd628d2b 100755
--- 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 ae786d663fbf..18406c7221f4 100644
--- 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],