OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

arm: Don't reconfigure globals in arm_configure_build_target

Browse Source 
arm_configure_build_target is usually used to reconfigure the
arm_active_target structure, which is then used to reconfigure a
number of other global variables describing the current target.
Occasionally, however, we need to use arm_configure_build_target to
construct a temporary target structure and in that case it is wrong to
try to reconfigure the global variables (although probably harmless,
since arm_option_reconfigure_globals() only looks at
arm_active_target).  At the very least, however, this is wasted work,
so it is best not to do it unless needed.  What's more, several
callers of arm_configure_build target call
arm_option_reconfigure_globals themselves within a few lines, making
the call from within arm_configure_build_target completely redundant.

So this patch moves the responsibility of calling of
arm_configure_build_target to its callers (only two places needed
updating).

gcc:
	* config/arm/arm.c (arm_configure_build_target): Don't call
	arm_option_reconfigure_globals.
	(arm_option_restore): Call arm_option_reconfigure_globals after
	reconfiguring the target.
	* config/arm/arm-c.c (arm_pragma_target_parse): Likewise.
This commit is contained in:
Richard Earnshaw 2021-07-27 15:44:57 +01:00
parent 62e66c6a6c
commit 6a37d0331c
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gcc/config/arm/arm-c.c
View File

@ -409,6 +409,7 @@ arm_pragma_target_parse (tree args, tree pop_target)
target_option_current_node = cur_tree;
arm_configure_build_target (&arm_active_target,
TREE_TARGET_OPTION (cur_tree), false);
arm_option_reconfigure_globals ();
}
/* Update macros if target_node changes. The global state will be restored

2
gcc/config/arm/arm.c
View File

@ -3058,6 +3058,7 @@ arm_option_restore (struct gcc_options */* opts */,
struct cl_target_option *ptr)
{
arm_configure_build_target (&arm_active_target, ptr, false);
arm_option_reconfigure_globals ();
}
/* Reset options between modes that the user has specified. */
@ -3441,7 +3442,6 @@ arm_configure_build_target (struct arm_build_target *target,
target->tune_flags = tune_data->tune_flags;
target->tune = tune_data->tune;
target->tune_core = tune_data->scheduler;
arm_option_reconfigure_globals ();
}
/* Fix up any incompatible options that the user has specified. */