From nobody Mon Feb 9 01:48:47 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1768562379; cv=none; d=zohomail.com; s=zohoarc; b=Vue1DPt8DX0Gul1peeQM2RbwyyG6dpC4W6iBLjD/Hte3+6OoEWgArBKgvAmOLTO6a5K5AfnwV92SGpKwmnBqOra85jf8pzprVWuY9coAI0mSw8zElCgQPTssODNhXg8nsHOzaP2cQkOcNlB+OCEQNrgYWsH4QhsYuR85pOjz6PY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768562379; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=LWngYNpKVOutwMoJmRt3Ydc7XaZnIpLSQMBHhtCpGe8=; b=lNkPukch4Oo/9CwqL/Xauh0tHFS5zD9gh+N6PMIQBXM4umQjAHTMwhbr1HN5KqEk1BGcpGL8qn7UUGiekmsRwaNQI+JLV+Ijf0zinAHVqF2DaYeBY4anyJ3kxr/sgtqrYU6t4Bh05LdEdRvyJVDViGd1gxfV5Juwh/P3PfvUQyg= 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 176856237920380.72854564782745; Fri, 16 Jan 2026 03:19:39 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vghqw-0007Oa-G0; Fri, 16 Jan 2026 06:18:54 -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 1vghqu-0007Ni-Sw for qemu-devel@nongnu.org; Fri, 16 Jan 2026 06:18:52 -0500 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vghqt-0005mh-7Z for qemu-devel@nongnu.org; Fri, 16 Jan 2026 06:18:52 -0500 Received: by mail-wm1-x341.google.com with SMTP id 5b1f17b1804b1-47ee76e8656so22837575e9.0 for ; Fri, 16 Jan 2026 03:18:50 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4356996cf58sm4614145f8f.22.2026.01.16.03.18.48 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 16 Jan 2026 03:18:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1768562329; x=1769167129; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=LWngYNpKVOutwMoJmRt3Ydc7XaZnIpLSQMBHhtCpGe8=; b=mQu5F+DRpWbDcC1NNgfdjICjUyVW+QCfaeaRG20p7FJvXsohZbrZxt7hyrMlOpCAn0 co/UN3g8B9ICQG7Tn8KMIzaNCSUTEhsv/zag5E4YNy2UgqL9sj+y1kaR/qk5hKHdLO2O 2yK43pqNh0ZYFivN3wGESuCiSTpSqi4FbGE36kl7c7S1HlzLwh6ZU2pQKUBr1NWzVufy 8hXDOh70m4Mmlf9DxxAap+ZPyOinWq/Ej3eR7l7aUUna+L1IuaKmr3ZVVlgQ2ZkjhLDO LLRqBrPVA04Y/DT6u1pJoD39zceGCfqDb7/8GfTlX/aoSgpX2mYrGNNIIebqNbue0G0t Y8Qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768562329; x=1769167129; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=LWngYNpKVOutwMoJmRt3Ydc7XaZnIpLSQMBHhtCpGe8=; b=CUf7d3R0fvmUS2ApwcORYYenEix9751i6uqlhKMPsoNN2R4YsTglnwEDAll/pPVs1i A0+nX+2XBW/Jj1qnBQlOM9hKzxuaauYLkCfZD1bst5qaV3dy9MMdFvRKDFTgDLOR6dqn zKrmloKqHm0cS0L1fLUjJfaTlB1QifIX3pSo0Va2uxd7CX6SbKaFqDRSOSlY8kHRdcM/ Kq/OIOHg47VnCFjcDW5xYozpjS9yYQJSKVYhVDZ+dCHVAAhvymUdvtehf/HvPThnlwzK SIqspsEbJg7zaaEj2v21tP1fcb3vtKBCJ21e2AEG5v/Z2uMDaXXd5mA78GAPFppXZxFe M9kw== X-Gm-Message-State: AOJu0YyOEaL44uPd8OHjTYyXUUHukbmtJmb6eeKnWpASZTXVPh6eFQ6q HA6mJwXimF46gW8pOtt21TAthTOZ2cNWmZmksEPmCKoe3OdPancoYr1o5R6vRwedDHEuNQzwkKl +xykjFsA= X-Gm-Gg: AY/fxX5bFr0KuOBKxJob1CCO3esupvtNRx0x81DMLIDixSt28f6WEjEg8THqAF45iv/ EqoPo8KyBGBDPMDwLQUffL0koDIxHNutM6RGhk5GAwPZnJ2IcFPizYoIsE38EyxPZhoyd8y2Jbv Jicsj47geKQ5c0BJtzvS6zQUQ0oaHIIZUMG/9ucihcG47ph08Q8z+PBhNnMW+wcLbRjw3ag2v9Q ODA0OVOX2TDNjdgF2QwctM4Qp4PbAJ4gGATwfVA89v5fDNluaVsYIew19bRGZb+8mAo2VOa2cya DqHwKeI4OmuSCBQ/1toIqOFpG1mrfv7280veRf5hBZ+Jbn2LvQX5D7os8rVBO7/fxnawdpowymW jyhKTJP7qT0IsZ9jWQdpcjUpWHqTsNe+hkHL9GcN9ov1cTXagmp94PyWy0o9ChrjrqOntSxUOiK xgOaQIiM0J1DpG0vxJMR+3Ud9MceWJ4yluFr8DKwQhZTB080XITqy9RgxRUwNlFmaa0nZyKnU= X-Received: by 2002:a05:6000:2203:b0:431:92e:1d44 with SMTP id ffacd0b85a97d-43569980e80mr3082678f8f.20.1768562329377; Fri, 16 Jan 2026 03:18:49 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 06/30] dockerfiles: Add support for wasm64 to the wasm Dockerfile Date: Fri, 16 Jan 2026 12:17:43 +0100 Message-ID: <20260116111807.36053-7-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260116111807.36053-1-philmd@linaro.org> References: <20260116111807.36053-1-philmd@linaro.org> 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=2a00:1450:4864:20::341; envelope-from=philmd@linaro.org; helo=mail-wm1-x341.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, 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 @linaro.org) X-ZM-MESSAGEID: 1768562379934158500 From: Kohei Tokunaga 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 Signed-off-by: Richard Henderson Message-ID: <3f21342f50e0412a32143fe21ecc0d8db95b3f37.1768308374.git.ktokun= aga.mail@gmail.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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%) diff --git a/MAINTAINERS b/MAINTAINERS index 4ddbfba9f01..de8246c3ffd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -683,7 +683,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 1f08eb0b855..ecd5a029037 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.52.0