summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2023-08-13 10:13:03 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-08-15 08:14:32 +0100
commit888a7edf1c611eaf99eaf10a072ecc82cb386735 (patch)
tree531c2f01e814bdb038a623df72600e43ec902986
parentc5aeea53dfacb53dedb8445cb3523dc3a8cb6dca (diff)
downloadopenembedded-core-contrib-888a7edf1c611eaf99eaf10a072ecc82cb386735.tar.gz
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. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/gcc/gcc-testsuite.inc4
1 files changed, 2 insertions, 2 deletions
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]