On Tue, 16 Nov 2021 at 09:52, Richard Henderson <richard.hender...@linaro.org> wrote: > > In ba0e73336200, we merged riscv32 and riscv64 in configure. > However, meson does not treat them the same. We need to merge > them here as well. > > Fixes: ba0e73336200 > Signed-off-by: Richard Henderson <richard.hender...@linaro.org> > --- > > At the moment, configure for riscv64 host fails during meson. > > > r~ > > --- > meson.build | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/meson.build b/meson.build > index 2ece4fe088..ccc6cefc25 100644 > --- a/meson.build > +++ b/meson.build > @@ -59,6 +59,12 @@ supported_cpus = ['ppc', 'ppc64', 's390x', 'riscv', 'x86', > 'x86_64', > 'arm', 'aarch64', 'mips', 'mips64', 'sparc', 'sparc64'] > > cpu = host_machine.cpu_family() > + > +# Unify riscv* to a single family. > +if cpu in ['riscv32', 'riscv64'] > + cpu = 'riscv' > +endif
Needing to do this seems kinda awkward :-( -- PMM