From cb3306e5bf82c6a0f6de0c98dabdb15cd7e2529e Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Fri, 31 Jul 2015 07:08:20 +0000 Subject: [PATCH] go-lang.c (go_langhook_init_options_struct): Don't set x_flag_split_stack. * go-lang.c (go_langhook_init_options_struct): Don't set x_flag_split_stack. (go_langhook_post_options): Set it here instead. From-SVN: r226428 --- gcc/go/ChangeLog | 6 ++++++ gcc/go/go-lang.c | 9 +++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/gcc/go/ChangeLog b/gcc/go/ChangeLog index b95aeb3d5fe..53ae16ba522 100644 --- a/gcc/go/ChangeLog +++ b/gcc/go/ChangeLog @@ -1,3 +1,9 @@ +2015-07-31 Andreas Schwab + + * go-lang.c (go_langhook_init_options_struct): Don't set + x_flag_split_stack. + (go_langhook_post_options): Set it here instead. + 2015-07-12 Aldy Hernandez * gofrontend/backend.h: Fix double word typos. diff --git a/gcc/go/go-lang.c b/gcc/go/go-lang.c index ad673bcc350..675b5828b29 100644 --- a/gcc/go/go-lang.c +++ b/gcc/go/go-lang.c @@ -155,10 +155,6 @@ go_langhook_init_options_struct (struct gcc_options *opts) opts->x_flag_errno_math = 0; opts->frontend_set_flag_errno_math = true; - /* We turn on stack splitting if we can. */ - if (targetm_common.supports_split_stack (false, opts)) - opts->x_flag_split_stack = 1; - /* Exceptions are used to handle recovering from panics. */ opts->x_flag_exceptions = 1; opts->x_flag_non_call_exceptions = 1; @@ -292,6 +288,11 @@ go_langhook_post_options (const char **pfilename ATTRIBUTE_UNUSED) && global_options.x_write_symbols == NO_DEBUG) global_options.x_write_symbols = PREFERRED_DEBUGGING_TYPE; + /* We turn on stack splitting if we can. */ + if (!global_options_set.x_flag_split_stack + && targetm_common.supports_split_stack (false, &global_options)) + global_options.x_flag_split_stack = 1; + /* Returning false means that the backend should be used. */ return false; } -- 2.30.2