From 602f786ecdace325e8f4858b3e07e9bd79229e64 Mon Sep 17 00:00:00 2001 From: Will Newton Date: Fri, 8 Sep 2017 18:04:34 -0300 Subject: 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: 07b60c15e9ef650940afdde37bf3f3b9c50a336d) Signed-off-by: Will Newton Signed-off-by: Otavio Salvador Signed-off-by: Richard Purdie --- meta/classes/goarch.bbclass | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'meta/classes/goarch.bbclass') diff --git a/meta/classes/goarch.bbclass b/meta/classes/goarch.bbclass index 7960ac5f9e..0f0d8b6a60 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): -- cgit v1.2.3-54-g00ecf