summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/gcc
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2023-07-14 10:47:56 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-07-18 09:17:25 +0100
commitc94fd2737e7e341188c8c41d911f1c60240088a2 (patch)
tree10a2df064777eaccf6a953314f50464352b34f83 /meta/recipes-devtools/gcc
parentdcdfbd3b45c7442210a49f5db989fb188a329c2d (diff)
downloadpoky-c94fd2737e7e341188c8c41d911f1c60240088a2.tar.gz
gcc-testsuite: Fix ppc cpu specification
After this change in qemu: https://gitlab.com/qemu-project/qemu/-/commit/c7e89de13224c1e6409152602ac760ac91f606b4 there is no 'max' cpu model on ppc. Drop it to clean up ppc gcc testsuite failures. In order for this to work we do need to pull in the alternative cpu option from QEMU_EXTRAOPTIONS on powerpc. (From OE-Core rev: c447f2b21b20fb2b1829d540af2cc0bf8242700c) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/gcc')
-rw-r--r--meta/recipes-devtools/gcc/gcc-testsuite.inc5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-testsuite.inc b/meta/recipes-devtools/gcc/gcc-testsuite.inc
index f68fec58ed..64f60c730f 100644
--- a/meta/recipes-devtools/gcc/gcc-testsuite.inc
+++ b/meta/recipes-devtools/gcc/gcc-testsuite.inc
@@ -51,9 +51,10 @@ python check_prepare() {
51 # enable all valid instructions, since the test suite itself does not 51 # enable all valid instructions, since the test suite itself does not
52 # limit itself to the target cpu options. 52 # limit itself to the target cpu options.
53 # - valid for x86*, powerpc, arm, arm64 53 # - valid for x86*, powerpc, arm, arm64
54 if qemu_binary.lstrip("qemu-") in ["x86_64", "i386", "ppc", "arm", "aarch64"]: 54 if qemu_binary.lstrip("qemu-") in ["x86_64", "i386", "arm", "aarch64"]:
55 args += ["-cpu", "max"] 55 args += ["-cpu", "max"]
56 56 elif qemu_binary.lstrip("qemu-") in ["ppc"]:
57 args += d.getVar("QEMU_EXTRAOPTIONS_%s" % d.getVar('PACKAGE_ARCH')).split()
57 sysroot = d.getVar("RECIPE_SYSROOT") 58 sysroot = d.getVar("RECIPE_SYSROOT")
58 args += ["-L", sysroot] 59 args += ["-L", sysroot]
59 # lib paths are static here instead of using $libdir since this is used by a -cross recipe 60 # lib paths are static here instead of using $libdir since this is used by a -cross recipe