]> code.ossystems Code Review - openembedded-core.git/commitdiff
goarch.bbclass: Fix ppc64le detection
authorKhem Raj <raj.khem@gmail.com>
Sat, 20 Feb 2021 19:09:24 +0000 (11:09 -0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 23 Feb 2021 22:31:26 +0000 (22:31 +0000)
ppc64le should go above ppc64 in checks otherwise it gets subsumed
wrongly with ppc64 check

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/goarch.bbclass

index 1099b9576994f1786ef5e6ede51eabab32e9b994..73e13c0afe3098d92f099935977ae9dc84e5c914 100644 (file)
@@ -47,7 +47,6 @@ COMPATIBLE_HOST_linux-gnux32 = "null"
 COMPATIBLE_HOST_linux-muslx32 = "null"
 COMPATIBLE_HOST_powerpc = "null"
 COMPATIBLE_HOST_powerpc64 = "null"
-COMPATIBLE_HOST_powerpc64le = "null"
 COMPATIBLE_HOST_mipsarchn32 = "null"
 
 ARM_INSTRUCTION_SET_armv4 = "arm"
@@ -79,10 +78,10 @@ def go_map_arch(a, d):
         return 'mips'
     elif a == 'mipsel':
         return 'mipsle'
+    elif re.match('p(pc|owerpc)(64le)', a):
+        return 'ppc64le'
     elif re.match('p(pc|owerpc)(64)', a):
         return 'ppc64'
-    elif re.match('p(pc|owerpc)(64el)', a):
-        return 'ppc64le'
     elif a == 'riscv64':
         return 'riscv64'
     else:
@@ -115,5 +114,3 @@ def go_map_os(o, d):
     if o.startswith('linux'):
         return 'linux'
     return o
-
-