From d80a3f9992c87f61228498286db89dd33f5be592 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Wed, 12 Oct 2022 15:58:03 +0200 Subject: arm-defaults: fix setting of used instruction set Since openembedded-core commit c88304a78e ("arch-armv7a.inc: default to Thumb2 instruction set for armv7a and above") a build of an armv7a based machine defaults to the Thumb2 instruction set. So repeating this default setting in the distro is not needed and can be completely removed. The way Thumb2 is set in the distro is wrong in the first place and would need fixing anyway. By setting `ARM_INSTRUCTION_SET:override ??= "..."` this will take precedence over any assignment to ARM_INSTRUCTION_SET without a override. So any recipe which wants to force the 'ARM' instruction set will end up being compiled with Thumb2. Related-to: ELB-4858 Signed-off-by: Max Krummenacher --- conf/distro/include/arm-defaults.inc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/conf/distro/include/arm-defaults.inc b/conf/distro/include/arm-defaults.inc index 187682f..61df0c7 100644 --- a/conf/distro/include/arm-defaults.inc +++ b/conf/distro/include/arm-defaults.inc @@ -31,7 +31,3 @@ def arm_tune_handler(d): return tune DEFAULTTUNE:tdx := "${@arm_tune_handler(d)}" - -DISTRO_ARM_INSTRUCTION ?= "thumb" -DISTRO_ARM_INSTRUCTION:armv5 ?= "arm" -ARM_INSTRUCTION_SET:tdx ??= "${DISTRO_ARM_INSTRUCTION}" -- cgit v1.2.3