aboutsummaryrefslogtreecommitdiffstats
path: root/gcc-4.9/gcc/config/i386/i386.c
diff options
context:
space:
mode:
authorThan McIntosh <thanm@google.com>2015-11-18 00:25:20 (GMT)
committerThan McIntosh <thanm@google.com>2015-11-18 00:25:20 (GMT)
commit28b834f437016df7ffdebcfd8e811d32a342ba97 (patch)
tree024381c105e8066fbcd7bb7ee68d108657281b1f /gcc-4.9/gcc/config/i386/i386.c
parent49148a0c29b81204f054d7a2f793476f7d4d7623 (diff)
downloadtoolchain_gcc-28b834f437016df7ffdebcfd8e811d32a342ba97.zip
toolchain_gcc-28b834f437016df7ffdebcfd8e811d32a342ba97.tar.gz
toolchain_gcc-28b834f437016df7ffdebcfd8e811d32a342ba97.tar.bz2
Default to TLS guard for x86 stack-protector.
Change the default guard flavor for -fstack-protector on x86 from global to TLS. The original default was intended to provide compatibility with pre-4.2. versions of Android, which is less of concern now. Bug: 25183510 Change-Id: I71931e778efed2ba0fa2a6740f8d5510776c113f
Diffstat (limited to 'gcc-4.9/gcc/config/i386/i386.c')
-rw-r--r--gcc-4.9/gcc/config/i386/i386.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/gcc-4.9/gcc/config/i386/i386.c b/gcc-4.9/gcc/config/i386/i386.c
index 865d223..fab5c88 100644
--- a/gcc-4.9/gcc/config/i386/i386.c
+++ b/gcc-4.9/gcc/config/i386/i386.c
@@ -4252,8 +4252,7 @@ ix86_option_override_internal (bool main_args_p,
/* Handle stack protector */
if (!opts_set->x_ix86_stack_protector_guard)
- opts->x_ix86_stack_protector_guard
- = TARGET_HAS_BIONIC ? SSP_GLOBAL : SSP_TLS;
+ opts->x_ix86_stack_protector_guard = SSP_TLS;
/* Handle -mmemcpy-strategy= and -mmemset-strategy= */
if (opts->x_ix86_tune_memcpy_strategy)
@@ -11310,7 +11309,7 @@ ix86_set_fp_insn ()
ix86_compute_frame_layout (&frame);
gcc_assert (frame_pointer_partially_needed);
- offset = frame.stack_pointer_offset - frame.hard_frame_pointer_offset;
+ offset = frame.stack_pointer_offset - frame.hard_frame_pointer_offset;
if (TARGET_64BIT && (offset > 0x7fffffff))
{