From 8e8839215032b57763a07363a560c3fd9d6f8e01 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 22 Jan 2014 00:43:12 +0100 Subject: feature-arm-thumb: Fix missing t2 suffix for armv7a MACHINEs * unfortunatelly that note about armv7 matching also armv7a is no longer valid since armv7 include in armv7 was replaced with armv6+neon in this commit: commit 75b8adbc042e0f65fb1286bc550d02becd3b6aea Author: Khem Raj Date: Tue Mar 27 18:37:45 2012 -0700 tune/armv7: Delete since then thumb and arm feeds had the same architecture * be aware that this will rename lots of feeds Signed-off-by: Martin Jansa Signed-off-by: Saul Wold --- meta/conf/machine/include/arm/feature-arm-thumb.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'meta') diff --git a/meta/conf/machine/include/arm/feature-arm-thumb.inc b/meta/conf/machine/include/arm/feature-arm-thumb.inc index bd754bea67..fa3a4e5c1f 100644 --- a/meta/conf/machine/include/arm/feature-arm-thumb.inc +++ b/meta/conf/machine/include/arm/feature-arm-thumb.inc @@ -9,11 +9,10 @@ ARM_THUMB_M_OPT = "${@['-marm', '-mthumb'][d.getVar('ARM_INSTRUCTION_SET', True) TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "thumb", " ${ARM_THUMB_M_OPT}", "", d)}" OVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "thumb", ":thumb", "", d)}" -# Note armv7 will hit on armv7a as well ARMPKGSFX_THUMB .= "${@bb.utils.contains("TUNE_FEATURES", [ "armv4", "thumb" ], "t", "", d)}" ARMPKGSFX_THUMB .= "${@bb.utils.contains("TUNE_FEATURES", [ "armv5", "thumb" ], "t", "", d)}" ARMPKGSFX_THUMB .= "${@bb.utils.contains("TUNE_FEATURES", [ "armv6", "thumb" ], "t", "", d)}" -ARMPKGSFX_THUMB .= "${@bb.utils.contains("TUNE_FEATURES", [ "armv7", "thumb" ], "t2", "", d)}" +ARMPKGSFX_THUMB .= "${@bb.utils.contains("TUNE_FEATURES", [ "armv7a", "thumb" ], "t2", "", d)}" # Whether to compile with code to allow interworking between the two # instruction sets. This allows thumb code to be executed on a primarily -- cgit 1.2.3-korg