diff options
| -rw-r--r-- | gcc-4.6/gcc/ChangeLog.google-4_6 | 8 | ||||
| -rwxr-xr-x | gcc-4.6/gcc/configure | 5 | ||||
| -rw-r--r-- | gcc-4.6/gcc/configure.ac | 5 |
3 files changed, 18 insertions, 0 deletions
diff --git a/gcc-4.6/gcc/ChangeLog.google-4_6 b/gcc-4.6/gcc/ChangeLog.google-4_6 index 8fa1fb31b..97115a2fc 100644 --- a/gcc-4.6/gcc/ChangeLog.google-4_6 +++ b/gcc-4.6/gcc/ChangeLog.google-4_6 @@ -1,3 +1,11 @@ +2012-05-18 Jing Yu <jingyu@google.com> + + Backport from trunk r187586: + 2012-05-16 Igor Zamyatin <igor.zamyatin@intel.com> + + * configure.ac: Stack protector enabling for Android targets. + * configure: Regenerate. + 2012-05-07 Jing Yu <jingyu@google.com> Backport r186560 and r185958 from gcc trunk diff --git a/gcc-4.6/gcc/configure b/gcc-4.6/gcc/configure index 19701575d..240905cc5 100755 --- a/gcc-4.6/gcc/configure +++ b/gcc-4.6/gcc/configure @@ -25942,6 +25942,11 @@ else $target_header_dir/bits/uClibc_config.h > /dev/null; then gcc_cv_libc_provides_ssp=yes fi + # all versions of Bionic support stack protector + elif test -f $target_header_dir/sys/cdefs.h \ + && $EGREP '^[ ]*#[ ]*define[ ]+__BIONIC__[ ]+1' \ + $target_header_dir/sys/cdefs.h > /dev/null; then + gcc_cv_libc_provides_ssp=yes fi ;; *-*-gnu*) diff --git a/gcc-4.6/gcc/configure.ac b/gcc-4.6/gcc/configure.ac index 4a496edc7..3bd294755 100644 --- a/gcc-4.6/gcc/configure.ac +++ b/gcc-4.6/gcc/configure.ac @@ -4415,6 +4415,11 @@ AC_CACHE_CHECK(__stack_chk_fail in target C library, $target_header_dir/bits/uClibc_config.h > /dev/null; then gcc_cv_libc_provides_ssp=yes fi + # all versions of Bionic support stack protector + elif test -f $target_header_dir/sys/cdefs.h \ + && $EGREP '^[ ]*#[ ]*define[ ]+__BIONIC__[ ]+1' \ + $target_header_dir/sys/cdefs.h > /dev/null; then + gcc_cv_libc_provides_ssp=yes fi] ;; *-*-gnu*) |