|
 |
805d35 |
2020-09-09 Jakub Jelinek <jakub@redhat.com>
|
|
|
805d35 |
|
|
|
805d35 |
* config/arm/arm.c (arm_override_options_after_change_1): Add opts_set
|
|
|
805d35 |
argument, test opts_set->x_str_align_functions rather than
|
|
|
805d35 |
opts->x_str_align_functions.
|
|
|
805d35 |
(arm_override_options_after_change, arm_option_override_internal,
|
|
|
805d35 |
arm_set_current_function): Adjust callers.
|
|
|
805d35 |
|
|
|
805d35 |
--- gcc/config/arm/arm.c.jj 2020-09-09 09:19:42.911419411 +0200
|
|
|
805d35 |
+++ gcc/config/arm/arm.c 2020-09-09 09:28:02.392897384 +0200
|
|
|
805d35 |
@@ -3024,10 +3024,11 @@ static GTY(()) bool thumb_flipper;
|
|
|
805d35 |
static GTY(()) tree init_optimize;
|
|
|
805d35 |
|
|
|
805d35 |
static void
|
|
|
805d35 |
-arm_override_options_after_change_1 (struct gcc_options *opts)
|
|
|
805d35 |
+arm_override_options_after_change_1 (struct gcc_options *opts,
|
|
|
805d35 |
+ struct gcc_options *opts_set)
|
|
|
805d35 |
{
|
|
|
805d35 |
/* -falign-functions without argument: supply one. */
|
|
|
805d35 |
- if (opts->x_flag_align_functions && !opts->x_str_align_functions)
|
|
|
805d35 |
+ if (opts->x_flag_align_functions && !opts_set->x_str_align_functions)
|
|
|
805d35 |
opts->x_str_align_functions = TARGET_THUMB_P (opts->x_target_flags)
|
|
|
805d35 |
&& opts->x_optimize_size ? "2" : "4";
|
|
|
805d35 |
}
|
|
|
805d35 |
@@ -3037,7 +3038,7 @@ arm_override_options_after_change_1 (str
|
|
|
805d35 |
static void
|
|
|
805d35 |
arm_override_options_after_change (void)
|
|
|
805d35 |
{
|
|
|
805d35 |
- arm_override_options_after_change_1 (&global_options);
|
|
|
805d35 |
+ arm_override_options_after_change_1 (&global_options, &global_options_set);
|
|
|
805d35 |
}
|
|
|
805d35 |
|
|
|
805d35 |
/* Implement TARGET_OPTION_SAVE. */
|
|
|
805d35 |
@@ -3065,7 +3066,7 @@ static void
|
|
|
805d35 |
arm_option_override_internal (struct gcc_options *opts,
|
|
|
805d35 |
struct gcc_options *opts_set)
|
|
|
805d35 |
{
|
|
|
805d35 |
- arm_override_options_after_change_1 (opts);
|
|
|
805d35 |
+ arm_override_options_after_change_1 (opts, opts_set);
|
|
|
805d35 |
|
|
|
805d35 |
if (TARGET_INTERWORK && !bitmap_bit_p (arm_active_target.isa, isa_bit_thumb))
|
|
|
805d35 |
{
|
|
|
805d35 |
@@ -32335,7 +32336,7 @@ arm_set_current_function (tree fndecl)
|
|
|
805d35 |
|
|
|
805d35 |
save_restore_target_globals (new_tree);
|
|
|
805d35 |
|
|
|
805d35 |
- arm_override_options_after_change_1 (&global_options);
|
|
|
805d35 |
+ arm_override_options_after_change_1 (&global_options, &global_options_set);
|
|
|
805d35 |
}
|
|
|
805d35 |
|
|
|
805d35 |
/* Implement TARGET_OPTION_PRINT. */
|