summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2023-07-14 10:47:56 +0100
committerSteve Sakoman <steve@sakoman.com>2023-07-26 05:20:36 -1000
commit55e4c90abf9424323e15f06af7be40966b3e063a (patch)
tree8af5863ff8cc5d379d9a35426ad875d8bfdfcda7
parenta2bf83842a72c3dfe24a824c650a2f64d3fdf1b0 (diff)
downloadpoky-55e4c90abf9424323e15f06af7be40966b3e063a.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: 3a1b9f300a796e1216d0094043dba7b0f39ec869) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit c447f2b21b20fb2b1829d540af2cc0bf8242700c) Signed-off-by: Steve Sakoman <steve@sakoman.com>
-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