diff --git a/gcc/ChangeLog b/gcc/ChangeLog index cffba023973..76a2ccfc681 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,14 @@ +2016-01-20 Christian Bruel + + PR target/69245 + * config/arm/arm-c.c (arm_pragma_target_parse): Add comments. + Move arm_reset_previous_fndecl and set_target_option_current_node in + the conditional part. Call save_restore_target_globals. + * config/arm/arm.c (arm_set_current_function): + Refactor to better support #pragma target and attribute mix. + Call save_restore_target_globals. + * config/arm/arm-protos.h (save_restore_target_globals): New function. + 2016-01-27 Martin Liska * hsa.c (hsa_summary_t::link_functions): Create IPA_REF_ADDR diff --git a/gcc/config/arm/arm-c.c b/gcc/config/arm/arm-c.c index df84bef3ca1..195905fa25b 100644 --- a/gcc/config/arm/arm-c.c +++ b/gcc/config/arm/arm-c.c @@ -221,9 +221,6 @@ arm_pragma_target_parse (tree args, tree pop_target) } } - target_option_current_node = cur_tree; - arm_reset_previous_fndecl (); - /* Figure out the previous mode. */ prev_opt = TREE_TARGET_OPTION (prev_tree); cur_opt = TREE_TARGET_OPTION (cur_tree); @@ -259,6 +256,18 @@ arm_pragma_target_parse (tree args, tree pop_target) arm_cpu_builtins (parse_in); cpp_opts->warn_unused_macros = saved_warn_unused_macros; + + /* Make sure that target_reinit is called for next function, since + TREE_TARGET_OPTION might change with the #pragma even if there is + no target attribute attached to the function. */ + arm_reset_previous_fndecl (); + + /* If going to the default mode, we restore the initial states. + if cur_tree is a new target, states will be saved/restored on a per + function basis in arm_set_current_function. */ + if (cur_tree == target_option_default_node) + save_restore_target_globals (cur_tree); + } return true; diff --git a/gcc/config/arm/arm-protos.h b/gcc/config/arm/arm-protos.h index 28f226324a0..8261ed80290 100644 --- a/gcc/config/arm/arm-protos.h +++ b/gcc/config/arm/arm-protos.h @@ -332,6 +332,7 @@ extern bool arm_autoinc_modes_ok_p (machine_mode, enum arm_auto_incmodes); extern void arm_emit_eabi_attribute (const char *, int, int); extern void arm_reset_previous_fndecl (void); +extern void save_restore_target_globals (tree); /* Defined in gcc/common/config/arm-common.c. */ extern const char *arm_rewrite_selected_cpu (const char *name); diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c index 9b03b05beee..d8a2745f86b 100644 --- a/gcc/config/arm/arm.c +++ b/gcc/config/arm/arm.c @@ -3446,8 +3446,7 @@ arm_option_override (void) /* Save the initial options in case the user does function specific options. */ - target_option_default_node = target_option_current_node - = build_target_option_node (&global_options); + target_option_default_node = build_target_option_node (&global_options); /* Init initial mode for testing. */ thumb_flipper = TARGET_THUMB; @@ -29750,6 +29749,25 @@ arm_is_constant_pool_ref (rtx x) /* Remember the last target of arm_set_current_function. */ static GTY(()) tree arm_previous_fndecl; +/* Restore or save the TREE_TARGET_GLOBALS from or to NEW_TREE. */ + +void +save_restore_target_globals (tree new_tree) +{ + /* If we have a previous state, use it. */ + if (TREE_TARGET_GLOBALS (new_tree)) + restore_target_globals (TREE_TARGET_GLOBALS (new_tree)); + else if (new_tree == target_option_default_node) + restore_target_globals (&default_target_globals); + else + { + /* Call target_reinit and save the state for TARGET_GLOBALS. */ + TREE_TARGET_GLOBALS (new_tree) = save_target_globals_default_opts (); + } + + arm_option_params_internal (); +} + /* Invalidate arm_previous_fndecl. */ void arm_reset_previous_fndecl (void) @@ -29772,38 +29790,23 @@ arm_set_current_function (tree fndecl) tree new_tree = DECL_FUNCTION_SPECIFIC_TARGET (fndecl); - arm_previous_fndecl = fndecl; + /* If current function has no attributes but previous one did, + use the default node." */ + if (! new_tree && old_tree) + new_tree = target_option_default_node; + + /* If nothing to do return. #pragma GCC reset or #pragma GCC pop to + the default have been handled by save_restore_target_globals from + arm_pragma_target_parse. */ if (old_tree == new_tree) return; - if (new_tree && new_tree != target_option_default_node) - { - cl_target_option_restore (&global_options, - TREE_TARGET_OPTION (new_tree)); + arm_previous_fndecl = fndecl; - if (TREE_TARGET_GLOBALS (new_tree)) - restore_target_globals (TREE_TARGET_GLOBALS (new_tree)); - else - TREE_TARGET_GLOBALS (new_tree) - = save_target_globals_default_opts (); - } + /* First set the target options. */ + cl_target_option_restore (&global_options, TREE_TARGET_OPTION (new_tree)); - else if (old_tree && old_tree != target_option_default_node) - { - new_tree = target_option_current_node; - - cl_target_option_restore (&global_options, - TREE_TARGET_OPTION (new_tree)); - if (TREE_TARGET_GLOBALS (new_tree)) - restore_target_globals (TREE_TARGET_GLOBALS (new_tree)); - else if (new_tree == target_option_default_node) - restore_target_globals (&default_target_globals); - else - TREE_TARGET_GLOBALS (new_tree) - = save_target_globals_default_opts (); - } - - arm_option_params_internal (); + save_restore_target_globals (new_tree); } /* Implement TARGET_OPTION_PRINT. */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index aa3d51bbe45..8559a787fa0 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-01-20 Christian Bruel + + PR target/69245 + * gcc.target/arm/pr69245.c: New test. + 2016-01-27 Jakub Jelinek PR tree-optimization/69399 diff --git a/gcc/testsuite/gcc.target/arm/pr69245.c b/gcc/testsuite/gcc.target/arm/pr69245.c new file mode 100644 index 00000000000..bd505187728 --- /dev/null +++ b/gcc/testsuite/gcc.target/arm/pr69245.c @@ -0,0 +1,26 @@ +/* PR target/69245 */ +/* Test that pop_options restores the vfp fpu mode. */ +/* { dg-do compile } */ +/* { dg-require-effective-target arm_neon_ok } */ +/* { dg-require-effective-target arm_fp_ok } */ +/* { dg-options "-O2" } */ +/* { dg-add-options arm_fp } */ + +#pragma GCC target "fpu=vfp" + +#pragma GCC push_options +#pragma GCC target "fpu=neon-vfpv4" +int a, c, d; +float b; +static int fn1 () +{ + return 0; +} +#pragma GCC pop_options + +void fn2 () +{ + d = b * c + a; +} + +/* { dg-final { scan-assembler-times "\.fpu vfp" 1 } } */