diff options
| author | Than McIntosh <thanm@google.com> | 2015-11-20 22:21:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-11-20 22:21:01 +0000 |
| commit | 969c2e570500ecc6d091784950f52d0cc6637809 (patch) | |
| tree | 71331b3c35094fb58a4bc8240a2fe74dfdeb4ea4 /gcc-4.9 | |
| parent | 2b2fba4c210788ab3867638889d20adcd4a0520b (diff) | |
| parent | 28b834f437016df7ffdebcfd8e811d32a342ba97 (diff) | |
| download | toolchain_gcc-969c2e570500ecc6d091784950f52d0cc6637809.tar.gz toolchain_gcc-969c2e570500ecc6d091784950f52d0cc6637809.tar.bz2 toolchain_gcc-969c2e570500ecc6d091784950f52d0cc6637809.zip | |
Merge "Default to TLS guard for x86 stack-protector."
Diffstat (limited to 'gcc-4.9')
| -rw-r--r-- | gcc-4.9/gcc/config/i386/i386.c | 5 |
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 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)) { |