From 28b834f437016df7ffdebcfd8e811d32a342ba97 Mon Sep 17 00:00:00 2001 From: Than McIntosh Date: Tue, 17 Nov 2015 19:25:20 -0500 Subject: 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 --- gcc-4.9/gcc/config/i386/i386.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gcc-4.9/gcc') diff --git a/gcc-4.9/gcc/config/i386/i386.c b/gcc-4.9/gcc/config/i386/i386.c index 865d22352..fab5c88b2 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)) { -- cgit v1.2.3