bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #72889 - alexcrichton:update-wasm-threads, r=nikomatsakis

Browse source 
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.
This commit is contained in:
Yuki Okushi 2020-06-02 13:07:24 +09:00 • committed by GitHub
commit bec91cab56
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/librustc_codegen_ssa/back/linker.rs
View file

@ -1010,9 +1010,6 @@ impl<'a> WasmLd<'a> {
// sharing memory and instantiating the module multiple times. As a // sharing memory and instantiating the module multiple times. As a
// result if it were exported then we'd just have no sharing. // 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 // * `--export=__wasm_init_memory` - when using `--passive-segments` the
// linker will synthesize this function, and so we need to make sure // linker will synthesize this function, and so we need to make sure
// that our usage of `--export` below won't accidentally cause this // 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("--shared-memory");
cmd.arg("--max-memory=1073741824"); cmd.arg("--max-memory=1073741824");
cmd.arg("--import-memory"); cmd.arg("--import-memory");
cmd.arg("--passive-segments");
cmd.arg("--export=__wasm_init_memory"); cmd.arg("--export=__wasm_init_memory");
cmd.arg("--export=__wasm_init_tls"); cmd.arg("--export=__wasm_init_tls");
cmd.arg("--export=__tls_size"); cmd.arg("--export=__tls_size");