diff options
| author | Richard Earnshaw <rearnsha@arm.com> | 2021-07-27 15:44:57 +0100 |
|---|---|---|
| committer | Richard Earnshaw <rearnsha@arm.com> | 2021-08-05 12:51:14 +0100 |
| commit | 6a37d0331c25f23628d4308e5a75624005c223b2 (patch) | |
| tree | 2cf9714b4f3abe458468fa94c1807cf610d1906f | |
| parent | 62e66c6a6cc52dc0e014141d369cff52757cd7ae (diff) | |
| download | gcc-6a37d0331c25f23628d4308e5a75624005c223b2.zip gcc-6a37d0331c25f23628d4308e5a75624005c223b2.tar.gz gcc-6a37d0331c25f23628d4308e5a75624005c223b2.tar.bz2 | |
arm: Don't reconfigure globals in arm_configure_build_target
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.
| -rw-r--r-- | gcc/config/arm/arm-c.c | 1 | ||||
| -rw-r--r-- | gcc/config/arm/arm.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/gcc/config/arm/arm-c.c b/gcc/config/arm/arm-c.c index ae2139c..cc7901b 100644 --- a/gcc/config/arm/arm-c.c +++ b/gcc/config/arm/arm-c.c @@ -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 diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c index b2dd58d..273202a 100644 --- a/gcc/config/arm/arm.c +++ b/gcc/config/arm/arm.c @@ -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. */ |