From 911532040a9a085ee98bb2b5f1ea84d978bcf746 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 13 Aug 2023 10:13:03 +0100 Subject: gcc-testsuite: Fix qemu binary filtering code logic error This code doesn't do what it first might appear to, it would for example remove 'm' characters from the left side of qemu-mips leaving 'ips'. Fix it to stop anyone else being confused by the subtle logic error. (From OE-Core rev: 888a7edf1c611eaf99eaf10a072ecc82cb386735) Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/gcc-testsuite.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/recipes-devtools/gcc') diff --git a/meta/recipes-devtools/gcc/gcc-testsuite.inc b/meta/recipes-devtools/gcc/gcc-testsuite.inc index 64f60c730f..a8299fa7ae 100644 --- a/meta/recipes-devtools/gcc/gcc-testsuite.inc +++ b/meta/recipes-devtools/gcc/gcc-testsuite.inc @@ -51,9 +51,9 @@ python check_prepare() { # enable all valid instructions, since the test suite itself does not # limit itself to the target cpu options. # - valid for x86*, powerpc, arm, arm64 - if qemu_binary.lstrip("qemu-") in ["x86_64", "i386", "arm", "aarch64"]: + if qemu_binary.endswith(("x86_64", "i386", "arm", "aarch64")): args += ["-cpu", "max"] - elif qemu_binary.lstrip("qemu-") in ["ppc"]: + elif qemu_binary.endswith(("ppc")): args += d.getVar("QEMU_EXTRAOPTIONS_%s" % d.getVar('PACKAGE_ARCH')).split() sysroot = d.getVar("RECIPE_SYSROOT") args += ["-L", sysroot] -- cgit v1.2.3-54-g00ecf