From nobody Mon Feb 9 03:36:16 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1754499933; cv=none; d=zohomail.com; s=zohoarc; b=RMs0XxXy7T15OJJUc4kfPJIp9TOySTMNxQr4FdW/LJxJfy9w+PLuPjZO9AQhB+KjuUrk+himiGexIvCVWtqexkcxF+AZTlvoM+xtYx9oSIHYmxtxNy2i9EYgtPCB+4H4oC/Po5oFcoEYr6nPC4ptySz5fTfRhv7/2NKlqJv8MEU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754499933; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=xJlOz+Jg5Eh+vkwIFvbU82F8MEu7BNgLBhpUCzS/X/E=; b=HWr5UzLTqFg/XUaHcmvZMgj+4LLIYhL2TJ2SMhqK5LPRzjYgvcTz4agvWGA0IMBmEXAPqLJAh70aQ+TtBuU+Rz/rg/RAxGjWbfbhCL/QJdfgfQIGIeg9CbHMlr4bY1aMEXra6HiUK7F+M9OsAsIxyns85rlMSnhGue55X5SRX9w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1754499933922189.96016170004907; Wed, 6 Aug 2025 10:05:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ujhZQ-0002Yw-Vb; Wed, 06 Aug 2025 13:04:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ujgPS-0007Hs-42 for qemu-devel@nongnu.org; Wed, 06 Aug 2025 11:50:37 -0400 Received: from mail-pf1-x434.google.com ([2607:f8b0:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ujgPP-00037Y-EN for qemu-devel@nongnu.org; Wed, 06 Aug 2025 11:50:33 -0400 Received: by mail-pf1-x434.google.com with SMTP id d2e1a72fcca58-769a21bd4d5so126606b3a.0 for ; Wed, 06 Aug 2025 08:50:30 -0700 (PDT) Received: from ktock.. ([240d:1a:3b6:8b00:4cca:cbdb:3f01:1165]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-241e8976a3asm163374575ad.87.2025.08.06.08.50.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Aug 2025 08:50:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1754495430; x=1755100230; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xJlOz+Jg5Eh+vkwIFvbU82F8MEu7BNgLBhpUCzS/X/E=; b=cFUzqpfXdpl5o55S1RU4w5n2yA4UJpWThn2MsUjrNVI597baHaQyizIhfDDc2tzJjq uw8G0sSDk6Tzx32HSfMUvmr5bpnIexRB0TIcCwDiG8tJcVGVSAZa+IJxgPZw/PcZoXfR UbHztSZSXD7eOgD074bMH34f2A806RfDokWUnQu08Fx0fF/AnARiBpiOd4O0C3E/H61l gs+c4LlCkWqhHj6PsqlGGULK3DIG27oVAJaTWnbGgsw+KpJwMu3mifYxvDGIr2Ux37dV s2vIS9DZcYPyp7yQ+mnr2QHaAajzR6yOta9XXeNZ/hRg2aTBdnw6AuXr93r12F7tslTC Qv3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754495430; x=1755100230; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xJlOz+Jg5Eh+vkwIFvbU82F8MEu7BNgLBhpUCzS/X/E=; b=S6UadTRud6dGr7epFf8+XkKuWryDW31JBOzyqZjKKvEZnnNcC4ri5dG3VnW6myQW7w kzbDm75iJDgrym13NrO4uZffU9GV1VZPWOo060M9yYwcjcBaJp/Gk5rBsEPjpzoecynQ L+jPHMFXGpd08BVUiSYJQzYt9i2qTB1K0DGDV/QZPJisstUWqUBgeCrN1h9Cu+vjR36T QR+eUEzSA07mdqrkVybAKyEBSBPfdTSYBm32YK4eLfBL4i+VDgh80zyB3c4/S2QMCy/0 oXEQYVot4gHZgcmS064C8rPpKZvc0yxKlLqUBZucyc8HiCxs1Y3Oc/3srBg6Eyx7pYQD fG2A== X-Gm-Message-State: AOJu0YyxeGt6q3DOjoe3nhvkPesvK6tW1Fz2MWSUgWBvPXjd8dJwCp4q qnJFhDD2oIYSLCrlef4izOYjl35a9hh84rjg/nEaKMD09acRbVxZmGdQHdVqQg== X-Gm-Gg: ASbGncsygZ5AvEpKLcRKTLyzdcd6ojznlCMbrh1eAC12QMnkXs07do7iYGvkORLaWBA iKAvHmOmhpYZpGjfWPv+bsPAulXMd5RmMrkKxn3mx67vdn3ufvhYKUBr22qCU8S9YS8isTkWsFx 8kKW8LNglhsdlwUCtitXFuvADnW9QOEFOAUu0RrjKgBhE2a6vuF2EbBci362I3YcuTdmkZOFe0i dQNCzBNAo/btJJMAWKT/mTgwYUt8eTHhrsON7QwM1mXD6SeysbMX4X6S2KRX8abhPIjYxdBZeJ6 3Mlj3RnO/GFRx5wgba16HQyHrsGbsSmVn1Xl+RVgfZn4BJgMmdqFey+W4WacaTf95OOzmhCHgwv 6GtDolIq2U6ZpKZa1J09jRcmuF/l15+nD X-Google-Smtp-Source: AGHT+IHlWUkoAJSlKgoqYOsN42Bumz9b1gBCwHLnV+2jn8B4zHHFrPYtMiYa4wO86b6IVDtCInpARA== X-Received: by 2002:a17:902:e54d:b0:242:a0b0:3c1b with SMTP id d9443c01a7336-242a0b03f31mr35484625ad.30.1754495429670; Wed, 06 Aug 2025 08:50:29 -0700 (PDT) From: Kohei Tokunaga To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Stefan Hajnoczi , Pierrick Bouvier , ktokunaga.mail@gmail.com Subject: [PATCH v2 1/4] meson: Add wasm64 support to the --cpu flag Date: Thu, 7 Aug 2025 00:49:48 +0900 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::434; envelope-from=ktokunaga.mail@gmail.com; helo=mail-pf1-x434.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1754499936381124100 Content-Type: text/plain; charset="utf-8" wasm64 target enables 64bit pointers using Emscripten's -sMEMORY64=3D1 flag[1]. This enables QEMU to run 64bit guests. Although the configure script uses "uname -m" as the fallback value when "cpu" is empty, this can't be used for Emscripten which targets to Wasm. So, in wasm build, this commit fixes configure to require --cpu flag to be explicitly specified by the user. [1] https://emscripten.org/docs/tools_reference/settings_reference.html#mem= ory64 Signed-off-by: Kohei Tokunaga Reviewed-by: Pierrick Bouvier --- configure | 6 +++++- meson.build | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 825057ebf1..7f3893a42f 100755 --- a/configure +++ b/configure @@ -365,7 +365,6 @@ elif check_define __APPLE__; then host_os=3Ddarwin elif check_define EMSCRIPTEN ; then host_os=3Demscripten - cpu=3Dwasm32 cross_compile=3D"yes" else # This is a fatal error, but don't report it yet, because we @@ -425,6 +424,8 @@ elif check_define __aarch64__ ; then cpu=3D"aarch64" elif check_define __loongarch64 ; then cpu=3D"loongarch64" +elif check_define EMSCRIPTEN ; then + error_exit "wasm32 or wasm64 must be specified to the cpu flag" else # Using uname is really broken, but it is just a fallback for architectu= res # that are going to use TCI anyway @@ -535,6 +536,9 @@ case "$cpu" in wasm32) CPU_CFLAGS=3D"-m32" ;; + wasm64) + CPU_CFLAGS=3D"-m64 -sMEMORY64=3D1" + ;; esac =20 if test -n "$host_arch" && { diff --git a/meson.build b/meson.build index e53cd5b413..291fe3f0d0 100644 --- a/meson.build +++ b/meson.build @@ -52,7 +52,7 @@ qapi_trace_events =3D [] bsd_oses =3D ['gnu/kfreebsd', 'freebsd', 'netbsd', 'openbsd', 'dragonfly',= 'darwin'] supported_oses =3D ['windows', 'freebsd', 'netbsd', 'openbsd', 'darwin', '= sunos', 'linux', 'emscripten'] supported_cpus =3D ['ppc', 'ppc64', 's390x', 'riscv32', 'riscv64', 'x86', = 'x86_64', - 'arm', 'aarch64', 'loongarch64', 'mips', 'mips64', 'sparc64', 'wasm32'] + 'arm', 'aarch64', 'loongarch64', 'mips', 'mips64', 'sparc64', 'wasm32', = 'wasm64'] =20 cpu =3D host_machine.cpu_family() =20 @@ -916,7 +916,7 @@ if have_tcg if not get_option('tcg_interpreter') error('Unsupported CPU @0@, try --enable-tcg-interpreter'.format(cpu= )) endif - elif host_arch =3D=3D 'wasm32' + elif host_arch =3D=3D 'wasm32' or host_arch =3D=3D 'wasm64' if not get_option('tcg_interpreter') error('WebAssembly host requires --enable-tcg-interpreter') endif --=20 2.43.0