summaryrefslogtreecommitdiffstats
path: root/meta/classes/goarch.bbclass
diff options
context:
space:
mode:
authorWill Newton <will.newton@gmail.com>2017-09-08 18:04:34 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-09-11 17:30:14 +0100
commit07b60c15e9ef650940afdde37bf3f3b9c50a336d (patch)
tree979dbb96a17c17ee6e22e4f063278b9082bbd2b5 /meta/classes/goarch.bbclass
parent26abbf129d7ca0d36f6244f96fa8a572fd847899 (diff)
downloadopenembedded-core-contrib-07b60c15e9ef650940afdde37bf3f3b9c50a336d.tar.gz
goarch.bbclass: Replace logic for setting GOARM
The previous logic applied a regex to TUNE_FEATURES which could set the GOARM value to 7 incorrectly, for example when dealing with an arm1176 core. Simplify to check for the presence of "armv7" instead. At the same time add a check for "armv6" and set GOARM to 6 in that case. Signed-off-by: Will Newton <willn@resin.io> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/goarch.bbclass')
-rw-r--r--meta/classes/goarch.bbclass7
1 files changed, 5 insertions, 2 deletions
diff --git a/meta/classes/goarch.bbclass b/meta/classes/goarch.bbclass
index 7960ac5f9e3..0f0d8b6a60e 100644
--- a/meta/classes/goarch.bbclass
+++ b/meta/classes/goarch.bbclass
@@ -45,8 +45,11 @@ def go_map_arch(a, d):
def go_map_arm(a, f, d):
import re
- if re.match('arm.*', a) and re.match('arm.*7.*', f):
- return '7'
+ if re.match('arm.*', a):
+ if 'armv7' in f:
+ return '7'
+ elif 'armv6' in f:
+ return '6'
return ''
def go_map_os(o, d):