Skip to content

Commit bec91ca

Browse files
authored
Rollup merge of #72889 - alexcrichton:update-wasm-threads, r=nikomatsakis
rustc: Remove the `--passive-segments` LLD flag on wasm This flag looks like it's been removed in LLVM 10, so this removes rustc unconditionally passing the flag.
2 parents 56c8f0f + 0fd9a37 commit bec91ca

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

src/librustc_codegen_ssa/back/linker.rs

-4
Original file line numberDiff line numberDiff line change
@@ -1010,9 +1010,6 @@ impl<'a> WasmLd<'a> {
10101010
// sharing memory and instantiating the module multiple times. As a
10111011
// result if it were exported then we'd just have no sharing.
10121012
//
1013-
// * `--passive-segments` - all memory segments should be passive to
1014-
// prevent each module instantiation from reinitializing memory.
1015-
//
10161013
// * `--export=__wasm_init_memory` - when using `--passive-segments` the
10171014
// linker will synthesize this function, and so we need to make sure
10181015
// that our usage of `--export` below won't accidentally cause this
@@ -1026,7 +1023,6 @@ impl<'a> WasmLd<'a> {
10261023
cmd.arg("--shared-memory");
10271024
cmd.arg("--max-memory=1073741824");
10281025
cmd.arg("--import-memory");
1029-
cmd.arg("--passive-segments");
10301026
cmd.arg("--export=__wasm_init_memory");
10311027
cmd.arg("--export=__wasm_init_tls");
10321028
cmd.arg("--export=__tls_size");

0 commit comments

Comments
 (0)