summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2015-02-18 15:40:35 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-21 22:05:36 +0000
commitfe66853cded794a7585ed28c519b32930979c2bc (patch)
treea42368cdc5d8b42eae087963e302ca91af250a93 /meta/conf
parent4b69d0013dc40b1c8573ff4b03c99abf57538eaa (diff)
downloadast2050-yocto-poky-fe66853cded794a7585ed28c519b32930979c2bc.zip
ast2050-yocto-poky-fe66853cded794a7585ed28c519b32930979c2bc.tar.gz
feature-arm-thumb.inc: respect ARM_INSTRUCTION_SET when adding thumb suffix
* this means that recipes with ARM_INSTRUCTION_SET explicitly changed to arm will be built in feed without thumb suffix, the same does apply for workdir, e.g. after "bitbake glib-2.0" you can see: tmp-glibc/work/armv5e-oe-linux-gnueabi: glib-2.0 glibc glibc-initial tmp-glibc/work/armv5te-oe-linux-gnueabi: acl db gdk-pixbuf kmod .... and tmp-glibc/deploy/ipk: all armv5e armv5te qemuarm * feed config should be ok, because all default DEFAULTTUNEs always include "arm" variants of all supported PACKAGE_ARCHs * for more details see http://lists.openembedded.org/pipermail/openembedded-core/2014-April/091960.html the toolchain path issues were resolved in 1.8 * add ARM_INSTRUCTION_SET = "arm" to glibc-collateral.inc and comment in glibc.inc to fix glibc-locale and glibc-scripts build (From OE-Core rev: 3e760031f91fb87c3e2f62b77a117eb41164f259) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/machine/include/arm/feature-arm-thumb.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/conf/machine/include/arm/feature-arm-thumb.inc b/meta/conf/machine/include/arm/feature-arm-thumb.inc
index 0db5ec1..9746c7b 100644
--- a/meta/conf/machine/include/arm/feature-arm-thumb.inc
+++ b/meta/conf/machine/include/arm/feature-arm-thumb.inc
@@ -32,7 +32,8 @@ python () {
TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'thumb', ' -m${ARM_M_OPT}', '', d)}"
OVERRIDES .= "${@bb.utils.contains('TUNE_FEATURES', 'thumb', ':thumb', '', d)}"
-ARMPKGSFX_THUMB .= "${@bb.utils.contains('TUNE_FEATURES', 'thumb', '${ARM_THUMB_SUFFIX}', '', d)}"
+# Add suffix from ARM_THUMB_SUFFIX only if after all this we still set ARM_M_OPT to thumb
+ARMPKGSFX_THUMB .= "${@ d.getVar('ARM_THUMB_SUFFIX', True) if d.getVar('ARM_M_OPT', True) == 'thumb' else ''}"
# Whether to compile with code to allow interworking between the two
# instruction sets. This allows thumb code to be executed on a primarily
OpenPOWER on IntegriCloud