Cheng Shao pushed to branch wip/fix-9.12-wasm at Glasgow Haskell Compiler / GHC Commits: 65b68d22 by Cheng Shao at 2026-03-23T16:14:28+01:00 ci: bump ci-images revision This commit bumps ci-images revisions on the ghc-9.12 branch to https://gitlab.haskell.org/ghc/ci-images/-/commits/ghc-9.12-v4 with ghc-wasm-meta toolchain fix. - - - - - fba0eca0 by Cheng Shao at 2026-03-23T16:14:28+01:00 wasm: fix broken dyld.mjs on upstream ghc-9.12 branch This patch fixes broken `dyld.mjs` on upstream ghc-9.12 branch. Fixes #27079. - - - - - 2 changed files: - .gitlab-ci.yml - utils/jsffi/dyld.mjs Changes: ===================================== .gitlab-ci.yml ===================================== @@ -11,7 +11,7 @@ variables: GIT_SSL_NO_VERIFY: "1" # Commit of ghc/ci-images repository from which to pull Docker images - DOCKER_REV: 936715c0e4d036cac61f31387a6fd5b22006c251 + DOCKER_REV: 94806d948c7263fa6318561a1af44421493d2db3 # Sequential version number of all cached things. # Bump to invalidate GitLab CI cache. ===================================== utils/jsffi/dyld.mjs ===================================== @@ -784,21 +784,22 @@ class DyLD { continue; } - // See - // https://gitlab.haskell.org/haskell-wasm/llvm-project/-/blob/release/21.x/lld..., - // __wasm_apply_data_relocs is now optional so only call it if - // it exists (we know for sure it exists for libc.so though). - // There's also __wasm_init_memory (not relevant yet, we don't - // use passive segments) & __wasm_apply_global_relocs but - // those are included in the start function and should have - // been called upon instantiation, see - // Writer::createStartFunction(). - if (instance.exports.__wasm_apply_data_relocs) { + const init = () => { + // See + // https://gitlab.haskell.org/haskell-wasm/llvm-project/-/blob/release/21.x/lld..., + // __wasm_apply_data_relocs is now optional so only call it if + // it exists (we know for sure it exists for libc.so though). + // There's also __wasm_init_memory (not relevant yet, we don't + // use passive segments) & __wasm_apply_global_relocs but + // those are included in the start function and should have + // been called upon instantiation, see + // Writer::createStartFunction(). + if (instance.exports.__wasm_apply_data_relocs) { instance.exports.__wasm_apply_data_relocs(); } - }; - instance.exports._initialize(); + instance.exports._initialize(); + }; // rts init must be deferred until ghc-internal symbols are // exported. We hard code this hack for now. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/31c48f28e119b619c9acf20fa99a06f... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/31c48f28e119b619c9acf20fa99a06f... You're receiving this email because of your account on gitlab.haskell.org.