From nobody Sat Feb 7 08:44:36 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=1768312570; cv=none; d=zohomail.com; s=zohoarc; b=GWkeUx98+ZdxkqnwGHI2mROOYEOENV9sOt87+vS/JmmISUSpzmdJV6R1N/Y47d777q8+Czjv9dcvlSaKCD7CUT3SP785yA0qZiXyMlSm2aoGLMfVmceNheEjGZaYThVaLzVcJEihnPMV+qlIl5PgeVx+cTn5BRJ0WX/x/RsfT2Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768312570; 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=UV+nDC+Oo5TrLoCwsmUkKSCdy3gjvk4o+sIDLbsc5vg=; b=oHSEDDQwx8L4zIXsm/sm077FQm2/xydh1ixgo/xIr+649gpI0o224oH6H13Gr9siGMhHLRbqXxa/Nwd86MUtcOMi416lUAz1KARDqDjG4FbTjK065W9KgYbUXpUZX8tK7rFhD9YONw++uejZ1rOlrSXm2zy+HM6aEQ1z1y/lXR4= 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 1768312570478474.249984871978; Tue, 13 Jan 2026 05:56:10 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vferP-0003AC-Dx; Tue, 13 Jan 2026 08:55:03 -0500 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 1vferN-00039e-QI for qemu-devel@nongnu.org; Tue, 13 Jan 2026 08:55:01 -0500 Received: from mail-pl1-x635.google.com ([2607:f8b0:4864:20::635]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vferM-0000MP-3F for qemu-devel@nongnu.org; Tue, 13 Jan 2026 08:55:01 -0500 Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-2a081c163b0so48903395ad.0 for ; Tue, 13 Jan 2026 05:54:59 -0800 (PST) Received: from ktock.. ([240d:1a:3b6:8b00:eb29:7536:a39f:7476]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a3e3c3a2eesm38240465ad.6.2026.01.13.05.54.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Jan 2026 05:54:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768312499; x=1768917299; 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=UV+nDC+Oo5TrLoCwsmUkKSCdy3gjvk4o+sIDLbsc5vg=; b=h12rjZEVUYKvQQIOvRazeMhPsRwIA2hTuj3HxnJ2GTT7q6TdQZ2s3R3ZDgxKWcclfL ogj50msIGnLfpPLoM7H27f7u5DDyZQN82LXMh0qJylb4W/z6X1ixDmNaE33hYpwf63nw wRO3yhLdbaS4lU3pdMxOqUCPa7k5IwSb7VE5zOO8tT3IjaPvsNSe4xWR8HCSSlHEfljB TWMHp1Hyzgpl6pV6lkHWLYRuSBx4qHSYlUcJUI/ogGwNkdN4BLVOdT+DwMa+vqLk9TlY MHD/Q4s7MXMhWv8NBhn23W2UpksC7fOHwKMP+oT8jF0PoD2m63Rc2xUxXYaFM1gPgqnV LdfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768312499; x=1768917299; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=UV+nDC+Oo5TrLoCwsmUkKSCdy3gjvk4o+sIDLbsc5vg=; b=SYaebn0FDQy4Q3d/JgkIbD4eBOWLQJ2/4AHL+Ygh2+GpnCReVREM4vj+0Kvn8Y1n42 HWaLCS4coSnzU3Mwjsd9UrRWyQlUYcBxK7SUatpdlLzc0Tapca0lvDg7Bc5yvS7tqLhb HFRabBS+xjx8xkmBtN5xNojBGIxcuRDlZ64cjyefga+GbEG3Il1nUoDu7Pe4R8dSOECR m/2EgEJ1+fyAKrJdFi3+8Gsy/w0EzuUKaUmgpVEaABWnLV4Bv9Z7o/UOx6w9/KFVi6yJ 8QbpjtDuDE0CXlMkAli+bDTKEU+YurFCQ2nUAq1A6anDxYgH+gwmpJ3tbRI00sB6659/ /uXg== X-Gm-Message-State: AOJu0YykKmLR3kWXcF26tZHBVpcyM13nueZ8JxTFJOKCEIlQJrrIj8yu sEYLAdc7dqE4xGfXUeUGO1H6/msSvdteV6dXA8qCGwbuFwQXGTfN0zIuMEBbupSU X-Gm-Gg: AY/fxX5EDexiK0+iXMrl2kKpx3u+FndztgUbR0Z+/p+PLaIuRc6kfNiZsbK8PYLteN3 XlTGx4QrcOagSMjU5PI5UrMXp8XmWO0RUIFBUSjWF9ED5XWS1TlyjbXj2mTvGHBKJxNpQRaZuPa puYWEYTZpiJP+OQXaLjxoBUPfiiS6Kvl2vinWuUQhO1A13I1uXm0rZSmt6JBwZIEFSrlGvavpDN xho08dMXzP7Ir5FLRQL2xV71UuHUXIHgJwOv9jjtj/awQfbgAh/6yKiNP+X2ebc+RT1BXVCOW95 CdhPt86rdowIdbTBPWaCiKFLSdO/LcJj0ysIbFUtPRHmeGPed6z4pk4sEYNHc39zal7BbzwV1Bw G178G4IRBpgFKCxbsDFzATC5un+SfBKDFCIkfQ3cdQgn8rtK5VL0EkdoJsZrero+Uxc5gJjC/0i TZ0OXJLTBR0A== X-Google-Smtp-Source: AGHT+IFX8ZYUN7T6V//J5KlGZIda5ht1KbDs1O0wITEkOzZUNqMwhFlnKFg7/yS8+h3lQ7qkWfD3ZA== X-Received: by 2002:a17:903:b90:b0:2a0:b461:c883 with SMTP id d9443c01a7336-2a3ee4900e1mr199312895ad.45.1768312498596; Tue, 13 Jan 2026 05:54:58 -0800 (PST) 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?= , Kohei Tokunaga , Stefan Hajnoczi , Pierrick Bouvier , Richard Henderson Subject: [PATCH v5 1/4] meson: Add wasm64 support to the --cpu flag Date: Tue, 13 Jan 2026 22:54:28 +0900 Message-ID: <91f16f0e9ae6b36fbf0c2caac510dcf855120400.1768308374.git.ktokunaga.mail@gmail.com> 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 (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::635; envelope-from=ktokunaga.mail@gmail.com; helo=mail-pl1-x635.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: qemu development 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: 1768312573045158500 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- configure | 6 +++++- meson.build | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 55e0bd3425..92bfc5f976 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 @@ -419,6 +418,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 @@ -519,6 +520,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 db87358d62..d072473243 100644 --- a/meson.build +++ b/meson.build @@ -51,7 +51,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', 'mips64', 'sparc64', 'wasm32'] + 'arm', 'aarch64', 'loongarch64', 'mips64', 'sparc64', 'wasm32', 'wasm64'] =20 cpu =3D host_machine.cpu_family() =20 @@ -914,7 +914,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 From nobody Sat Feb 7 08:44:36 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=1768312544; cv=none; d=zohomail.com; s=zohoarc; b=LkXMsr3TIkSkcpIfTi5+/QWLvSxKgylLOAj1afIcX+PorB8zXrwKUX0kXGm/B8jt8X/2/7tQd0AfmhgxhSsNA/178aj7ylJ2TEzVYzL2nqwxIuzrTG1+Bd3ZZ8ZWxWaxdObLM6HdF12f2OA2SdtNCjhZL7abGA14xFalxzqJiW4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768312544; h=Content-Type: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=KSK09h4xKjsISSidIbADfOirq0TnGihmtXpNzolifyA=; b=S162/oRXuT20e4crREkWZXy7q7/4IhwQZ9hQ1pTYcz48n8Z7ZFdxVkOf0jrq+gOCg2qYui/tr5HuYrOvvKu91R4dmBftwSqRJuJl4hq65FGyRs/5LzLw5hwbdIWG8KU/u5p+jPOUr7GAIaqBt7vziZYlgupv9haCr0a+y7GpOBQ= 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 1768312544444598.5866893441612; Tue, 13 Jan 2026 05:55:44 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vferT-0003F8-1f; Tue, 13 Jan 2026 08:55:07 -0500 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 1vferR-0003EN-1X for qemu-devel@nongnu.org; Tue, 13 Jan 2026 08:55:05 -0500 Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vferP-0000RQ-Cz for qemu-devel@nongnu.org; Tue, 13 Jan 2026 08:55:04 -0500 Received: by mail-pl1-x631.google.com with SMTP id d9443c01a7336-2a137692691so50036985ad.0 for ; Tue, 13 Jan 2026 05:55:03 -0800 (PST) Received: from ktock.. ([240d:1a:3b6:8b00:eb29:7536:a39f:7476]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a3e3c3a2eesm38240465ad.6.2026.01.13.05.54.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Jan 2026 05:55:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768312502; x=1768917302; 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=KSK09h4xKjsISSidIbADfOirq0TnGihmtXpNzolifyA=; b=cytRlgf4f3q2P1syW8yjAgVk0PFeSrrjg+dur/UXw1smjjaLrkDgfx0M0Wit4Crocr HLK/3JrAJ6UJNjeyPQtEpn/U5TMnL5AbHOSfYvL87bdMZkXglIi+O/cUQ8sgYUGkMyBj M5kcgVCtO86kDpMgmnM2HgnSyRs8Ywtwe41A09YQTzY+XgC6l1BR8hUtHk+RzrXulmo3 dG7nKX064+n0oInPVCXEqEhCWk2tbOtOoWmxhCQ2BRMY0WhHVKERlDg7eMaTk3SSqlfG TU9JN3+DkTw398QTmlA2cOH4WJ9lLXm/jLFrU9tf/OIx8uKVJODTYWrL1MJElDbvZt+P N8kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768312502; x=1768917302; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=KSK09h4xKjsISSidIbADfOirq0TnGihmtXpNzolifyA=; b=p13ChpW/hLdjM09AH3R5SUtenSiNekCOMYBKGJqPpuPVketBePrMu+gJPwaodM3q0W Qd+TScvMZlB+rBf7v98l/RGa5YaoYoWCPgaz3G/DhEIgl0LpBdkYfvC8Xl+Wz2/Z2g5Y mdZuFYfK7AmRCgc/4dyO/XPLIqOxklK2hItXzMEhn36zzY0RjwfY3WVli/Cmp2MsUkVW OerKee/ijKsw2J9mVBtBlzU3RhqPjz7EsRWhMiL+sxSZ7rHx5MeIqKrlsxLYVTVMFo3A 9/7zJzx1sEbymO2uUmpxryrxwxxx1mrSdMd4YnZVw1ntmgByznGACj9wQZMOlcC2eZID KWew== X-Gm-Message-State: AOJu0YyJfTadhSq+mUGr+sNz0E7c0O+rWcvW4CE70nvmFfH4ZWsST0f8 auuML/4EDzS3218HyrOZzbjrpInl9QiPIjm38CNjWdu/TSv6ovXigQ5+8qG/7Qp/ X-Gm-Gg: AY/fxX4M1wZM4ccJihN5siemaH9WHZMWw+Xqac8pMFTdj/rd9U1vDPflahVEPD54k8w n3IrYlpmkwDYPWBI9kRs/ScJoF2b1pRLTeZnEdjwFQV7UBRhcqF6D+6WDGggWdBf/nvABPwouL8 /sx07gcoPk1TOH4k5aajfWPJMLZHO/5giNxljLASz3XRcNYRAIp5Cj5MDIvoro6ZFV2uxLA+zpY Kh4j/04Z7tMj5KcGnF5OfGDCVS4liNLMaOk7iC/qcObot2leXaaqWCG61W2FtAUYL9h8Gh26xCD tgOHsxkHLaO8hQVYm05IwvBrW8PgUcGcO17AW8jadW8fIIxCjCDX1hCjsgSkfSTtHUHjrVFdDRa lnpt9AxC+ibtNtL0TOryYFYtwIBTIiH9hKgMdUYoqeXbCk/tO3PwSZSubB3xXpb+75GFUUAvCJf 9p2U7iNEw+ZA== X-Google-Smtp-Source: AGHT+IFJ4xNyRvc45LnSLRhtPvJefl/YLACSGyGRmV7U2ClFrkkFuNQTxyRybRiVquiveKU/RSNkEQ== X-Received: by 2002:a17:903:388e:b0:2a2:f0cd:4351 with SMTP id d9443c01a7336-2a3ee4e85f6mr187471985ad.37.1768312502089; Tue, 13 Jan 2026 05:55:02 -0800 (PST) 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?= , Kohei Tokunaga , Stefan Hajnoczi , Pierrick Bouvier , Richard Henderson Subject: [PATCH v5 2/4] configure: Enable to propagate -sMEMORY64 flag to Emscripten Date: Tue, 13 Jan 2026 22:54:29 +0900 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 (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::631; envelope-from=ktokunaga.mail@gmail.com; helo=mail-pl1-x631.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: qemu development 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: 1768312544903158500 Currently there are some engines that don't support wasm64 (e.g. unsupported on Safari[1]). To mitigate this issue, the configure script allows the user to use Emscripten's compatibility feature, "-sMEMORY64=3D2" flag[2]. Emscripten's "-sMEMORY64=3D2" flag still enables 64bit pointers in C code. = But this flag lowers the output binary into wasm32, with limiting the maximum memory size to 4GB. So QEMU can run on wasm32 engines. [1] https://webassembly.org/features/ [2] https://emscripten.org/docs/tools_reference/settings_reference.html#mem= ory64 Signed-off-by: Kohei Tokunaga Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- configure | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 92bfc5f976..326d27dab1 100755 --- a/configure +++ b/configure @@ -182,6 +182,10 @@ EXTRA_CXXFLAGS=3D"" EXTRA_OBJCFLAGS=3D"" EXTRA_LDFLAGS=3D"" =20 +# The value is propagated to Emscripten's "-sMEMORY64" flag. +# https://emscripten.org/docs/tools_reference/settings_reference.html#memo= ry64 +wasm64_memory64=3D1 + # Default value for a variable defining feature "foo". # * foo=3D"no" feature will only be used if --enable-foo arg is given # * foo=3D"" feature will be searched for, and if found, will be used @@ -239,6 +243,8 @@ for opt do ;; --without-default-features) default_feature=3D"no" ;; + --wasm64-32bit-address-limit) wasm64_memory64=3D"2" + ;; esac done =20 @@ -521,7 +527,7 @@ case "$cpu" in CPU_CFLAGS=3D"-m32" ;; wasm64) - CPU_CFLAGS=3D"-m64 -sMEMORY64=3D1" + CPU_CFLAGS=3D"-m64 -sMEMORY64=3D$wasm64_memory64" ;; esac =20 @@ -779,6 +785,8 @@ for opt do ;; --disable-rust) rust=3Ddisabled ;; + --wasm64-32bit-address-limit) + ;; # everything else has the same name in configure and meson --*) meson_option_parse "$opt" "$optarg" ;; @@ -904,6 +912,8 @@ Advanced options (experts only): --disable-containers don't use containers for cross-building --container-engine=3DTYPE which container engine to use [$container_eng= ine] --gdb=3DGDB-path gdb to use for gdbstub tests [$gdb_bin] + --wasm64-32bit-address-limit Restrict wasm64 address space to 32-bit (de= fault + is to use the whole 64-bit range). EOF meson_options_help cat << EOF --=20 2.43.0 From nobody Sat Feb 7 08:44:36 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=1768312536; cv=none; d=zohomail.com; s=zohoarc; b=GeNNVqHi6HOJEje2T7eAcfVN+8FJW2BhIZHcw25MFxsv3O8F8CN2HOLk/gbyV0YD3V2gv9cTFsOCa4AfFntqmMlARElHDLzf0lmc+g4YtgzCcWin5WJN0OC6YwAZGDw2Wm8Fh+UjUwy/rEv6Bzrbj6UNIpBi5tmqR5RsaSvc0OQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768312536; 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=iU/mkCd8lSJXdjfaFgASvcWxf6nZ4ct5ah9im64aH+o=; b=n5xwMJ5HM34QaGP4nA+2z1TaRcQDAHu7dJsCwCUv7+01Np56bQFnImgT48mdz7w89NrOW2+yFUvJWn052fDoxC1HT/NDgOxEp4Ihd7vD10wGAKHIvtON9wZzk5q1Mx6i6btX3vQLoFHk6cVGUoDUldSpSZZafzD5VMs5dUp9YA8= 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 1768312536192318.9051418003145; Tue, 13 Jan 2026 05:55:36 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vferW-0003Gl-Lq; Tue, 13 Jan 2026 08:55:10 -0500 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 1vferU-0003GV-Rq for qemu-devel@nongnu.org; Tue, 13 Jan 2026 08:55:08 -0500 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vferT-0000YI-4v for qemu-devel@nongnu.org; Tue, 13 Jan 2026 08:55:08 -0500 Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-2a0bb2f093aso51850295ad.3 for ; Tue, 13 Jan 2026 05:55:06 -0800 (PST) Received: from ktock.. ([240d:1a:3b6:8b00:eb29:7536:a39f:7476]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a3e3c3a2eesm38240465ad.6.2026.01.13.05.55.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Jan 2026 05:55:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768312506; x=1768917306; 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=iU/mkCd8lSJXdjfaFgASvcWxf6nZ4ct5ah9im64aH+o=; b=UB2wUXsHFva6EMx/d6yI+zIZJIGDQ8LUsLqpJoMISBxbMY24ZDbyDygdsr1UUThU8/ OkCYJqRvHWUTHAJcVCNHtCYoKbY4GZGZsTKYc8y0mJFxcmD02FIdpLePvRQyWgkfu4wq bNKoNFQLZy788swh5H123Ojhi/SkYj3H2w2+Dhhap7zgFXwk+PHFvD1Cvt7Lz8iYMKgx wPh5ngt24mTzsLsHUEm/mhUXcRxDntkPD4CMmlDsnLp8FNLogs2f8izCBAvaAq3abKrp zDQvjBT3va6p2msPS5ZwBgMFZt2Gw2Sea5gvzuZVr/LA+9I0IPpCNWhwAbNRMjlwl3CZ YL4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768312506; x=1768917306; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=iU/mkCd8lSJXdjfaFgASvcWxf6nZ4ct5ah9im64aH+o=; b=lIOLZA+CqWYbqiHDFZpN7kdloAUQvAGao9ZYfGvFx9j+cb1iDO17Rc4YtuhTb+mK3+ YSWLvsF9V5alTBHjSk1uNHqa8beccXV/DvaKc3D6nPvhyoIGHN16n6KCRdnpgYVuPdaZ zty7H/S+9AtMBqS8lP8kMX9ohLYO70zRUHlE8M4XJIAYfaoUWTj0CfsiXjzT9kqOV3jB ZbtmTr3KJJaor+Ul0/pH6TYbZWfIrAwR+zLlp4X6gysUfgi6X2EC+zLDaQmRrHgyN3VA fDKGOdGQxWrE44wl3FvlT5k8LdYvEkakcKrJXjnh3Hj7juvODfiyP2i0b4v+UIB3pM0A CPpA== X-Gm-Message-State: AOJu0YzB9oW2CUsxRvNy+2Ra3IxEwUGD4U4Vze1blVwFTrkPqgXifYTq JsiME1puFuzKw8tUAw4X74vyOqbuG5rQe+a9r9RUjpwjCrp/HshjkIsBM0++qUIS X-Gm-Gg: AY/fxX6cfLWsdw38C6H11QEZPnLT5k4NOIPISPe5KLs1nJG4gdhGGWEFkv/sftRFZ4o uv48k3PVtl7zJAls+Ex1GQ4k4GnEah2jNAZ1NfTwqp6p4uoO/jptIXQkAJKlRIWgmaB0SXbxvzJ Cf7iajbeGcFw9D1NMYIbfCLdw/ZkasC3qR5vUfxXFzUuxyB6GgluLDaqC8tOraVpvu2vwPxECKs JJxqdIq+oJ5LYbTiAXhO3GIdKG6BDq5GAT8xOc+x5dgDG/MVXi1HaV5RHHtHjYpgwOGU/8sWENZ vq4MvPXMUJpsfnn0GHK2qLkXcdVGKBBoGhSq9S3V/WUfAnN+evqQ0i5WCyLRVM5uUvnes7ShWWP fj69NWCRcVYFzMK6uq7yRCFEDeeJeUhOTtBGHOsRCZwa2IQkBYMVCAP39JAaQZu39nMunqAZOjs eqsihNLj0Pfw== X-Google-Smtp-Source: AGHT+IHFTcBO0rKJ3ElnxEZCc2IDGYW9i1qtmonAPXqeWHU+YI/WAhFkzTOCfrsIG72ZEo0esMIxDA== X-Received: by 2002:a17:903:3c4d:b0:2a0:de4f:c99 with SMTP id d9443c01a7336-2a3ee4378f8mr164682305ad.9.1768312505602; Tue, 13 Jan 2026 05:55:05 -0800 (PST) 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?= , Kohei Tokunaga , Stefan Hajnoczi , Pierrick Bouvier , Richard Henderson Subject: [PATCH v5 3/4] dockerfiles: Add support for wasm64 to the wasm Dockerfile Date: Tue, 13 Jan 2026 22:54:30 +0900 Message-ID: <3f21342f50e0412a32143fe21ecc0d8db95b3f37.1768308374.git.ktokunaga.mail@gmail.com> 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 (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::636; envelope-from=ktokunaga.mail@gmail.com; helo=mail-pl1-x636.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: qemu development 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: 1768312539001158500 Content-Type: text/plain; charset="utf-8" This commit fixes Dockerfile of the wasm build to support both of wasm32 and wasm64 build. Dockerfile takes the following build argument and use it for building dependencies. - TARGET_CPU: target wasm arch (wasm32 or wasm64) Signed-off-by: Kohei Tokunaga Reviewed-by: Pierrick Bouvier --- MAINTAINERS | 2 +- ...2-cross.docker =3D> emsdk-wasm-cross.docker} | 26 ++++++++++++++----- 2 files changed, 20 insertions(+), 8 deletions(-) rename tests/docker/dockerfiles/{emsdk-wasm32-cross.docker =3D> emsdk-wasm= -cross.docker} (89%) V5: - Removed -sMEMORY64 from the environment variables (e.g. CFLAGS) in the QEMU compilation stage. - Updated the Dockerfile to build dependencies always with -sMEMORY64=3D1 f= or wasm64 target. The final QEMU compilation can be lowered to wasm32 by using configure's --wasm64-32bit-address-limit flag which enables Emscripten's MEMORY64=3D2. diff --git a/MAINTAINERS b/MAINTAINERS index 9a55b649e8..22974fdd73 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -671,7 +671,7 @@ F: include/system/os-wasm.h F: os-wasm.c F: util/coroutine-wasm.c F: configs/meson/emscripten.txt -F: tests/docker/dockerfiles/emsdk-wasm32-cross.docker +F: tests/docker/dockerfiles/emsdk-wasm-cross.docker =20 Alpha Machines -------------- diff --git a/tests/docker/dockerfiles/emsdk-wasm32-cross.docker b/tests/doc= ker/dockerfiles/emsdk-wasm-cross.docker similarity index 89% rename from tests/docker/dockerfiles/emsdk-wasm32-cross.docker rename to tests/docker/dockerfiles/emsdk-wasm-cross.docker index 1f08eb0b85..ecd5a02903 100644 --- a/tests/docker/dockerfiles/emsdk-wasm32-cross.docker +++ b/tests/docker/dockerfiles/emsdk-wasm-cross.docker @@ -1,14 +1,15 @@ # syntax =3D docker/dockerfile:1.5 =20 -ARG EMSDK_VERSION_QEMU=3D3.1.50 +ARG EMSDK_VERSION_QEMU=3D4.0.10 ARG ZLIB_VERSION=3D1.3.1 ARG GLIB_MINOR_VERSION=3D2.84 ARG GLIB_VERSION=3D${GLIB_MINOR_VERSION}.0 ARG PIXMAN_VERSION=3D0.44.2 -ARG FFI_VERSION=3Dv3.4.7 +ARG FFI_VERSION=3Dv3.5.2 ARG MESON_VERSION=3D1.5.0 +ARG TARGET_CPU=3Dwasm32 =20 -FROM docker.io/emscripten/emsdk:$EMSDK_VERSION_QEMU AS build-base +FROM docker.io/emscripten/emsdk:$EMSDK_VERSION_QEMU AS build-base-common ARG MESON_VERSION ENV TARGET=3D/builddeps/target ENV CPATH=3D"$TARGET/include" @@ -29,12 +30,22 @@ RUN pip3 install meson=3D=3D${MESON_VERSION} tomli RUN mkdir /build WORKDIR /build RUN mkdir -p $TARGET + +FROM build-base-common AS build-base-wasm32 + +FROM build-base-common AS build-base-wasm64 +ENV CFLAGS=3D"$CFLAGS -sMEMORY64=3D1" +ENV CXXFLAGS=3D"$CXXFLAGS -sMEMORY64=3D1" +ENV LDFLAGS=3D"$LDFLAGS -sMEMORY64=3D1" + +FROM build-base-${TARGET_CPU} AS build-base +ARG TARGET_CPU RUN < /cross.meson [host_machine] system =3D 'emscripten' -cpu_family =3D 'wasm32' -cpu =3D 'wasm32' +cpu_family =3D '${TARGET_CPU}' +cpu =3D '${TARGET_CPU}' endian =3D 'little' =20 [binaries] @@ -56,13 +67,14 @@ RUN emconfigure ./configure --prefix=3D$TARGET --static RUN emmake make install -j$(nproc) =20 FROM build-base AS libffi-dev +ARG TARGET_CPU ARG FFI_VERSION RUN mkdir -p /libffi RUN git clone https://github.com/libffi/libffi /libffi WORKDIR /libffi RUN git checkout $FFI_VERSION RUN autoreconf -fiv -RUN emconfigure ./configure --host=3Dwasm32-unknown-linux \ +RUN emconfigure ./configure --host=3D${TARGET_CPU}-unknown-linux \ --prefix=3D$TARGET --enable-static \ --disable-shared --disable-dependency-tracking \ --disable-builddir --disable-multi-os-directory \ @@ -140,6 +152,6 @@ RUN sed -i -E "/#define HAVE_POSIX_SPAWN 1/d" ./_build/= config.h RUN sed -i -E "/#define HAVE_PTHREAD_GETNAME_NP 1/d" ./_build/config.h RUN meson install -C _build =20 -FROM build-base +FROM build-base-common COPY --from=3Dglib-dev /builddeps/ /builddeps/ COPY --from=3Dpixman-dev /builddeps/ /builddeps/ --=20 2.43.0 From nobody Sat Feb 7 08:44:36 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=1768312535; cv=none; d=zohomail.com; s=zohoarc; b=mF27UdU19Quh729wYf12A2L2RxO/jYJ9EE0toeN7sBG8WLswWgbwoebvWJXNvPSzOvg5KX/ksMgPsKvY1DUgjoaAYsdTPTVI5HzoFlP83SN2B/GzsJ78q6KGdDceDe5znee5DGg4yTjjMtVmNd+Ybx5UnEMwRpsfww+LmaiITdA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768312535; 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=bAzqqltGybDf3hiQcFF6O8LjGsk9iEn7XN53fTmC7cE=; b=SWMshBRBvt2e2AS2TlRUmMBrLerqJXIZhFYlV/6iJ+eUdA0rgMD4s38rH/HtSPIdy1JJjUZGOCknFHt2jTDLjyaMPBzxuysaXyhH4Tc8xnL/LUaqY7/dgp8UIrzGhVxe6F8h+4gnt+lxRs7sY71kFNlFAQHSzoXa9Eh5e2SwA8U= 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 1768312535659161.38183008784586; Tue, 13 Jan 2026 05:55:35 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vfera-0003IY-4A; Tue, 13 Jan 2026 08:55:14 -0500 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 1vferY-0003H8-Cf for qemu-devel@nongnu.org; Tue, 13 Jan 2026 08:55:12 -0500 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vferW-0000Ys-Pk for qemu-devel@nongnu.org; Tue, 13 Jan 2026 08:55:12 -0500 Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-2a0ac29fca1so49037565ad.2 for ; Tue, 13 Jan 2026 05:55:10 -0800 (PST) Received: from ktock.. ([240d:1a:3b6:8b00:eb29:7536:a39f:7476]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a3e3c3a2eesm38240465ad.6.2026.01.13.05.55.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Jan 2026 05:55:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768312509; x=1768917309; 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=bAzqqltGybDf3hiQcFF6O8LjGsk9iEn7XN53fTmC7cE=; b=WjQVqM3JHuMdze4XdkJ+/NgGS+0dnEgyK+zzAJcr39u5bR2Hcs7oFM37PXfFKAGgTe Litny68r5lZnviQ4sIfomvOR4tNoVRZaxoWzIH841dJE3ZgxfUO5+ZWNS01w24sR4VXa KxgxflQAZ4AFvUbrTlpwP2LJJk+jItYrg+J0y5UEAz5rbUlgkCrbhV1RztJ30NBm1BxX FZUvT59nim+EK79B8Vpp3u99EGOUuTDfcTe16Swu9qPrh3mWVETJ4A7d9WyvcjcwogRr BmuPH1Oi2wLhAmJgCMfHw59rcIAJIZ4i1qmiggeSlLWMMLemme9A4+cUJIwnbq2A0ohk k3YQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768312509; x=1768917309; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=bAzqqltGybDf3hiQcFF6O8LjGsk9iEn7XN53fTmC7cE=; b=CNZCASqB9dacR2qCKLGfG/k8EVfvl+XEgdQHRwPKLWiOBMakrSuYNdKO7h0+//fv+A LbHt5C/Sil9LVr6S+WEfQKs5eB6TgYEp0JxwCxk4Mc7XxeSsedFMt7y+iAgzuV2b7zkO J3cZKhnZO0mpxOnlFGxdXIULvFf3Wj9VGzgyy7dbFeKLH/BxNYHMplgK6yt3DeYMPaYS mQuvOWgOb1Ml4a6dV9uAG22n/lEr5PECvx7O/rkOMo9gRVqpx7nRbrJ6Bxlcv2nTZ9t6 0xlqucJgN0YPhOPKDjshD0FBUfPN8tEWydinD0u0BYujE6x92Z+aZhp+VKLdHMVDUksa e+xw== X-Gm-Message-State: AOJu0YzXChzVEWLXTcl5Pvwmvf+yKYTJTqC6qrkfWnbDHqZiB5suep92 gqYlTZ0xPlvXfCatC9qP90oKdD9sCiD6c5JLRakUyX3MVzMzcpjC+ktG/ZFUC158 X-Gm-Gg: AY/fxX7IFujdenzT2/vFfVqyZb5dxTy+FD5VStk7YvjZhhQYDeRNJXELVHTqXaQpmna lMiJDso0sXHbp3fRmMA9c1iPILdsfbrQAUqKhEf2zG+c9M8HP1Ux/viXhZaSKMfVaVnxBSwfC2w 9Mg+q8u9LLInWrmcxMDBR4+Otvk85MxnBR3aAXqb/wkVk31wgkN2gt/aCx6xyVCVgif/5qtPFqy DNeUpAsSrg5ZdSUkr4oS2QmVQ0lz2KDyd2xPiE8jT/jRrJUUhdDnH2d4pRapLQiJXK8druvXEEn 8tMsA1sdCTESxCGKj8ty7z/V16A2nIwYG/gDqa7jtaXobMDpD8zvai9RIsFRgHEI8ZBtZRRR/Ii rJHqeBcq3i5h9g4E2g0QJSWOZ3EpH6rl8G6tt3yiuThZb62eKmnuGQxx0fyymOAFBcwpFsW+DCK iKmr48M9xzF0R2WZRfNbXK X-Google-Smtp-Source: AGHT+IGt3uHlDlwp6XU4sDCiBApK+KT/39h1acaj+JyY/ZSZuzLkMfohKl8/uvTDQPeBAzHKSkebig== X-Received: by 2002:a17:903:3c30:b0:2a0:fe4a:d67c with SMTP id d9443c01a7336-2a3ee437a5dmr206421465ad.10.1768312509104; Tue, 13 Jan 2026 05:55:09 -0800 (PST) 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?= , Kohei Tokunaga , Stefan Hajnoczi , Pierrick Bouvier , Richard Henderson Subject: [PATCH v5 4/4] .gitlab-ci.d: Add build tests for wasm64 Date: Tue, 13 Jan 2026 22:54:31 +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 (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::62f; envelope-from=ktokunaga.mail@gmail.com; helo=mail-pl1-x62f.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: qemu development 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: 1768312537082158500 Content-Type: text/plain; charset="utf-8" The wasm builds are tested for 3 targets: wasm32, wasm64(-sMEMORY64=3D1) and wasm64(-sMEMORY64=3D2). The CI builds the containers using the same Dockerf= ile (emsdk-wasm-cross.docker) with different build args. Signed-off-by: Kohei Tokunaga Reviewed-by: Pierrick Bouvier --- .gitlab-ci.d/buildtest.yml | 24 +++++++++++++++++++++--- .gitlab-ci.d/container-cross.yml | 11 ++++++++++- .gitlab-ci.d/container-template.yml | 4 +++- .gitlab-ci.d/containers.yml | 3 ++- 4 files changed, 36 insertions(+), 6 deletions(-) V5: - Fixed wasm64 tests (build-wasm64-64bit and build-wasm64-32bit) to share the same wasm64 container. The build-wasm64-32bit test passes --wasm64-32bit-address-limit to the configure script so that the output is lowered to wasm32 by Emscripten's -sMEMORY64=3D2. diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index dfe954fe3c..ea0f5bb057 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -785,11 +785,29 @@ coverity: # Always manual on forks even if $QEMU_CI =3D=3D "2" - when: manual =20 -build-wasm: +build-wasm32-32bit: extends: .wasm_build_job_template timeout: 2h needs: - - job: wasm-emsdk-cross-container + - job: wasm32-emsdk-cross-container variables: IMAGE: emsdk-wasm32-cross - CONFIGURE_ARGS: --static --disable-tools --enable-debug --enable-tcg-i= nterpreter + CONFIGURE_ARGS: --static --cpu=3Dwasm32 --disable-tools --enable-debug= --enable-tcg-interpreter + +build-wasm64-64bit: + extends: .wasm_build_job_template + timeout: 2h + needs: + - job: wasm64-emsdk-cross-container + variables: + IMAGE: emsdk-wasm64-cross + CONFIGURE_ARGS: --static --cpu=3Dwasm64 --disable-tools --enable-debug= --enable-tcg-interpreter + +build-wasm64-32bit: + extends: .wasm_build_job_template + timeout: 2h + needs: + - job: wasm64-emsdk-cross-container + variables: + IMAGE: emsdk-wasm64-cross + CONFIGURE_ARGS: --static --cpu=3Dwasm64 --wasm64-32bit-address-limit -= -disable-tools --enable-debug --enable-tcg-interpreter diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cros= s.yml index 0fd7341afa..7022015e95 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -86,7 +86,16 @@ win64-fedora-cross-container: variables: NAME: fedora-win64-cross =20 -wasm-emsdk-cross-container: +wasm32-emsdk-cross-container: extends: .container_job_template variables: NAME: emsdk-wasm32-cross + BUILD_ARGS: --build-arg TARGET_CPU=3Dwasm32 + DOCKERFILE: emsdk-wasm-cross + +wasm64-emsdk-cross-container: + extends: .container_job_template + variables: + NAME: emsdk-wasm64-cross + BUILD_ARGS: --build-arg TARGET_CPU=3Dwasm64 + DOCKERFILE: emsdk-wasm-cross diff --git a/.gitlab-ci.d/container-template.yml b/.gitlab-ci.d/container-t= emplate.yml index 82c1b69e8d..b92e96b0fc 100644 --- a/.gitlab-ci.d/container-template.yml +++ b/.gitlab-ci.d/container-template.yml @@ -10,12 +10,14 @@ - export COMMON_TAG=3D"$CI_REGISTRY/qemu-project/qemu/qemu/$NAME:lates= t" - docker login $CI_REGISTRY -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PA= SSWORD" - until docker info; do sleep 1; done + - export DOCKERFILE_NAME=3D${DOCKERFILE:-$NAME} script: - echo "TAG:$TAG" - echo "COMMON_TAG:$COMMON_TAG" - docker build --tag "$TAG" --cache-from "$TAG" --cache-from "$COMMON_= TAG" --build-arg BUILDKIT_INLINE_CACHE=3D1 - -f "tests/docker/dockerfiles/$NAME.docker" "." + $BUILD_ARGS + -f "tests/docker/dockerfiles/$DOCKERFILE_NAME.docker" "." - docker push "$TAG" after_script: - docker logout diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml index f7d3e7205d..dde9a3f840 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -58,7 +58,8 @@ weekly-container-builds: - tricore-debian-cross-container - xtensa-debian-cross-container - win64-fedora-cross-container - - wasm-emsdk-cross-container + - wasm32-emsdk-cross-container + - wasm64-emsdk-cross-container # containers - amd64-alpine-container - amd64-debian-container --=20 2.43.0