mirrors/meta-rust
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rust: Improve TUNE_FEATURE parsing

Browse Source 
Since ac83d22eb5

The armvX arch definition is not present in TUNE_FEATURES but is now in
MACHINEOVERRIDES. Improve parsing so that MACHINEOVERRIDES is also checked.

Fixes #240

Tested on raspberrypi3 with balenaOS which uses rust.

Signed-off-by: Zubair Lutfullah Kakakhel <zubair@balena.io>
This commit is contained in:
Zubair Lutfullah Kakakhel
2019-06-06 16:14:13 +01:00
parent 5cda04c7c2
commit 186ec59085
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
recipes-devtools/rust/rust.inc
View File

@@ -47,6 +47,9 @@ def llvm_features_from_tune(d):
return []
feat = frozenset(feat.split())
mach_overrides = d.getVar('MACHINEOVERRIDES')
mach_overrides = frozenset(mach_overrides.split(':'))
if 'vfpv4' in feat:
f.append("+vfp4")
if 'vfpv3' in feat:
@@ -70,9 +73,9 @@ def llvm_features_from_tune(d):
f.append("+mips32r2")
v7=frozenset(['armv7a', 'armv7r', 'armv7m', 'armv7ve'])
if not feat.isdisjoint(v7):
if (not mach_overrides.isdisjoint(v7)) or (not feat.isdisjoint(v7)):
f.append("+v7")
if 'armv6' in feat:
if ('armv6' in mach_overrides) or ('armv6' in feat):
f.append("+v6")
if 'dsp' in feat:
@@ -80,7 +83,7 @@ def llvm_features_from_tune(d):
if 'thumb' in feat:
if d.getVar('ARM_THUMB_OPT') is "thumb":
if not feat.isdisjoint(v7):
if (not mach_overrides.isdisjoint(v7)) or (not feat.isdisjoint(v7)):
f.append("+thumb2")
f.append("+thumb-mode")