1 files changed, 13 insertions, 13 deletions
diff --git a/meta/conf/machine/include/arm/arch-armv4.inc b/meta/conf/machine/include/arm/arch-armv4.inc
index fac2bdf952..be5761fb20 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_MARCH .= "${@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
@@ -17,18 +17,18 @@ require conf/machine/include/arm/feature-arm-thumb.inc
 # Little Endian
 AVAILTUNES += "armv4 armv4t"
-ARMPKGARCH_tune-armv4  ?= "armv4"
+ARMPKGARCH:tune-armv4  ?= "armv4"
-ARMPKGARCH_tune-armv4t ?= "armv4"
+ARMPKGARCH:tune-armv4t ?= "armv4"
-TUNE_FEATURES_tune-armv4  = "arm armv4"
+TUNE_FEATURES:tune-armv4  = "arm armv4"
-TUNE_FEATURES_tune-armv4t = "${TUNE_FEATURES_tune-armv4} thumb"
+TUNE_FEATURES:tune-armv4t = "${TUNE_FEATURES:tune-armv4} thumb"
-PACKAGE_EXTRA_ARCHS_tune-armv4  = "arm armv4"
+PACKAGE_EXTRA_ARCHS:tune-armv4  = "arm armv4"
-PACKAGE_EXTRA_ARCHS_tune-armv4t = "${PACKAGE_EXTRA_ARCHS_tune-armv4} armv4t"
+PACKAGE_EXTRA_ARCHS:tune-armv4t = "${PACKAGE_EXTRA_ARCHS:tune-armv4} armv4t"
 # Big Endian
 AVAILTUNES += "armv4b armv4tb"
-ARMPKGARCH_tune-armv4b  ?= "armv4"
+ARMPKGARCH:tune-armv4b  ?= "armv4"
-ARMPKGARCH_tune-armv4tb ?= "armv4"
+ARMPKGARCH:tune-armv4tb ?= "armv4"
-TUNE_FEATURES_tune-armv4b  = "${TUNE_FEATURES_tune-armv4}  bigendian"
+TUNE_FEATURES:tune-armv4b  = "${TUNE_FEATURES:tune-armv4}  bigendian"
-TUNE_FEATURES_tune-armv4tb = "${TUNE_FEATURES_tune-armv4t} bigendian"
+TUNE_FEATURES:tune-armv4tb = "${TUNE_FEATURES:tune-armv4t} bigendian"
-PACKAGE_EXTRA_ARCHS_tune-armv4b  = "armeb armv4b"
+PACKAGE_EXTRA_ARCHS:tune-armv4b  = "armeb armv4b"
-PACKAGE_EXTRA_ARCHS_tune-armv4tb = "${PACKAGE_EXTRA_ARCHS_tune-armv4b} armv4tb"
+PACKAGE_EXTRA_ARCHS:tune-armv4tb = "${PACKAGE_EXTRA_ARCHS:tune-armv4b} armv4tb"

diff --git a/meta/conf/machine/include/arm/arch-armv4.inc b/meta/conf/machine/include/arm/arch-armv4.inc index fac2bdf952..be5761fb20 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"
2		2
3	TUNEVALID[arm] = "Enable ARM instruction set"	3	TUNEVALID[arm] = "Enable ARM instruction set"
4	TUNEVALID[armv4] = "Enable instructions for ARMv4"	4	TUNEVALID[armv4] = "Enable instructions for ARMv4"
5	TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'armv4', ' -march=armv4t', '', d)}"	5	TUNE_CCARGS_MARCH .= "${@bb.utils.contains('TUNE_FEATURES', 'armv4', ' -march=armv4${ARMPKGSFX_THUMB}', '', d)}"
6	# enable --fix-v4bx when we have armv4 in TUNE_FEATURES, but then disable it when we have also armv5 or thumb	6	# enable --fix-v4bx when we have armv4 in TUNE_FEATURES, but then disable it when we have also armv5 or thumb
7	# maybe we should extend bb.utils.contains to support check for any checkvalues in value, now it does	7	# maybe we should extend bb.utils.contains to support check for any checkvalues in value, now it does
8	# checkvalues.issubset(val) which cannot be used for negative test of foo neither bar in value	8	# checkvalues.issubset(val) which cannot be used for negative test of foo neither bar in value
@@ -17,18 +17,18 @@ require conf/machine/include/arm/feature-arm-thumb.inc
17		17
18	# Little Endian	18	# Little Endian
19	AVAILTUNES += "armv4 armv4t"	19	AVAILTUNES += "armv4 armv4t"
20	ARMPKGARCH_tune-armv4 ?= "armv4"	20	ARMPKGARCH:tune-armv4 ?= "armv4"
21	ARMPKGARCH_tune-armv4t ?= "armv4"	21	ARMPKGARCH:tune-armv4t ?= "armv4"
22	TUNE_FEATURES_tune-armv4 = "arm armv4"	22	TUNE_FEATURES:tune-armv4 = "arm armv4"
23	TUNE_FEATURES_tune-armv4t = "${TUNE_FEATURES_tune-armv4} thumb"	23	TUNE_FEATURES:tune-armv4t = "${TUNE_FEATURES:tune-armv4} thumb"
24	PACKAGE_EXTRA_ARCHS_tune-armv4 = "arm armv4"	24	PACKAGE_EXTRA_ARCHS:tune-armv4 = "arm armv4"
25	PACKAGE_EXTRA_ARCHS_tune-armv4t = "${PACKAGE_EXTRA_ARCHS_tune-armv4} armv4t"	25	PACKAGE_EXTRA_ARCHS:tune-armv4t = "${PACKAGE_EXTRA_ARCHS:tune-armv4} armv4t"
26		26
27	# Big Endian	27	# Big Endian
28	AVAILTUNES += "armv4b armv4tb"	28	AVAILTUNES += "armv4b armv4tb"
29	ARMPKGARCH_tune-armv4b ?= "armv4"	29	ARMPKGARCH:tune-armv4b ?= "armv4"
30	ARMPKGARCH_tune-armv4tb ?= "armv4"	30	ARMPKGARCH:tune-armv4tb ?= "armv4"
31	TUNE_FEATURES_tune-armv4b = "${TUNE_FEATURES_tune-armv4} bigendian"	31	TUNE_FEATURES:tune-armv4b = "${TUNE_FEATURES:tune-armv4} bigendian"
32	TUNE_FEATURES_tune-armv4tb = "${TUNE_FEATURES_tune-armv4t} bigendian"	32	TUNE_FEATURES:tune-armv4tb = "${TUNE_FEATURES:tune-armv4t} bigendian"
33	PACKAGE_EXTRA_ARCHS_tune-armv4b = "armeb armv4b"	33	PACKAGE_EXTRA_ARCHS:tune-armv4b = "armeb armv4b"
34	PACKAGE_EXTRA_ARCHS_tune-armv4tb = "${PACKAGE_EXTRA_ARCHS_tune-armv4b} armv4tb"	34	PACKAGE_EXTRA_ARCHS:tune-armv4tb = "${PACKAGE_EXTRA_ARCHS:tune-armv4b} armv4tb"