aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2022-05-24 08:05:05 +0000
committerSamuli Piippo <samuli.piippo@qt.io>2022-05-31 11:24:08 +0000
commite2582bee26c20838e6fe173b9113a43373837bd4 (patch)
treecfd38470a6019737bf7d7055dbefe289967631ee
parentc157da242f4d79ca4bb006f448c645ef59da80a7 (diff)
riscv: add riscv support for QtCreator configs
Correctly map riscv architectures to QtCreator ABI, and downgrade error for unknown architectures. Change-Id: I77b2329ccc1b36e361a1bab09fb2a4dc2b921325 Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
-rw-r--r--meta-boot2qt/classes/abi-arch.bbclass8
1 files changed, 5 insertions, 3 deletions
diff --git a/meta-boot2qt/classes/abi-arch.bbclass b/meta-boot2qt/classes/abi-arch.bbclass
index 63f9d1e2..3cdcba93 100644
--- a/meta-boot2qt/classes/abi-arch.bbclass
+++ b/meta-boot2qt/classes/abi-arch.bbclass
@@ -1,6 +1,6 @@
############################################################################
##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2022 The Qt Company Ltd.
## Contact: https://www.qt.io/licensing/
##
## This file is part of the Boot to Qt meta layer.
@@ -28,7 +28,7 @@
############################################################################
# map target architecture to abi architectures used by Qt Creator
-valid_archs = "arm x86 itanium mips ppc sh"
+valid_archs = "arm x86 itanium mips ppc sh riscv"
def map_abi_arch(a, d):
import re
@@ -42,8 +42,10 @@ def map_abi_arch(a, d):
elif re.match('mips(el|64|64el)$', a): return 'mips'
elif re.match('p(pc|owerpc)(|64)', a): return 'ppc'
elif re.match('sh(3|4)$', a): return 'sh'
+ elif re.match('riscv(32|64)', a): return 'riscv'
elif a in valid_archs: return a
else:
- bb.error("cannot map '%s' to a abi architecture" % a)
+ bb.warn("cannot map '%s' to a QtCreator abi architecture" % a)
+ return a
ABI = "${@map_abi_arch(d.getVar('TARGET_ARCH'), d)}"