Re: [PULL 07/16] configure, meson: move ARCH to meson.build

[Peter Maydell]

On Sun, 19 Dec 2021 at 14:25, Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> $ARCH and the HOST_* symbols are only used by the QEMU build; configure
> uses $cpu instead.  Remove it from config-host.mak.
>
> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  configure   | 21 ++++-----------------
>  meson.build | 26 +++++++++++++++++---------
>  2 files changed, 21 insertions(+), 26 deletions(-)
>
> diff --git a/configure b/configure
> index 108b7621e2..6e06ac6161 100755
> --- a/configure
> +++ b/configure
> @@ -635,11 +635,9 @@ else
>    cpu=$(uname -m)
>  fi
>
> -ARCH=
> -# Normalise host CPU name, set ARCH and multilib cflags
> +# Normalise host CPU name, set multilib cflags
>  # Note that this case should only have supported host CPUs, not guests.
>  case "$cpu" in
> -  aarch64|riscv) ;;
>    armv*b|armv*l|arm)
>      cpu="arm" ;;
>
> @@ -668,8 +666,7 @@ case "$cpu" in
>      CPU_CFLAGS="-m64 -mlittle" ;;
>
>    s390)
> -    CPU_CFLAGS="-m31"
> -    ARCH=unknown ;;
> +    CPU_CFLAGS="-m31" ;;
>    s390x)
>      CPU_CFLAGS="-m64" ;;
>
> @@ -678,15 +675,7 @@ case "$cpu" in
>      CPU_CFLAGS="-m32 -mv8plus -mcpu=ultrasparc" ;;
>    sparc64)
>      CPU_CFLAGS="-m64 -mcpu=ultrasparc" ;;
> -
> -  *)
> -    # This will result in either an error or falling back to TCI later
> -    ARCH=unknown
> -  ;;
>  esac
> -if test -z "$ARCH"; then
> -  ARCH="$cpu"
> -fi
>
>  : ${make=${MAKE-make}}

shellcheck points out that this (old) commit removed the code
setting ARCH from configure, but left behind a use of it:

case "$ARCH" in
alpha)
  # Ensure there's only a single GP
  QEMU_CFLAGS="-msmall-data $QEMU_CFLAGS"
;;
esac

Presumably meson.build needs to do some equivalent of this ?

thanks
-- PMM