Skip to content

Commit f722cec

Browse files
authored
Fix build of raytrace example on nightly (#2488)
The `__wasm_init_memory` function is no longer exported and we also need to build with `+mutable-globals`. Closes #2487
1 parent c8fb41f commit f722cec

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

azure-pipelines.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787
steps:
8888
- template: ci/azure-install-rust.yml
8989
parameters:
90-
toolchain: nightly-2021-03-28
90+
toolchain: nightly-2021-05-09
9191
- template: ci/azure-install-node.yml
9292
- script: cargo test --target wasm32-unknown-unknown --features nightly --test wasm
9393

@@ -204,7 +204,7 @@ jobs:
204204
steps:
205205
- template: ci/azure-install-rust.yml
206206
parameters:
207-
toolchain: nightly-2020-08-27
207+
toolchain: nightly-2021-05-09
208208
- script: rustup component add rust-src
209209
displayName: "install rust-src"
210210
- script: |

crates/threads-xform/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ impl Config {
113113
mem.maximum = Some(cmp::max(self.maximum_memory / PAGE_SIZE, prev_max));
114114
assert!(mem.data_segments.is_empty());
115115

116-
delete_synthetic_func(module, "__wasm_init_memory")?;
117116
let tls = Tls {
118117
init: delete_synthetic_func(module, "__wasm_init_tls")?,
119118
size: delete_synthetic_global(module, "__tls_size")?,

examples/raytrace-parallel/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ set -ex
1212
# features enabled, ensuring that LLVM will generate atomic instructions,
1313
# shared memory, passive segments, etc.
1414

15-
RUSTFLAGS='-C target-feature=+atomics,+bulk-memory' \
15+
RUSTFLAGS='-C target-feature=+atomics,+bulk-memory,+mutable-globals' \
1616
cargo build --target wasm32-unknown-unknown --release -Z build-std=std,panic_abort
1717

1818
# Note the usage of `--target no-modules` here which is required for passing

0 commit comments

Comments
 (0)