diff options
| author | Jing Yu <jingyu@google.com> | 2012-05-18 20:58:59 +0000 |
|---|---|---|
| committer | Jing Yu <jingyu@google.com> | 2012-05-18 20:58:59 +0000 |
| commit | 2068319e6a72cb3c42bcf5bf79ff1f2417e2f20a (patch) | |
| tree | 35bd80e85b6d5e50134437d1916244ccf4224f55 | |
| parent | bc183c87274978e62d1ff20356c0fd0cfe2554bc (diff) | |
2012-05-18 Jing Yu <jingyu@google.com>google/gcc-4_6_2-mobile
Backport from trunk r187586:
2012-05-16 Igor Zamyatin <igor.zamyatin@intel.com>
* configure.ac: Stack protector enabling for Android targets.
* configure: Regenerate.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/google/gcc-4_6_2-mobile@187669 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog.google-4_6 | 8 | ||||
| -rwxr-xr-x | gcc/configure | 5 | ||||
| -rw-r--r-- | gcc/configure.ac | 5 |
3 files changed, 18 insertions, 0 deletions
diff --git a/gcc/ChangeLog.google-4_6 b/gcc/ChangeLog.google-4_6 index 8fa1fb31b20..b0dbc2e5cc6 100644 --- a/gcc/ChangeLog.google-4_6 +++ b/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/configure b/gcc/configure index 19701575d9d..240905cc5e1 100755 --- a/gcc/configure +++ b/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/configure.ac b/gcc/configure.ac index 4a496edc7ee..3bd2947553e 100644 --- a/gcc/configure.ac +++ b/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*) |