about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorYuki Okushi <huyuumi.dev@gmail.com>2020-06-02 13:07:24 +0900
committerGitHub <noreply@github.com>2020-06-02 13:07:24 +0900
commitbec91cab569a5ec0d754b1d08cd18c1a8933d05d (patch)
tree4e2d34c4eccea6b11a69567bbc4556fc86e6ad0c /src
parent56c8f0fa12f2c7d5cc78fb17380bba933e85cb23 (diff)
parent0fd9a37ff452a9a32a2cbab9273bc964f0f047f3 (diff)
downloadrust-bec91cab569a5ec0d754b1d08cd18c1a8933d05d.tar.gz
rust-bec91cab569a5ec0d754b1d08cd18c1a8933d05d.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/librustc_codegen_ssa/back/linker.rs4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/librustc_codegen_ssa/back/linker.rs b/src/librustc_codegen_ssa/back/linker.rs
index 46c365efdb5..77cb31bf3d2 100644
--- a/src/librustc_codegen_ssa/back/linker.rs
+++ b/src/librustc_codegen_ssa/back/linker.rs
@@ -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
@@ -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");