> The 32-bit wasm32 host is no longer supported.
>
> Signed-off-by: Richard Henderson <[email protected]>
> ---
>  configure   | 5 +----
>  meson.build | 6 +++---
>  2 files changed, 4 insertions(+), 7 deletions(-)
>
> diff --git a/configure b/configure
> index 326d27dab1..ba1b207b56 100755
> --- a/configure
> +++ b/configure
> @@ -425,7 +425,7 @@ elif check_define __aarch64__ ; then
>  elif check_define __loongarch64 ; then
>    cpu="loongarch64"
>  elif check_define EMSCRIPTEN ; then
> -  error_exit "wasm32 or wasm64 must be specified to the cpu flag"
> +  error_exit "wasm64 must be specified to the cpu flag"
>  else
>    # Using uname is really broken, but it is just a fallback for
architectures
>    # that are going to use TCI anyway
> @@ -523,9 +523,6 @@ case "$cpu" in
>      linux_arch=x86
>      CPU_CFLAGS="-m64"
>      ;;
> -  wasm32)
> -    CPU_CFLAGS="-m32"
> -    ;;
>    wasm64)
>      CPU_CFLAGS="-m64 -sMEMORY64=$wasm64_memory64"
>      ;;
> diff --git a/meson.build b/meson.build
> index 28f61be675..082c7a86ca 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -51,7 +51,7 @@ qapi_trace_events = []
>  bsd_oses = ['gnu/kfreebsd', 'freebsd', 'netbsd', 'openbsd', 'dragonfly',
'darwin']
>  supported_oses = ['windows', 'freebsd', 'netbsd', 'openbsd', 'darwin',
'sunos', 'linux', 'emscripten']
>  supported_cpus = ['ppc', 'ppc64', 's390x', 'riscv32', 'riscv64', 'x86',
'x86_64',
> -  'arm', 'aarch64', 'loongarch64', 'mips64', 'sparc64', 'wasm32',
'wasm64']
> +  'arm', 'aarch64', 'loongarch64', 'mips64', 'sparc64', 'wasm64']
>
>  cpu = host_machine.cpu_family()
>
> @@ -927,7 +927,7 @@ if have_tcg
>      if not get_option('tcg_interpreter')
>        error('Unsupported CPU @0@, try
--enable-tcg-interpreter'.format(cpu))
>      endif
> -  elif host_arch == 'wasm32' or host_arch == 'wasm64'
> +  elif host_arch == 'wasm64'
>      if not get_option('tcg_interpreter')
>        error('WebAssembly host requires --enable-tcg-interpreter')
>      endif
> @@ -4248,7 +4248,7 @@ if have_rust
>      bindgen_args_common += ['--merge-extern-blocks']
>    endif
>    bindgen_c_args = []
> -  if host_arch == 'wasm32'
> +  if host_arch == 'wasm64'
>      bindgen_c_args += ['-fvisibility=default']
>    endif
>    subdir('rust')

Reviewed-by: Kohei Tokunaga <[email protected]>

Reply via email to