From: Richard Henderson <richard.henderson@linaro.org>
Date: Fri, 31 Dec 2021 05:25:11 +0000 (+0000)
Subject: meson: Unify mips and mips64 in host_arch
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0e3ed77de51fab46d1ade0bee102e68fa376fbd8;p=qemu.git

meson: Unify mips and mips64 in host_arch

Fixes the build on a mips64 host.  Prior to the break, we identified
the arch via the __mips__ define; afterward we use meson's
host_machine.cpu_family().  Restore the previous combination.

Fixes: 823eb013452e ("configure, meson: move ARCH to meson.build")
Reported-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---

diff --git a/meson.build b/meson.build
index 886f0a9343..53065e96ec 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