Branch: refs/heads/staging
Home: https://github.com/qemu/qemu
Commit: 19aa2ec3fcc070d627bccee229b8dbb3c0e457ac
https://github.com/qemu/qemu/commit/19aa2ec3fcc070d627bccee229b8dbb3c0e457ac
Author: Philippe Mathieu-Daudé <[email protected]>
Date: 2023-07-11 (Tue, 11 Jul 2023)
Changed paths:
M meson.build
Log Message:
-----------
meson: Fix cross-building for RISCV host
While when building on native Linux the host architecture
is reported as "riscv32" or "riscv64":
Host machine cpu family: riscv64
Host machine cpu: riscv64
Found pkg-config: /usr/bin/pkg-config (0.29.2)
When cross-compiling it is detected as "riscv". Meson handles
the cross-detection but displays a warning:
WARNING: Unknown CPU family riscv, please report this at
https://github.com/mesonbuild/meson/issues/new
Host machine cpu family: riscv
Host machine cpu: riscv
Target machine cpu family: riscv
Target machine cpu: riscv
Found pkg-config: /usr/bin/riscv64-linux-gnu-pkg-config (1.8.1)
Commit 278c1bcef5 was tested on native host but not under
cross environment, and now we get on our cross-riscv64-system
Gitlab-CI job:
WARNING: Unknown CPU family riscv, please report this at
https://github.com/mesonbuild/meson/issues/new
Host machine cpu family: riscv
Host machine cpu: riscv
Target machine cpu family: riscv
Target machine cpu: riscv
../meson.build:684:6: ERROR: Problem encountered: Unsupported CPU riscv, try
--enable-tcg-interpreter
As a kludge, re-introduce "riscv" in the supported_cpus[] array.
Fixes: 278c1bcef5 ("target/riscv: Only unify 'riscv32/64' -> 'riscv' for host
cpu in meson")
Reported-by: Richard Henderson <[email protected]>
Signed-off-by: Philippe Mathieu-Daudé <[email protected]>
Message-Id: <[email protected]>
Signed-off-by: Richard Henderson <[email protected]>
Commit: 66fa3be698aaefca113ec66b22d68a037d39c387
https://github.com/qemu/qemu/commit/66fa3be698aaefca113ec66b22d68a037d39c387
Author: Richard Henderson <[email protected]>
Date: 2023-07-11 (Tue, 11 Jul 2023)
Changed paths:
M tcg/tcg.c
Log Message:
-----------
tcg: Fix info_in_idx increment in layout_arg_by_ref
Off by one error, failing to take into account that layout_arg_1
already incremented info_in_idx for the first piece. We only
need care for the n-1 TCG_CALL_ARG_BY_REF_N pieces here.
Cc: [email protected]
Fixes: 313bdea84d2 ("tcg: Add TCG_CALL_{RET,ARG}_BY_REF")
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1751
Signed-off-by: Richard Henderson <[email protected]>
Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
Message-Id: <[email protected]>
Compare: https://github.com/qemu/qemu/compare/2bb9d628a7e1...66fa3be698aa
