From 6b47aefa31e0b6df45afddaf33fd77d4692caae1 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 9 Jun 2021 19:17:05 -0700 Subject: arch-armv4: Allow -march=armv4 Even though it is deprecated in GCC 6 [1] it has not yet been removed from gcc upstream. We do have active machines in OE ecosystem which use armv4 ( SA11xx ) e.g. collie in meta-handheld so until upstream gcc takes next step to remove them lets support armv4 again, we are still carrying the relevant gcc patch to support v4 BX fix. [1] https://gcc.gnu.org/gcc-6/changes.html#arm (From OE-Core rev: dea9b6c3fd62ec5ea8f12fcb9bf44870379c6f4b) Signed-off-by: Khem Raj Cc: Andrea Adami Signed-off-by: Richard Purdie --- meta/conf/machine/include/arm/arch-armv4.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/machine/include/arm/arch-armv4.inc b/meta/conf/machine/include/arm/arch-armv4.inc index fac2bdf952..b71739c20a 100644 --- a/meta/conf/machine/include/arm/arch-armv4.inc +++ b/meta/conf/machine/include/arm/arch-armv4.inc @@ -2,7 +2,7 @@ DEFAULTTUNE ?= "armv4" TUNEVALID[arm] = "Enable ARM instruction set" TUNEVALID[armv4] = "Enable instructions for ARMv4" -TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'armv4', ' -march=armv4t', '', d)}" +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'armv4', ' -march=armv4${ARMPKGSFX_THUMB}', '', d)}" # enable --fix-v4bx when we have armv4 in TUNE_FEATURES, but then disable it when we have also armv5 or thumb # maybe we should extend bb.utils.contains to support check for any checkvalues in value, now it does # checkvalues.issubset(val) which cannot be used for negative test of foo neither bar in value -- cgit v1.2.3-54-g00ecf