summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2021-02-20 11:09:24 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-02-23 22:35:01 +0000
commit47a2fffca41c0c121f819b70836fcce87ed1ee48 (patch)
treec3cf3e2027eb54c5b958e81c2d8567458b5ed37e /meta/classes
parentb7d18a2fa7f0983b802a7a2238d7e56acbf8e1c8 (diff)
downloadpoky-47a2fffca41c0c121f819b70836fcce87ed1ee48.tar.gz
goarch.bbclass: Fix ppc64le detection
ppc64le should go above ppc64 in checks otherwise it gets subsumed wrongly with ppc64 check (From OE-Core rev: 126ecfe0d2ce65b2d2cf5598612e60bad7b3302e) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/goarch.bbclass7
1 files changed, 2 insertions, 5 deletions
diff --git a/meta/classes/goarch.bbclass b/meta/classes/goarch.bbclass
index 1099b95769..73e13c0afe 100644
--- a/meta/classes/goarch.bbclass
+++ b/meta/classes/goarch.bbclass
@@ -47,7 +47,6 @@ COMPATIBLE_HOST_linux-gnux32 = "null"
47COMPATIBLE_HOST_linux-muslx32 = "null" 47COMPATIBLE_HOST_linux-muslx32 = "null"
48COMPATIBLE_HOST_powerpc = "null" 48COMPATIBLE_HOST_powerpc = "null"
49COMPATIBLE_HOST_powerpc64 = "null" 49COMPATIBLE_HOST_powerpc64 = "null"
50COMPATIBLE_HOST_powerpc64le = "null"
51COMPATIBLE_HOST_mipsarchn32 = "null" 50COMPATIBLE_HOST_mipsarchn32 = "null"
52 51
53ARM_INSTRUCTION_SET_armv4 = "arm" 52ARM_INSTRUCTION_SET_armv4 = "arm"
@@ -79,10 +78,10 @@ def go_map_arch(a, d):
79 return 'mips' 78 return 'mips'
80 elif a == 'mipsel': 79 elif a == 'mipsel':
81 return 'mipsle' 80 return 'mipsle'
81 elif re.match('p(pc|owerpc)(64le)', a):
82 return 'ppc64le'
82 elif re.match('p(pc|owerpc)(64)', a): 83 elif re.match('p(pc|owerpc)(64)', a):
83 return 'ppc64' 84 return 'ppc64'
84 elif re.match('p(pc|owerpc)(64el)', a):
85 return 'ppc64le'
86 elif a == 'riscv64': 85 elif a == 'riscv64':
87 return 'riscv64' 86 return 'riscv64'
88 else: 87 else:
@@ -115,5 +114,3 @@ def go_map_os(o, d):
115 if o.startswith('linux'): 114 if o.startswith('linux'):
116 return 'linux' 115 return 'linux'
117 return o 116 return o
118
119