re PR target/66541 (r224314 causes ICE in gcc.dg/torture/pr52429.c)

PR target/66541
PR target/52144
* config/arm/arm.c (arm_set_current_function): Handle
explicit default options.

From-SVN: r224638
This commit is contained in:
Christian Bruel 2015-06-19 08:58:22 +02:00 committed by Christian Bruel
parent 36f1dbb02f
commit a19d9c69e4
2 changed files with 10 additions and 3 deletions

View File

@ -1,3 +1,10 @@
2015-06-19 Christian Bruel <christian.bruel@st.com>
PR target/66541
PR target/52144
* config/arm/arm.c (arm_set_current_function): Handle
explicit default options.
2015-06-18 Uros Bizjak <ubizjak@gmail.com>
* config/i386/i386.md (*movsicc_noc_zext): New insn.

View File

@ -29351,9 +29351,9 @@ arm_set_current_function (tree fndecl)
arm_previous_fndecl = fndecl;
if (old_tree == new_tree)
;
return;
else if (new_tree)
if (new_tree && new_tree != target_option_default_node)
{
cl_target_option_restore (&global_options,
TREE_TARGET_OPTION (new_tree));
@ -29365,7 +29365,7 @@ arm_set_current_function (tree fndecl)
= save_target_globals_default_opts ();
}
else if (old_tree)
else if (old_tree && old_tree != target_option_default_node)
{
new_tree = target_option_current_node;