[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 1/5] meson: Unify mips and mips64 in host_arch
From: |
Richard Henderson |
Subject: |
[PULL 1/5] meson: Unify mips and mips64 in host_arch |
Date: |
Mon, 3 Jan 2022 09:33:22 -0800 |
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>
---
meson.build | 2 ++
1 file changed, 2 insertions(+)
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
--
2.25.1
- [PULL 0/5] Misc patch queue, Richard Henderson, 2022/01/03
- [PULL 1/5] meson: Unify mips and mips64 in host_arch,
Richard Henderson <=
- [PULL 3/5] tests/tcg: Unconditionally use 90 second timeout, Richard Henderson, 2022/01/03
- [PULL 4/5] target/hppa: Fix atomic_store_3 for STBY, Richard Henderson, 2022/01/03
- [PULL 5/5] gitlab: Disable check-python-tox, Richard Henderson, 2022/01/03
- [PULL 2/5] tests/tcg: Use $cpu in configure.sh, Richard Henderson, 2022/01/03
- Re: [PULL 0/5] Misc patch queue, Richard Henderson, 2022/01/03