diff options
| author | bors <bors@rust-lang.org> | 2022-09-29 19:52:48 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-09-29 19:52:48 +0000 |
| commit | 9c56d9d6fec6262bbb1549cfe466a812ae2c6523 (patch) | |
| tree | fece705fa574e50248f1e758d7a04f27ade855da /compiler/rustc_codegen_ssa/src | |
| parent | 9f1a21ae2bd41b3dd335c44f38f29a1fb8712ddc (diff) | |
| parent | 98075708dde5b75e69d3294783c1f6abf5236dba (diff) | |
| download | rust-9c56d9d6fec6262bbb1549cfe466a812ae2c6523.tar.gz rust-9c56d9d6fec6262bbb1549cfe466a812ae2c6523.zip | |
Auto merge of #102482 - notriddle:rollup-fjm618g, r=notriddle
Rollup of 7 pull requests Successful merges: - #102214 (Fix span of byte-escaped left format args brace) - #102426 (Don't export `__wasm_init_memory` on WebAssembly.) - #102437 (rustdoc: cut margin-top from first header in docblock) - #102442 (rustdoc: remove bad CSS font-weight on `.impl`, `.method`, etc) - #102447 (rustdoc: add method spacing to trait methods) - #102468 (tidy: make rustc dependency error less confusing) - #102476 (Split out the error reporting logic into a separate function) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_ssa/src')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/back/linker.rs | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/compiler/rustc_codegen_ssa/src/back/linker.rs b/compiler/rustc_codegen_ssa/src/back/linker.rs index 061053ef2ac..f59a753a5ce 100644 --- a/compiler/rustc_codegen_ssa/src/back/linker.rs +++ b/compiler/rustc_codegen_ssa/src/back/linker.rs @@ -1180,18 +1180,12 @@ 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. // - // * `--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 - // function to get deleted. - // // * `--export=*tls*` - when `#[thread_local]` symbols are used these // symbols are how the TLS segments are initialized and configured. if sess.target_features.contains(&sym::atomics) { cmd.arg("--shared-memory"); cmd.arg("--max-memory=1073741824"); cmd.arg("--import-memory"); - cmd.arg("--export=__wasm_init_memory"); cmd.arg("--export=__wasm_init_tls"); cmd.arg("--export=__tls_size"); cmd.arg("--export=__tls_align"); |
