summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartynas Venckus <martynas@cvs.openbsd.org>2014-05-27 19:23:56 +0000
committerMartynas Venckus <martynas@cvs.openbsd.org>2014-05-27 19:23:56 +0000
commit8481d5dfd4ae4de6716a8c7064906056a6f53fc7 (patch)
treea476fe24743bb77dfb96d244e80ad9bfcf060b7d
parentcbfeb5f09e16d2508c23b8fb82df125dbac280c0 (diff)
Enable strong stack protector by default for GCC 3 architectures.
Miod says all architectures work with it now (thanks to his fix for the pf.c bug).
-rw-r--r--gnu/usr.bin/gcc/gcc/toplev.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/usr.bin/gcc/gcc/toplev.c b/gnu/usr.bin/gcc/gcc/toplev.c
index cfcacd3450a..822c51a7942 100644
--- a/gnu/usr.bin/gcc/gcc/toplev.c
+++ b/gnu/usr.bin/gcc/gcc/toplev.c
@@ -926,9 +926,9 @@ int force_align_functions_log;
#if defined(STACK_PROTECTOR) && defined(STACK_GROWS_DOWNWARD)
/* Nonzero means use propolice as a stack protection method */
-int flag_propolice_protection = 1;
+int flag_propolice_protection = 0;
int flag_stack_protection = 0;
-int flag_strong_protection = 0;
+int flag_strong_protection = 1;
#else
int flag_propolice_protection = 0;
int flag_stack_protection = 0;
@@ -1225,7 +1225,7 @@ static const lang_independent_options f_options[] =
N_("Trap for signed overflow in addition / subtraction / multiplication") },
{ "new-ra", &flag_new_regalloc, 1,
N_("Use graph coloring register allocation.") },
- {"stack-protector", &flag_propolice_protection, 1,
+ {"stack-protector", &flag_strong_protection, 1,
N_("Enables stack protection") },
{"stack-protector-all", &flag_stack_protection, 1,
N_("Enables stack protection of every function") },