From nobody Sat Feb 7 10:07:53 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=1767892367; cv=none; d=zohomail.com; s=zohoarc; b=DObkRYdRXxYMuGlBIrBVZIdrSP89Ca+mNL5xv6eR9dxG18TilOYyXF1AlK+8H1ihTiADt4jdEROOJkHw04ZyzgaFhwj38G61BnvXbqQwycWPuRxkyn1HF9IVbBGTKtvVa3YpQsJ/ukXtq74DLiccYcgZ6I60x9HiNskvsj98Zo0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1767892367; 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=VYWQgje1/KZ6hepgDg+2m0ja1QI8nEclJgAdBosadTJjp15skbXNXNW8GD0+lMAMVCRUCaygFktRUyJ1JZo3XELoEDm3lU9rPTUscZcFhqprau1qh+OJMN8UlxM5NWMbAKQD800TFRm8T8fKdDoOSSIVhWkuwAsHzulVDPZb3wM= 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 1767892366989557.0945123649344; Thu, 8 Jan 2026 09:12:46 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vdtYT-0000pP-7A; Thu, 08 Jan 2026 12:12:13 -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 1vdtYO-0000n3-SC for qemu-devel@nongnu.org; Thu, 08 Jan 2026 12:12:10 -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 1vdtYN-0000DL-B5 for qemu-devel@nongnu.org; Thu, 08 Jan 2026 12:12:08 -0500 Received: by mail-pl1-x631.google.com with SMTP id d9443c01a7336-29f2676bb21so30484855ad.0 for ; Thu, 08 Jan 2026 09:12:07 -0800 (PST) Received: from ktock.. ([240d:1a:3b6:8b00:7ace:63ca:408f:4cc4]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a3e3c3a507sm82808355ad.3.2026.01.08.09.12.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jan 2026 09:12:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1767892326; x=1768497126; 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=naSqkea07s90lIEkp4otbLeApsjeIRT2h34yR6oY4HQVk9O9wkrIjrTiwvowq1vS5R fxjZRcnOveI6GyFj/9yzS+RsHwOomsXldTTDgKGe7UFlX91B4RuhmqSQEzYDhAr9ImZm oi7jfpe/KOLtCsb+ZMxXhDnHVyP4flszfh8ZVRNpecqIcfjtszEPmvo8xeo44kveHcXz h/t9RgE74CbS8Psuo2GEe/Xxq9IT+LgVg1HF9RZeqB+NmWw0P/1onaDMFQDoT98ipcvo TSN8hNI/yld66lqYIOmHKjlLR7dh+9sUK+xqF5BuopBrR+PaW/IV0Y9tYO4/XilP9/Tz NKdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767892326; x=1768497126; 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=gUA3Dq5UBgXgHzR88Qs4+RJwukv7AEu+J8iw/9vCX2EK3DGYlqUxZHyouw8glZHSwo 7zGqGDbYLp5YqBfuFLJIS0QQG6BcAYJy9K4uhtYteCl4+8AaIDF6urtvbRdndYC1eug1 vvuwHRu1bTa6FvRe2BLKa6pKg0s8dB4rQL6nBLjTrtcKHX0K7twUnFx1rkRPFbNriOEI v+7hfcgiaxDdKl787fZFG2TGOZXe3yMJMBKscKX7/0iydnkzf7w2K+19b9Y9+7dIdkDM G18SJ5J26ErjNkRtG1v4oQFbT9uARpn9UtWk433KgZt2ImhiQ2oRzuMdsJuCwfKhF79O zyew== X-Gm-Message-State: AOJu0Yx18TpOCvJejrg6DIN23E12eu3TJa+xGmP33okpATJ941qFfOD2 7yUjYnjx4oWVULVhNu/lTVIuEDy44yCYSTAnR7nBZIVB3gdq8HZPiZ/V9WfbrFsf X-Gm-Gg: AY/fxX5G49BGG5nvIMltCkl1boMiX2TWgLnkqyMwJOBH7h7SIeeCc/7/76bfIgKSURq OROz0UixPwatlD46Y8e4APdXAHyeMzM+t0NsFu1S3UBs+nCJpEtZK2GE+mRwO/fcWsblpDAXxB/ diliQZ+WVucaw9/RB+/MBAu3GH/ET8Tp2fnOD/gGcP9A1+2N26YWu4JYW1vuOpjiEmlZlQWelWX 8NvmGGonMsx/pLXOR+jH379peTRfenaIwGTF1LO2Hythpj2LEvnzcIL0rEpH1zXiqD3Uo00Lrw1 FnnPFhk+K3lW8pnKPwHTnMO9LFZuIj1ZwwLVEchuJ+ZVnvgFX1YX0OTEaLYYCQO6tZb5SerOeY1 VwX/cFZp2KhaQip9QUMtV19e4hzqKyB7QSsWsfbXg1Do8C6xwHVW8AoUrq8XIQqfrITj/pSCiWe O6JRgWy6GE1Q== X-Google-Smtp-Source: AGHT+IGu0SnWrDPVC5QcHbM4uuhqB+TjyCaX7XxJLzl0ScRSjWh4fzysbWk1FZ8yhKNOxBIRmdLRdg== X-Received: by 2002:a17:902:d708:b0:2a2:f2e6:cc54 with SMTP id d9443c01a7336-2a3ee424bfbmr43271035ad.4.1767892325737; Thu, 08 Jan 2026 09:12: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 v4 1/4] meson: Add wasm64 support to the --cpu flag Date: Fri, 9 Jan 2026 02:11:25 +0900 Message-ID: <91f16f0e9ae6b36fbf0c2caac510dcf855120400.1767886100.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::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: 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: 1767892368481158500 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 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 10:07:53 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=1767892344; cv=none; d=zohomail.com; s=zohoarc; b=SdCY8cLq++eHFVtHeMdVwYcj04yqQwGN4fbivYuCrowuc0z0ohTSdBJ/NUQZMr6H5tdklD6fp+ToX1oUXzlvWuk/+RlHtzfk9YCFGDo23NrmD2x9EICW6Cyzyg0U9arjSWW94lG0zDSIPR2f5fJD4pOXKELir/R42VuW+xt1Gok= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1767892344; 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=aZyZ8wZS2V8P5R3xCajbMlGby6+xi/EPi2CUYC36kNWD+0sTPHmeFCnVFppCmeY69P0zwab22QaX0ByZ+Oc9VxXb96bhp8kmSSWXviH1nhKNSbKHLGJgnMLaAmGBCMV2rKr6l86VjtOz1JSekQEsbT5F7DVfibV3mJNKR9nLzmU= 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 1767892344519743.6756814611747; Thu, 8 Jan 2026 09:12:24 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vdtYU-0000rW-Oh; Thu, 08 Jan 2026 12:12: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 1vdtYS-0000p1-Lr for qemu-devel@nongnu.org; Thu, 08 Jan 2026 12:12:12 -0500 Received: from mail-pf1-x433.google.com ([2607:f8b0:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vdtYR-0000EM-1B for qemu-devel@nongnu.org; Thu, 08 Jan 2026 12:12:12 -0500 Received: by mail-pf1-x433.google.com with SMTP id d2e1a72fcca58-7aa2170adf9so2131053b3a.0 for ; Thu, 08 Jan 2026 09:12:10 -0800 (PST) Received: from ktock.. ([240d:1a:3b6:8b00:7ace:63ca:408f:4cc4]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a3e3c3a507sm82808355ad.3.2026.01.08.09.12.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jan 2026 09:12:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1767892329; x=1768497129; 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=TPX5UbspAs0hs3M7LshnQ9H9ihHtBbwKQEwcVoP/4eylFkqzZ7SZi8R9i69OXjkjyG 5D2xIygL+TCJ793+gkl68Vtclj12iLy4xvzf5EXTagzTWXw39UFjrabStKtCpnMB2Gz8 S+y+zDn+3IlhMP3G7J1qI/cfOX2TZ97349d31CgaUuC6tuYyinWa8vPjR93WrTGpTnuG NRepfCSHwIB9H+cd0jBviZcoGm4NV5DCb0szGxHGQbvfK3W2l5jzys7/Pj6uU2XG7Ljf WvjuwnfeBELZf70NKQ4vIWLVoAvoeFv0/VnbQvDMRp4iRn8mM8EaA/KLO58LfS4TjEpb zpAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767892329; x=1768497129; 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=MtLQdQqQhBfGZRO1b8adDr6nykyHrcvwTbX0CDfGZ76RsIBlZ/XrfQp6iiRRHrT8Nx kZGBUDtDv0beoTJJNVxgWgEePMCGsZhU3ZSLf/ot2hm2gj6bCVoLKaZigE4T3Qm92Bnq HgUTepfJvLyQqMryM77Oz867eHujF9nYLNKBO4Uqrpg1OtZhXFaUBOJmgbAZN3qeIK2K QxuAHXrE1flk5ZL2Fs5v9FkD/QsJBnTkpaqVyicqi36fq2JFKFOkWJyEmYB6vvlyERSx xh4CB+ayMk+6c7NWkHgJWDPiiGVxWyq/vIYdRN+SsaxVEObFQbDCJIGMR3DDG04jXsMw RMFQ== X-Gm-Message-State: AOJu0YzxJGJKQAfO9ZXMY4H99RNb3L0uejcIq7bbhsIJk5I6kvkUXUiz 0jj/5YBsWp+N7P4+tkhRHiona65+Kos3Yp0aSzxhlI2OExjwnXvit6Oc2q76PwWJ X-Gm-Gg: AY/fxX6uqB4emBke2S2IDna7kAcM6ROk1voS+jVQ3LvGb4A2C56p2Xl9K0Q+XeDKKP6 Xtfyb9RLb+EcoEKM8A85m51FAQTLnIe1cc9/5Ld831bZ/nAt9Wg5lp1newrfAMyIRc2MLAKBi81 AnMlg5jWcej7WnYbrBjJpwOVAVF2JqKY7/AVp0vd+z92tHCCEweJJ8A73UISupdVbgTX7xODTVa h5Si7BodX571PND5AybJaau/Uuqz8plXt2GMLSz+0+yoMAzSSjbPuwYdRHtfgQh8fNxK18BnMU5 vAqplGrXTktryZWIbSfRdyZ8v+N+NWUGlM848VRv1slRGZSndepfOmYEqeyqKGAuST74j9MFBFg X5Azm3HUhg50Yz4HZ64mLLQ8MqjAOLze6knqS4xae2HaoCSblfRY98TzgX3X5nkfvGA3yxLDF9k CQujpZUlHWhw== X-Google-Smtp-Source: AGHT+IE6hOP0aJJspvb7o/9YaIT/qdhZ+oI7HN43/4DVGM9ezRtCg7GHzoXuyNgnWzBGVA4nzWGcEQ== X-Received: by 2002:a05:6a20:7486:b0:35f:b243:46cb with SMTP id adf61e73a8af0-3898f8f4c75mr7271084637.12.1767892329400; Thu, 08 Jan 2026 09:12: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 v4 2/4] configure: Enable to propagate -sMEMORY64 flag to Emscripten Date: Fri, 9 Jan 2026 02:11:26 +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::433; envelope-from=ktokunaga.mail@gmail.com; helo=mail-pf1-x433.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: 1767892346368158500 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 10:07:53 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=1767892365; cv=none; d=zohomail.com; s=zohoarc; b=g8utKy7R6AgBrdzYtONckxIsbKrvet2ESE3tLISy9pVKytT4KTKuF0fZNdi5eOI4vdHjygJDsAVD47gp8CRgd9T5roI6ZbgVOUAyImktw3RglkN/OE8/MfNZPioKIO0/EsQcjsBNCprHRvHkYzedGRHjDJeW4zfmKUCYQSELSbE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1767892365; 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=3hPq5nnBVZFbgfle8XGAVUtD1GKUlumskUvVM+cv9Mg=; b=YNO6p4at1rxndwujK46+wEZiZmeSwOspe5NNjfzPKInksTcQh9vDJhy4U87RDzWG2Jjh1aNqUSq7Lb9HTLQrn6VpcJpjmHfQ0IFDfnqJvfZt7xYM4oXWgCXFu1Ve4/yXJvB1I6YQxCIjZ5XG9bwjrOKUtsbpjK2d7dYNtI0gXks= 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 1767892364962256.2011196066496; Thu, 8 Jan 2026 09:12:44 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vdtYX-0000uR-IK; Thu, 08 Jan 2026 12:12:17 -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 1vdtYW-0000tj-8G for qemu-devel@nongnu.org; Thu, 08 Jan 2026 12:12:16 -0500 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vdtYU-0000Hk-Gd for qemu-devel@nongnu.org; Thu, 08 Jan 2026 12:12:16 -0500 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-29efd139227so26524155ad.1 for ; Thu, 08 Jan 2026 09:12:14 -0800 (PST) Received: from ktock.. ([240d:1a:3b6:8b00:7ace:63ca:408f:4cc4]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a3e3c3a507sm82808355ad.3.2026.01.08.09.12.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jan 2026 09:12:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1767892333; x=1768497133; 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=3hPq5nnBVZFbgfle8XGAVUtD1GKUlumskUvVM+cv9Mg=; b=X1Y3kvkJ3cZ608AbkXMQd4th7SiZbdCgcA1FmyXyFc7SPKknqZDDQDA576vdnuW5em 3+Yza5FOZqCfv/JkeVqmIUVt4gO5SsJUCp41M9fRuBIkf8v12NaekgVG3ey+9YqKv63b rvqU9IjD4ukHq1Gj/r3kN8Zg2EKNMWqFFziud/B1Pc/+jPAge1hPQLE0wgS74rBK2eCb AiApVAS4BngmfHurFDYL2tURypQLNOj/7QmUiTCbIRjQ2HuhHOXHZ9DGRR1RW/zuiHGp VQGSJRc8JhwvY89kjYUbXA2GVIe1l0q0PYGTKRbB9t+40G02gGJTdxp71WwoVe03miK4 yRAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767892333; x=1768497133; 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=3hPq5nnBVZFbgfle8XGAVUtD1GKUlumskUvVM+cv9Mg=; b=mUO/mmjlQh6+D0oe3vqOMdtI6/2rwyax65czYYaXon44JUqETY0KJ5/vZNF7RqL/LF HGOl4+2xEYJVG6dFif2K+2i/cazbuQHLCXnOPWRwf2yPP+GICNnlrRb4ZbsOmstksFES E37YIPpiZItqMtPKDRawCf7H5lFKA72jZbb8snv815YjhTKIz9DRT5zYdyLlcxsgfkXf VrMpvbGahemplHsc7//iEs2p4YVUyi/xuDUfe4+HhwiGB5BlGxs9T8QI59zEilKCPShK xcDHXvdhZzzb+8AwdN5q3vQVqa2//HXeERk4JJ/THNZdTKqZEKzalwopDyj0H9NNF+kT 4wqA== X-Gm-Message-State: AOJu0YxRD8biN3hRLxP/3zrLrJ3dmU0TstnxMSqCjNY8Iba+bqfeNsO2 S6K8ITgJNlcsAGJlvTmd9oQVYeyvrDqkEoMzfIfT2v2Rxsg0Irg3Zf0fkdZZH7Mr X-Gm-Gg: AY/fxX466fjefRwV+ghpZwB77LIHnruxyHwo/W31BigmIxJx0y6pMklw8o4WXXP83OO 8pa3UmVuvbGjKUDeqt8kf2d//RLW17ZmsDot7gKbJBCW+PBp7hczDzKQv4xmMqdIprmCaoxlUun lFppSt5lp1lpDXRORSmQkJmbMkN8Us4CTku1ZbljPVD85ePyxGymqybSZ7mRd48TqjzDAPYsLZE ABB3ZkLtIaNbmPDy7qUwWBWnnI2yqRAvYpbcdc0dgeZC6u/KlUjsKJ07QqUwig8/K5ECJwNKb8z 5M4LuGWDBtVA5aOU6UOH1WI4SSkiLKf4BrnuZe/P+67riqjcyS3Mux6+zxRzXYLv312WQCzcEQV 3zjBVOyq0QXAjTQUy7XVvdTKc9Lnn/3fg12gpbTVvf1Dx5xsSbQ32aJdNlxQsoTo4A2Y3cYLpgQ ARV1LI/mW/0w== X-Google-Smtp-Source: AGHT+IHznpWxzk3tMO+9AIYVCVoItuMAGCeF+/coFuDe3gg+rv/rdigB9ZwWV0Wf6DZUuuHNZ7ut7w== X-Received: by 2002:a17:902:e841:b0:2a0:9411:e8c0 with SMTP id d9443c01a7336-2a3ee4b580emr63729965ad.32.1767892333107; Thu, 08 Jan 2026 09:12:13 -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 v4 3/4] dockerfiles: Add support for wasm64 to the wasm Dockerfile Date: Fri, 9 Jan 2026 02:11:27 +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::62d; envelope-from=ktokunaga.mail@gmail.com; helo=mail-pl1-x62d.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: 1767892366476158500 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 arguments and use these values for building dependencies. - TARGET_CPU: target wasm arch (wasm32 or wasm64) - WASM64_MEMORY64: target -sMEMORY64 mode (1 or 2) Signed-off-by: Kohei Tokunaga Reviewed-by: Pierrick Bouvier --- MAINTAINERS | 2 +- ...2-cross.docker =3D> emsdk-wasm-cross.docker} | 29 ++++++++++++++----- 2 files changed, 23 insertions(+), 8 deletions(-) rename tests/docker/dockerfiles/{emsdk-wasm32-cross.docker =3D> emsdk-wasm= -cross.docker} (86%) 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 86% rename from tests/docker/dockerfiles/emsdk-wasm32-cross.docker rename to tests/docker/dockerfiles/emsdk-wasm-cross.docker index 1f08eb0b85..fa2c723dff 100644 --- a/tests/docker/dockerfiles/emsdk-wasm32-cross.docker +++ b/tests/docker/dockerfiles/emsdk-wasm-cross.docker @@ -1,14 +1,17 @@ # 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 +ARG WASM64_MEMORY64=3D0 =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 TARGET_CPU ARG MESON_VERSION ENV TARGET=3D/builddeps/target ENV CPATH=3D"$TARGET/include" @@ -33,8 +36,8 @@ 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] @@ -46,6 +49,16 @@ pkgconfig =3D ['pkg-config', '--static'] EOT EOF =20 +FROM build-base-common AS build-base-wasm32 + +FROM build-base-common AS build-base-wasm64 +ARG WASM64_MEMORY64 +ENV CFLAGS=3D"$CFLAGS -sMEMORY64=3D${WASM64_MEMORY64}" +ENV CXXFLAGS=3D"$CXXFLAGS -sMEMORY64=3D${WASM64_MEMORY64}" +ENV LDFLAGS=3D"$LDFLAGS -sMEMORY64=3D${WASM64_MEMORY64}" + +FROM build-base-${TARGET_CPU} AS build-base + FROM build-base AS zlib-dev ARG ZLIB_VERSION RUN mkdir -p /zlib @@ -56,17 +69,19 @@ RUN emconfigure ./configure --prefix=3D$TARGET --static RUN emmake make install -j$(nproc) =20 FROM build-base AS libffi-dev +ARG TARGET_CPU +ARG WASM64_MEMORY64 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 \ - --disable-raw-api --disable-docs + --disable-raw-api --disable-docs WASM64_MEMORY64=3D${WASM64_MEMORY64} RUN emmake make install SUBDIRS=3D'include' -j$(nproc) =20 FROM build-base AS pixman-dev --=20 2.43.0 From nobody Sat Feb 7 10:07:53 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=1767892350; cv=none; d=zohomail.com; s=zohoarc; b=iLhzxYuLuEb1D2MnT2C0vAV5GV6D/+kS3Z+BAzBJuJPvProbxc4JqqjNWKLsWlmC/WhSJ4kxLeZ81P5MMl9mdoN4bwsh+EmVb0epQQxfBJ2BFP7MOuxXu5HL1s66POn1Bt1d98nlVg1Jjzx/5ekwibLUyqhNjAyqEAS7xLTLRAA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1767892350; 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=0ty2GcWIekY1X+M6y7u9gB/HftapcTxph5C6KB8kF90=; b=m1RcT/odjq4clF/NFiRMtq9HKBB2+0rY0v4p+dv4h92nRlt7cZdg4xh5UqCpJlBOHdJapE6O6jXUXnXoxFCPwjiJfq1lNO1v424RGGdOTV/zrb6R4pknsMUVbpFtqldAD3po4YdTH7CErhxuJjrkzdyWumYW6PW1knyBtDzI3is= 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 1767892350867251.49678182734158; Thu, 8 Jan 2026 09:12:30 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vdtYb-00012t-BQ; Thu, 08 Jan 2026 12:12:21 -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 1vdtYa-000109-0G for qemu-devel@nongnu.org; Thu, 08 Jan 2026 12:12:20 -0500 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vdtYY-0000Jq-7s for qemu-devel@nongnu.org; Thu, 08 Jan 2026 12:12:19 -0500 Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-29f1bc40b35so40087185ad.2 for ; Thu, 08 Jan 2026 09:12:17 -0800 (PST) Received: from ktock.. ([240d:1a:3b6:8b00:7ace:63ca:408f:4cc4]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a3e3c3a507sm82808355ad.3.2026.01.08.09.12.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jan 2026 09:12:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1767892337; x=1768497137; 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=0ty2GcWIekY1X+M6y7u9gB/HftapcTxph5C6KB8kF90=; b=AtJb157nXfbLKRdivlAu9kMgKfsvMtTO7ArZ67ZvxMoKKXPS1jK/y2hNOgQQPICbvw vDELHuN5pfa5ff8ygWuIfHiwaels1H7Eh9uerW0pRQ0wSXfJO62bb/Q1Rb5ARE96rUFb LLGXLSyRR8ahrLhx70EfWV1rVnm9WBcD2LT2j3FfVCrNhZRXszqWbymjltPvJ7JscoLq sVtQ5agjo0EFkY5wlKXDi3s+xuIHKe9SS7Ti4l3u6law3/1ITKhz9JUHrpzZzUtrfMfJ BbIeIT9D4YOt0ZGAZKhki9vgiINxdEDFtB0REIMPa+TZlu33aYlnF81wcr5GM6tWFU/q 57aA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767892337; x=1768497137; 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=0ty2GcWIekY1X+M6y7u9gB/HftapcTxph5C6KB8kF90=; b=PeU9cjdQRzZyaHNCyw/fW/P/I/fgT4WVf0iGxFv87J6BwKxgh8AkdyuKIF/TyQWfS1 /jZrIQi7oXSvxd8YI8HYGlix0n0VZp+5MCy8+ykwq8+Fqyj9wJ0anyIN/jKgB1j9QI3Q HpKRGOq9DlDAcT8NJw5RGVK1cLJKjuCNzZvRHnZSCfKEkkcRFov0SazFq2JzNDagODIF 1inupKykMJMvJMxu3IVihM0QLz2oXruN/xIzbL+4nis0TeFOCxkxVbYFGCr109Mtdm6J JC6QGuDBXY5Gf89Gxls2WhOsGvvX1TlyFU4Xlm8nCYzhusoy1fMnRxqx4G29LEdvcXOV kyDg== X-Gm-Message-State: AOJu0YyAowPFbwMyV6ORRaa1IlAZKmF/7bs0fJ+n0uOyIDuBEfYkVTwH k6jQZPrmnmuKWLRIe0OzOOJzYSMbJ588GGeBwjzwXWkNOlYazODRP+f23PvFvf4G X-Gm-Gg: AY/fxX45jKM/1NvuxcpvhIuwGHABU+6hlgoiUHnVi+OqLqUKx/GKn4ZTj61wakIq+Ai bmU1uiIhoeD0wsoHAsxEDn8tVhm0WWOwALdAojQ6IfcgqMRYfzIXWO7alHgv8YnUmsI2Bu1OW1P Qj2hkzg6r81EFsMZDQ3m1j7bq2rGQ3XhqLCnXQk5a292X8lqUrbau7+o6jx9I/eh5l+KRiucA+f nMYWG7So7loLV65WK0Wnlr863WWVGQPrYQ+DZ0auOKZ4vQiLsZHO73myB1Aa2ASBzRCt2QpJK/U 7R9q9htyGB524xV2aehcXeGnHzgHjTQpHh34yoSZK3FYOqM8+uXIl9M6VCCm5Y/iI0pFduaSXE1 9eQjXlL7LH7Ul7wua4fTWTthP2nsmukGMP2CDBTh8ywhyuJxbpQ4+oy6FqsIhFlMam69j3KJrsQ AnzntfRvooIQ== X-Google-Smtp-Source: AGHT+IGw6oD1wjGPHOMnWc+b5aFt2Tx2TRkZqr2Uz8EdzmmLEZtBhXS0DPrT4h+4M6eI+zgUFLZKuw== X-Received: by 2002:a17:903:298b:b0:2a0:d5bf:b271 with SMTP id d9443c01a7336-2a3ee486f81mr63992945ad.32.1767892336857; Thu, 08 Jan 2026 09:12:16 -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 v4 4/4] .gitlab-ci.d: Add build tests for wasm64 Date: Fri, 9 Jan 2026 02:11:28 +0900 Message-ID: <79ec37f7fa0352d0463ed6ec5496f6a88f47d111.1767886100.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::62e; envelope-from=ktokunaga.mail@gmail.com; helo=mail-pl1-x62e.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: 1767892352415158500 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 --- .gitlab-ci.d/buildtest.yml | 26 ++++++++++++++++++++++---- .gitlab-ci.d/container-cross.yml | 20 ++++++++++++++++++-- .gitlab-ci.d/container-template.yml | 4 +++- .gitlab-ci.d/containers.yml | 4 +++- 4 files changed, 46 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index dfe954fe3c..98bf28488c 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-32bit-emsdk-cross-container variables: - IMAGE: emsdk-wasm32-cross - CONFIGURE_ARGS: --static --disable-tools --enable-debug --enable-tcg-i= nterpreter + IMAGE: emsdk-wasm32-32bit-cross + 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-64bit-emsdk-cross-container + variables: + IMAGE: emsdk-wasm64-64bit-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-32bit-emsdk-cross-container + variables: + IMAGE: emsdk-wasm64-32bit-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..66fc7343e2 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -86,7 +86,23 @@ win64-fedora-cross-container: variables: NAME: fedora-win64-cross =20 -wasm-emsdk-cross-container: +wasm32-32bit-emsdk-cross-container: extends: .container_job_template variables: - NAME: emsdk-wasm32-cross + NAME: emsdk-wasm32-32bit-cross + BUILD_ARGS: --build-arg TARGET_CPU=3Dwasm32 + DOCKERFILE: emsdk-wasm-cross + +wasm64-64bit-emsdk-cross-container: + extends: .container_job_template + variables: + NAME: emsdk-wasm64-64bit-cross + BUILD_ARGS: --build-arg TARGET_CPU=3Dwasm64 --build-arg WASM64_MEMORY6= 4=3D1 + DOCKERFILE: emsdk-wasm-cross + +wasm64-32bit-emsdk-cross-container: + extends: .container_job_template + variables: + NAME: emsdk-wasm64-32bit-cross + BUILD_ARGS: --build-arg TARGET_CPU=3Dwasm64 --build-arg WASM64_MEMORY6= 4=3D2 + 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..ae99e0a541 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -58,7 +58,9 @@ weekly-container-builds: - tricore-debian-cross-container - xtensa-debian-cross-container - win64-fedora-cross-container - - wasm-emsdk-cross-container + - wasm32-32bit-emsdk-cross-container + - wasm64-64bit-emsdk-cross-container + - wasm64-32bit-emsdk-cross-container # containers - amd64-alpine-container - amd64-debian-container --=20 2.43.0