Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: qemu/qemu
base: 2bb9d628a7e1
Choose a base ref
...
head repository: qemu/qemu
compare: 66fa3be698aa
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jul 11, 2023

  1. 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 278c1bc 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: 278c1bc ("target/riscv: Only unify 'riscv32/64' -> 'riscv' for host cpu in meson")
Reported-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230711094147.54985-1-philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
    @philmd @rth7680
    philmd authored and rth7680 committed Jul 11, 2023
    Copy the full SHA
    19aa2ec View commit details
    Browse the repository at this point in the history

  2. 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: qemu-stable@nongnu.org
Fixes: 313bdea ("tcg: Add TCG_CALL_{RET,ARG}_BY_REF")
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1751
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230707102955.5607-1-richard.henderson@linaro.org>
    @rth7680
    rth7680 committed Jul 11, 2023
    Copy the full SHA
    66fa3be View commit details
    Browse the repository at this point in the history