summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2022-10-12 15:58:03 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2022-10-14 13:54:02 +0200
commit420747fc6f9aa30daf1cbe4c9d31b8539aa0d91c (patch)
tree7f7fd0dfb038d0b18b4eff9fc079f6e0d2e91333
parentbdb0dd3635015aaa826fe036857c2a93a63cd0c1 (diff)
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. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit a0c78e246961778a5ea420af82a257cbf962bbed)
-rw-r--r--conf/distro/include/arm-defaults.inc4
1 files changed, 0 insertions, 4 deletions
diff --git a/conf/distro/include/arm-defaults.inc b/conf/distro/include/arm-defaults.inc
index b486740..efdbe72 100644
--- a/conf/distro/include/arm-defaults.inc
+++ b/conf/distro/include/arm-defaults.inc
@@ -35,7 +35,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}"