From nobody Sun Dec 14 05:56:38 2025 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=1754315956; cv=none; d=zohomail.com; s=zohoarc; b=PNFqCaTYO2MWRlgyv960OezvFXESGbrNUjbtmjvdAKqAzT/MCybWI1Nw7VwUCIUT/NiE+rAO6YlJyEK+w9ujGCVTAdLOKo2xtVbXmhZislRumWRr/1VyWrz9lKQNdZvdzksTG5qL2WqpAAhj/q908C+7bKtC8t2/WmOzW3GozLQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754315956; 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=fk8p4F1HoflijBj7kvVH0absrkNmFbA/1BPCwWNDAoQ=; b=b3vuxxB0CLxTegqQ9mOxa2qragq0zibx/xWmX8Z6mivAx8cp+D9hccV4j/jKV0f3IkCDQTBFXocV7pWSlzKgnB/DA+SfgJgdmNtoZ+pIlqGLgXlpl+RioeKhMces+MphKMezgjAik/+/ufigWofrQX49dM5HjULtIVkdqebmsYc= 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 1754315956420300.9867523689269; Mon, 4 Aug 2025 06:59:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uivhk-0006gw-Jn; Mon, 04 Aug 2025 09:58:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uiulK-0004Nr-JD for qemu-devel@nongnu.org; Mon, 04 Aug 2025 08:58:04 -0400 Received: from mail-pf1-x436.google.com ([2607:f8b0:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uiulI-0000Tp-P1 for qemu-devel@nongnu.org; Mon, 04 Aug 2025 08:57:58 -0400 Received: by mail-pf1-x436.google.com with SMTP id d2e1a72fcca58-76bd9d723bfso2525287b3a.1 for ; Mon, 04 Aug 2025 05:57:56 -0700 (PDT) Received: from ktock.. ([240d:1a:3b6:8b00:d117:15e5:e721:f1cd]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-76bcce8f800sm10488308b3a.42.2025.08.04.05.57.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Aug 2025 05:57:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1754312275; x=1754917075; 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=fk8p4F1HoflijBj7kvVH0absrkNmFbA/1BPCwWNDAoQ=; b=JqzwdFd0Ef+5O8dp1x70P+RXjfY1TCO6hbkV7uj/ELAjUyNyPP6FTiXqflvBpcrJS4 GdfeUN551u5cR1/lNju2pjkaUqe1pXGzdWLVb+fOwCfrGKaOL1EzY0JYGTh5L8AB9pc3 FPCHDQCJMdlR/uA3EcAD+x949Q/ZdHMan6MVsj3yOSOhmw+s9OUVPSUDF4YcBTC6HC9d qjVsASU6vN0ptEjOfvjC75lOumjHu41S+Mo8eTRgCSgkytRjvo6QgTtH9ojmxpIIUU8g pVOO1+R+2sJtZTHojrVVzUHtznjBoLRxjmSZvlHFWOCtTjc5YbOEK/xU6APMy8Jd4w2L SBqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754312275; x=1754917075; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fk8p4F1HoflijBj7kvVH0absrkNmFbA/1BPCwWNDAoQ=; b=fIGEFRmsTqfFTAhndOHTqTqqkOHDXZotx/yzdjNNXcz5/XFfak1ky+Z5gMr6h9zFa1 QKFqko7JbQ8atvdbbS22ppVHgy7SDACNpN008xAQhJGsEx8q/+RgitXvG8r7+JExJgc2 5IrRIOQpK9aSJPoniZc+hiqwRqB1jYPYEGRY8WnyW6wjZELzcKuGky6Y63RCKpcPxOdZ WK4sc0/wd8bBCPw6hZVSlc835gHRKkFHrF9oWljNF3wHulPDHjliHpqBsdsS5ri1PGhK T3t9AV+ymevQP/bI9w6cjtJXHeDNJH/gUADprKf85k0jJi5hz19pwDtJlEZvRubtVpdH jh7A== X-Gm-Message-State: AOJu0YxAYPxk3cezFDmkSvqawwo7XHavdxHckkK5qrpn3xwxQDPETvmr QCvrtdgE3swB93WEO9JRLjpx3srxmhq4tS/1iW3iWb+qIELXv1jjB6c+V5f4Vw== X-Gm-Gg: ASbGnctAvXaGdNHBJqFUXtbHtksgOgBI5fuO0OY1g1PTqD2s4Vr1kHTy0zcFoYgAVVC 6z3/GkRgS8Rq1gi8UBQYdM3uGMi9J94XSD9/M+DtGDn8j/5IggiqlakCcnmeoB5CII69NhujSYf K9w9AKpjYXeEkciTLg6elPr4w/wNTPXivFCX1cGGf+l3n1odWr1osK1DffOeOCBrwBuXZBxdTxH CG7FUo6iqFYu4rYZ7ukqTtHS8wjoUn+FuU6nl8bYYUsYK8eJXBTH+s09nP4rNPtBS8SqDOGJSoa 9XfxQH8+vq8lf+tq2lzDbYOSjmUFIQ7W9nDB6gSRX0Fe+tX9Nz2NdEaPYjBvUBvpoOLM/BS/JT5 C/ZvxjvI9oKct5NQa2HT/0g== X-Google-Smtp-Source: AGHT+IErPgoXDN7QRYaZRbdGRg9nvqFHGEycTjJH4moLsXq99uFZ8Vur6xDBtJH0NyqrgTRE/gm8fw== X-Received: by 2002:a05:6a00:80e:b0:76b:f8f5:2806 with SMTP id d2e1a72fcca58-76bf8f53e1dmr7318028b3a.22.1754312275360; Mon, 04 Aug 2025 05:57:55 -0700 (PDT) From: Kohei Tokunaga To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Stefan Hajnoczi , Pierrick Bouvier , ktokunaga.mail@gmail.com Subject: [PATCH 3/4] dockerfiles: Add support for wasm64 to the wasm Dockerfile Date: Mon, 4 Aug 2025 21:57:16 +0900 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::436; envelope-from=ktokunaga.mail@gmail.com; helo=mail-pf1-x436.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: 1754315958676124100 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} (85%) diff --git a/MAINTAINERS b/MAINTAINERS index 28cea34271..47b35bae47 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -647,7 +647,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 85% rename from tests/docker/dockerfiles/emsdk-wasm32-cross.docker rename to tests/docker/dockerfiles/emsdk-wasm-cross.docker index 60a7d02f56..4b41be62ab 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 emscripten/emsdk:$EMSDK_VERSION_QEMU AS build-base +FROM 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