From nobody Mon Feb 9 06:33:32 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