diff options
| author | Bernhard Fischer <aldot@gcc.gnu.org> | 2008-01-27 17:43:07 +0100 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <aldot@gcc.gnu.org> | 2008-01-27 17:43:07 +0100 |
| commit | fed6d628493ab74e3c2cb35a7d6f578c01c40d4d (patch) | |
| tree | a76f0f92a7bbfae9237dd6348286aedc522d72dc /gcc | |
| parent | e5df4fb1faba7689ee50e4b08c0dc9bbeb45bde2 (diff) | |
| download | gcc-fed6d628493ab74e3c2cb35a7d6f578c01c40d4d.zip gcc-fed6d628493ab74e3c2cb35a7d6f578c01c40d4d.tar.gz gcc-fed6d628493ab74e3c2cb35a7d6f578c01c40d4d.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rwxr-xr-x | gcc/configure | 8 | ||||
| -rw-r--r-- | gcc/configure.ac | 8 |
3 files changed, 20 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 67c51c4..4a404c6 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 034bfad..5581fd6 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 ae786d6..18406c7 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], |