arm: Fix up arm_override_options_after_change_1
authorJakub Jelinek <jakub@redhat.com>
Thu, 10 Sep 2020 15:40:08 +0000 (17:40 +0200)
committerJakub Jelinek <jakub@redhat.com>
Thu, 10 Sep 2020 15:40:08 +0000 (17:40 +0200)
commitd9b054d56b052fb01c9a667c95f80c783f0cf0c7
tree146ad6b2e3d1b2e26cf9531b2c4bde2acd9d0fd6
parent57e113cf7c94a682c29566cb3e0e85955904fd35
arm: Fix up arm_override_options_after_change_1

Looking further at arm_override_options_after_change_1, it also seems to be
incorrect, rather than testing
!opts->x_str_align_functions
it should be really testing
!opts_set->x_str_align_functions
and get &global_options_set or similar passed to it as additional opts_set
argument.  That is because otherwise the decision will be sticky, while it
should be done whenever use provided -falign-functions but didn't provide
-falign-functions= (either on the command line, or through optimize
attribute or pragma).

Here is a fix for that (incremental change on top of the previous patch).

2020-09-10  Jakub Jelinek  <jakub@redhat.com>

* config/arm/arm.c (arm_override_options_after_change_1): Add opts_set
argument, test opts_set->x_str_align_functions rather than
opts->x_str_align_functions.
(arm_override_options_after_change, arm_option_override_internal,
arm_set_current_function): Adjust callers.
gcc/config/arm/arm.c