diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2022-01-03 09:34:41 -0800 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2022-01-03 09:34:41 -0800 |
| commit | b5a3d8bc9146ba22a25116cb748c97341bf99737 (patch) | |
| tree | ee128256bea83d2700f87ba6e3afbf91516af732 /meson.build | |
| parent | 814a0505302d6af277557f10f88d3639eff7a547 (diff) | |
| parent | 5c23f0c3191907000bab278654570a7d5879822a (diff) | |
| download | qemu-b5a3d8bc9146ba22a25116cb748c97341bf99737.zip qemu-b5a3d8bc9146ba22a25116cb748c97341bf99737.tar.gz qemu-b5a3d8bc9146ba22a25116cb748c97341bf99737.tar.bz2 | |
Merge tag 'pull-misc-20220103' of https://gitlab.com/rth7680/qemu into staging
Fix some meson conversion breakage
Disable check-python-tox
Fix emulation of hppa STBY insn
# gpg: Signature made Mon 03 Jan 2022 09:31:48 AM PST
# gpg: using RSA key 7A481E78868B4DB6A85A05C064DF38E8AF7E215F
# gpg: issuer "richard.henderson@linaro.org"
# gpg: Good signature from "Richard Henderson <richard.henderson@linaro.org>" [ultimate]
* tag 'pull-misc-20220103' of https://gitlab.com/rth7680/qemu:
gitlab: Disable check-python-tox
target/hppa: Fix atomic_store_3 for STBY
tests/tcg: Unconditionally use 90 second timeout
tests/tcg: Use $cpu in configure.sh
meson: Unify mips and mips64 in host_arch
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/meson.build b/meson.build index 886f0a9..53065e9 100644 --- a/meson.build +++ b/meson.build @@ -74,6 +74,8 @@ if cpu not in supported_cpus host_arch = 'unknown' elif cpu == 'x86' host_arch = 'i386' +elif cpu == 'mips64' + host_arch = 'mips' else host_arch = cpu endif |