Skip to content

Commit

Permalink
Rollup merge of #72889 - alexcrichton:update-wasm-threads, r=nikomats…
Browse files Browse the repository at this point in the history
…akis

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.
  • Loading branch information
JohnTitor authored Jun 2, 2020
2 parents 56c8f0f + 0fd9a37 commit bec91ca
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions src/librustc_codegen_ssa/back/linker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1010,9 +1010,6 @@ impl<'a> WasmLd<'a> {
// sharing memory and instantiating the module multiple times. As a
// result if it were exported then we'd just have no sharing.
//
// * `--passive-segments` - all memory segments should be passive to
// prevent each module instantiation from reinitializing memory.
//
// * `--export=__wasm_init_memory` - when using `--passive-segments` the
// linker will synthesize this function, and so we need to make sure
// that our usage of `--export` below won't accidentally cause this
Expand All @@ -1026,7 +1023,6 @@ impl<'a> WasmLd<'a> {
cmd.arg("--shared-memory");
cmd.arg("--max-memory=1073741824");
cmd.arg("--import-memory");
cmd.arg("--passive-segments");
cmd.arg("--export=__wasm_init_memory");
cmd.arg("--export=__wasm_init_tls");
cmd.arg("--export=__tls_size");
Expand Down

0 comments on commit bec91ca

Please sign in to comment.