From 39abf6289b641e9918403f058fe763d0d7fce5c2956f4c5e1d59a710478917f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Ricardo=20Ziviani?= Date: Wed, 8 Sep 2021 19:07:04 +0000 Subject: [PATCH] Accepting request 917618 from home:jziviani:branches:Virtualization - Fix qemu build on ARMv7 (bsc#1190211) * Patches added: tcg-arm-Fix-tcg_out_vec_op-function-sign.patch OBS-URL: https://build.opensuse.org/request/show/917618 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=671 --- bundles.tar.xz | 4 +- qemu.changes | 7 ++++ qemu.spec | 2 + ...arm-Fix-tcg_out_vec_op-function-sign.patch | 38 +++++++++++++++++++ 4 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 tcg-arm-Fix-tcg_out_vec_op-function-sign.patch diff --git a/bundles.tar.xz b/bundles.tar.xz index be843828..ba5f757f 100644 --- a/bundles.tar.xz +++ b/bundles.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e1267f7401e278289c62e2e2a84617e3b89a9ce1ca6d96391adf116e2ab96c8e -size 40764 +oid sha256:142b72d25648f82d201e7f06f26f898478a776bbd79cd04c853bcf38b612c50e +size 41228 diff --git a/qemu.changes b/qemu.changes index 1fc94088..012e6a0a 100644 --- a/qemu.changes +++ b/qemu.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Sep 8 17:51:18 UTC 2021 - José Ricardo Ziviani + +- Fix qemu build on ARMv7 (bsc#1190211) +* Patches added: + tcg-arm-Fix-tcg_out_vec_op-function-sign.patch + ------------------------------------------------------------------- Wed Sep 8 13:56:04 UTC 2021 - José Ricardo Ziviani diff --git a/qemu.spec b/qemu.spec index b4350676..dbef7042 100644 --- a/qemu.spec +++ b/qemu.spec @@ -179,6 +179,7 @@ Patch00043: doc-add-our-support-doc-to-the-main-proj.patch Patch00044: qemu-binfmt-conf.sh-allow-overriding-SUS.patch Patch00045: Revert-qemu-img-Improve-error-for-rebase.patch Patch00046: Revert-qemu-img-Require-F-with-b-backing.patch +Patch00047: tcg-arm-Fix-tcg_out_vec_op-function-sign.patch # Patches applied in roms/seabios/: Patch01000: seabios-use-python2-explicitly-as-needed.patch Patch01001: seabios-switch-to-python3-as-needed.patch @@ -1116,6 +1117,7 @@ This package records qemu testsuite results and represents successful testing. %patch00044 -p1 %patch00045 -p1 %patch00046 -p1 +%patch00047 -p1 %patch01000 -p1 %patch01001 -p1 %patch01002 -p1 diff --git a/tcg-arm-Fix-tcg_out_vec_op-function-sign.patch b/tcg-arm-Fix-tcg_out_vec_op-function-sign.patch new file mode 100644 index 00000000..8de3c657 --- /dev/null +++ b/tcg-arm-Fix-tcg_out_vec_op-function-sign.patch @@ -0,0 +1,38 @@ +From: "Jose R. Ziviani" +Date: Wed, 8 Sep 2021 14:06:32 -0300 +Subject: tcg/arm: Fix tcg_out_vec_op function signature + +Git-commit: 000000000000000000000000000000000000000000 +References: bsc#1190211 + +Commit 5e8892db93 fixed several function signatures but tcg_out_vec_op +for arm is missing. It causes a build error on armv6 and armv7: + +tcg-target.c.inc:2718:42: error: argument 5 of type 'const TCGArg *' +{aka 'const unsigned int *'} declared as a pointer [-Werror=array-parameter=] + const TCGArg *args, const int *const_args) + ~~~~~~~~~~~~~~^~~~ +../tcg/tcg.c:120:41: note: previously declared as an array 'const TCGArg[16]' +{aka 'const unsigned int[16]'} + const TCGArg args[TCG_MAX_OP_ARGS], + ~~~~~~~~~~~~~~^~~~ + +Signed-off-by: Jose R. Ziviani +--- + tcg/arm/tcg-target.c.inc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tcg/arm/tcg-target.c.inc b/tcg/arm/tcg-target.c.inc +index 007ceee68e23102ad96dd47e2d02..e5b4f8684106c6e6785a3dd060d6 100644 +--- a/tcg/arm/tcg-target.c.inc ++++ b/tcg/arm/tcg-target.c.inc +@@ -2715,7 +2715,8 @@ static const ARMInsn vec_cmp0_insn[16] = { + + static void tcg_out_vec_op(TCGContext *s, TCGOpcode opc, + unsigned vecl, unsigned vece, +- const TCGArg *args, const int *const_args) ++ const TCGArg args[TCG_MAX_OP_ARGS], ++ const int const_args[TCG_MAX_OP_ARGS]) + { + TCGType type = vecl + TCG_TYPE_V64; + unsigned q = vecl;