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.

(From OE-Core rev: 93dd2f9f3edf0584f9e806c629611d645dd72dbf)

Signed-off-by: Will Newton <willn@resin.io>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Will Newton 2017-09-08 09:52:23 +01:00 committed by Richard Purdie
parent 827eb5b232
commit 50cc15335e
1 changed files with 5 additions and 2 deletions

View File

@ -38,8 +38,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):