From 58ca420c350affadb6332371c574fc9b37e7df77 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 13 Aug 2023 10:14:51 +0100 Subject: gcc-testsuite: Set qemu options for mips correctly MIPS sets QEMU CPU values similarly to ppc and doens't support 'max'. Allow this to filter through correctly to the toolchain testing. (From OE-Core rev: 8c939780228d1440190a87cc24abd72d26aade74) Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/gcc-testsuite.inc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/gcc/gcc-testsuite.inc b/meta/recipes-devtools/gcc/gcc-testsuite.inc index a8299fa7ae..f16d471478 100644 --- a/meta/recipes-devtools/gcc/gcc-testsuite.inc +++ b/meta/recipes-devtools/gcc/gcc-testsuite.inc @@ -53,8 +53,12 @@ python check_prepare() { # - valid for x86*, powerpc, arm, arm64 if qemu_binary.endswith(("x86_64", "i386", "arm", "aarch64")): args += ["-cpu", "max"] - elif qemu_binary.endswith(("ppc")): - args += d.getVar("QEMU_EXTRAOPTIONS_%s" % d.getVar('PACKAGE_ARCH')).split() + elif qemu_binary.endswith(("ppc", "mips", "mips64")): + extra = d.getVar("QEMU_EXTRAOPTIONS_%s" % d.getVar('PACKAGE_ARCH')) + if extra: + args += extra.split() + # For mips64 we could set a maximal CPU (e.g. Loongson-3A4000) however they either have MSA + # or Loongson-MMI vector extensions, not both and qemu lacks complete support for MMI sysroot = d.getVar("RECIPE_SYSROOT") args += ["-L", sysroot] # lib paths are static here instead of using $libdir since this is used by a -cross recipe -- cgit v1.2.3-54-g00ecf