From d2d19167c3a5f46af1726a6b79a6f4bc586e788a Mon Sep 17 00:00:00 2001 From: Richard Earnshaw Date: Thu, 15 Dec 2016 15:44:01 +0000 Subject: [PATCH] [arm] Reduce usage of arm_selected_cpu. Make more use of the new data structure for initializing existing variables. * arm.c (arm_option_override): Use arm_active_target as source of information for arm_base_arch and arm_arch_name. * (arm_file_start): Use arm_active_target for core name. From-SVN: r243700 --- gcc/ChangeLog | 6 ++++++ gcc/config/arm/arm.c | 11 ++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 004d268..4202c77 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,11 @@ 2016-12-15 Richard Earnshaw + * arm.c (arm_option_override): Use arm_active_target as source of + information for arm_base_arch and arm_arch_name. + * (arm_file_start): Use arm_active_target for core name. + +2016-12-15 Richard Earnshaw + * arm.c (arm_selected_tune): Delete static variable. (arm_selected_arch): Likewise. (arm_configure_build_target): Declare local versions of arm_selected diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c index a4d370c..3806226 100644 --- a/gcc/config/arm/arm.c +++ b/gcc/config/arm/arm.c @@ -3276,9 +3276,9 @@ arm_option_override (void) SUBTARGET_OVERRIDE_OPTIONS; #endif - sprintf (arm_arch_name, "__ARM_ARCH_%s__", arm_selected_cpu->arch); + sprintf (arm_arch_name, "__ARM_ARCH_%s__", arm_active_target.arch_pp_name); insn_flags = arm_selected_cpu->flags; - arm_base_arch = arm_selected_cpu->base_arch; + arm_base_arch = arm_active_target.base_arch; arm_tune = arm_active_target.tune_core; tune_flags = arm_active_target.tune_flags; @@ -26012,12 +26012,13 @@ arm_file_start (void) arm_active_target.arch_name); } } - else if (strncmp (arm_selected_cpu->name, "generic", 7) == 0) - asm_fprintf (asm_out_file, "\t.arch %s\n", arm_selected_cpu->name + 8); + else if (strncmp (arm_active_target.core_name, "generic", 7) == 0) + asm_fprintf (asm_out_file, "\t.arch %s\n", + arm_active_target.core_name + 8); else { const char* truncated_name - = arm_rewrite_selected_cpu (arm_selected_cpu->name); + = arm_rewrite_selected_cpu (arm_active_target.core_name); asm_fprintf (asm_out_file, "\t.cpu %s\n", truncated_name); } -- 2.7.4