mirror of
https://github.com/qemu/qemu.git
synced 2024-11-28 14:24:02 +08:00
target/riscv: Only unify 'riscv32/64' -> 'riscv' for host cpu in meson
We want to keep the ability to distinct between 32/64-bit host. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Message-Id: <20230627143235.29947-2-philmd@linaro.org> Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
This commit is contained in:
parent
2f849e9d7a
commit
278c1bcef5
11
meson.build
11
meson.build
@ -55,16 +55,11 @@ qapi_trace_events = []
|
||||
|
||||
bsd_oses = ['gnu/kfreebsd', 'freebsd', 'netbsd', 'openbsd', 'dragonfly', 'darwin']
|
||||
supported_oses = ['windows', 'freebsd', 'netbsd', 'openbsd', 'darwin', 'sunos', 'linux']
|
||||
supported_cpus = ['ppc', 'ppc64', 's390x', 'riscv', 'x86', 'x86_64',
|
||||
supported_cpus = ['ppc', 'ppc64', 's390x', 'riscv32', 'riscv64', 'x86', 'x86_64',
|
||||
'arm', 'aarch64', 'loongarch64', 'mips', 'mips64', 'sparc64']
|
||||
|
||||
cpu = host_machine.cpu_family()
|
||||
|
||||
# Unify riscv* to a single family.
|
||||
if cpu in ['riscv32', 'riscv64']
|
||||
cpu = 'riscv'
|
||||
endif
|
||||
|
||||
target_dirs = config_host['TARGET_DIRS'].split()
|
||||
have_linux_user = false
|
||||
have_bsd_user = false
|
||||
@ -99,6 +94,8 @@ elif cpu == 'x86'
|
||||
host_arch = 'i386'
|
||||
elif cpu == 'mips64'
|
||||
host_arch = 'mips'
|
||||
elif cpu in ['riscv32', 'riscv64']
|
||||
host_arch = 'riscv'
|
||||
else
|
||||
host_arch = cpu
|
||||
endif
|
||||
@ -113,7 +110,7 @@ elif cpu in ['ppc', 'ppc64']
|
||||
kvm_targets = ['ppc-softmmu', 'ppc64-softmmu']
|
||||
elif cpu in ['mips', 'mips64']
|
||||
kvm_targets = ['mips-softmmu', 'mipsel-softmmu', 'mips64-softmmu', 'mips64el-softmmu']
|
||||
elif cpu in ['riscv']
|
||||
elif cpu in ['riscv32', 'riscv64']
|
||||
kvm_targets = ['riscv32-softmmu', 'riscv64-softmmu']
|
||||
else
|
||||
kvm_targets = []
|
||||
|
Loading…
Reference in New Issue
Block a user