mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-27 21:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

goarch.bbclass: rework mips architecture checks

Browse Source 
Remove the TUNE_FEATURES references from go_map_arch,
to avoid an unwanted variable dependency.  Direct
comparisons of the architecture name are sufficient
for covering what Go currently supports, and using
TUNE_CCARGS_remove adequately handles the conflict
with the cgo-supplied flags for mips.

(From OE-Core rev: 1bc4c1d880096083d1891a74024fb225a6340b9b)

Signed-off-by: Matt Madison <matt@madison.systems>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Matt Madison
2017-09-28 10:34:42 -07:00
committed by Richard Purdie
parent 748356ff34
commit b2646b5cf7
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
meta/classes/goarch.bbclass
View File

@@ -28,6 +28,7 @@ COMPATIBLE_HOST_linux-muslx32 = "null"
COMPATIBLE_HOST_powerpc = "null"
COMPATIBLE_HOST_powerpc64 = "null"
ARM_INSTRUCTION_SET = "arm"
TUNE_CCARGS_remove = "-march=mips32r2"
def go_map_arch(a, d):
import re
@@ -39,18 +40,14 @@ def go_map_arch(a, d):
return 'arm'
elif re.match('aarch64.*', a):
return 'arm64'
elif re.match('mips64el*', a):
elif re.match('mips64el.*', a):
return 'mips64le'
elif re.match('mips64*', a):
elif re.match('mips64.*', a):
return 'mips64'
elif re.match('mips.*', a):
tf = d.getVar('TUNE_FEATURES').split()
if 'fpu-hard' in tf and 'n32' not in tf:
if 'mips32r2' in tf:
newtf = [t for t in tf if t != 'mips32r2']
newtf.append('mips32')
d.setVar('TUNE_FEATURES', ' '.join(newtf))
return 'mips' if 'bigendian' in tf else 'mipsle'
elif a == 'mips':
return 'mips'
elif a == 'mipsel':
return 'mipsle'
elif re.match('p(pc|owerpc)(64)', a):
return 'ppc64'
elif re.match('p(pc|owerpc)(64el)', a):