From: Richard Earnshaw Date: Mon, 26 Jul 2021 16:07:14 +0000 (+0100) Subject: arm: ensure the arch_name is always set for the build target X-Git-Tag: basepoints/gcc-13~5553 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62e66c6a6cc52dc0e014141d369cff52757cd7ae;p=thirdparty%2Fgcc.git arm: ensure the arch_name is always set for the build target This should never happen now if GCC is invoked by the driver, but in the unusual case of calling cc1 (or its ilk) directly from the command line the build target's arch_name string can remain NULL. This can complicate later processing meaning that we need to check for this case explicitly in some circumstances. Nothing should rely on this behaviour, so it's simpler to always set the arch_name when configuring the build target and be done with it. gcc: * config/arm/arm.c (arm_configure_build_target): Ensure the target's arch_name is always set. --- diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c index 6d781e23ee95..b2dd58d87517 100644 --- a/gcc/config/arm/arm.c +++ b/gcc/config/arm/arm.c @@ -3432,6 +3432,8 @@ arm_configure_build_target (struct arm_build_target *target, const cpu_tune *tune_data = &all_tunes[arm_selected_tune - all_cores]; /* Finish initializing the target structure. */ + if (!target->arch_name) + target->arch_name = arm_selected_arch->common.name; target->arch_pp_name = arm_selected_arch->arch; target->base_arch = arm_selected_arch->base_arch; target->profile = arm_selected_arch->profile;