From nobody Mon Feb 9 07:07:22 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