From 0d5e82c6845accde3c2cf9bcb133f871e1556559 Mon Sep 17 00:00:00 2001 From: Christopher Serr Date: Wed, 12 Feb 2025 00:52:05 +0100 Subject: [PATCH] Disable Multivalue again (#1000) Apparently it's currently broken again in the recent Rust nightlies, so we have to disable it. --- buildCore.js | 6 ++++-- wasm32-multivalue.json | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/buildCore.js b/buildCore.js index 0313e80..fa0073c 100644 --- a/buildCore.js +++ b/buildCore.js @@ -39,8 +39,10 @@ if (process.argv.some((v) => v === "--nightly")) { cargoFlags += " -Z build-std=std,panic_abort -Z build-std-features=panic_immediate_abort"; rustFlags += " -Z wasm-c-abi=spec"; - target = "../wasm32-multivalue.json"; - targetFolder = "wasm32-multivalue"; + + // FIXME: Apparently the multivalue ABI is broken again. + // target = "../wasm32-multivalue.json"; + // targetFolder = "wasm32-multivalue"; // Virtual function elimination requires LTO, so we can only do it for // max-opt builds. diff --git a/wasm32-multivalue.json b/wasm32-multivalue.json index f70a961..580979c 100644 --- a/wasm32-multivalue.json +++ b/wasm32-multivalue.json @@ -1,7 +1,7 @@ { "arch": "wasm32", "crt-objects-fallback": "true", - "data-layout": "e-m:e-p:32:32-p10:8:8-p20:8:8-i64:64-n32:64-S128-ni:1:10:20", + "data-layout": "e-m:e-p:32:32-p10:8:8-p20:8:8-i64:64-i128:128-n32:64-S128-ni:1:10:20", "dll-prefix": "", "dll-suffix": ".wasm", "dynamic-linking": true,