mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #102440 - sunfishcode:sunfishcode/wasm-no-export-tls-api, r=oli-obk

Browse Source 
Only export `__tls_*` on wasm32-unknown-unknown.

From talking with `@abrown,` we aren't planning to have hosts call these `__tls_*` functions; instead, TLS initialization will be handled transparently within libc. Consequently, these functions don't need to be exported.

Leave them exported on wasm32-unknown-unknown though, as wasm-bindgen does call them.
This commit is contained in:
Dylan DPC 2022-10-05 17:27:33 +05:30 committed by GitHub
commit 814b827efe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
compiler/rustc_codegen_ssa/src/back/linker.rs
View File

@ -1180,16 +1180,19 @@ 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.
// //
// * `--export=*tls*` - when `#[thread_local]` symbols are used these // On wasm32-unknown-unknown, we also export symbols for glue code to use:
// symbols are how the TLS segments are initialized and configured. // * `--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) { if sess.target_features.contains(&sym::atomics) {
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("--export=__wasm_init_tls"); if sess.target.os == "unknown" {
cmd.arg("--export=__tls_size"); cmd.arg("--export=__wasm_init_tls");
cmd.arg("--export=__tls_align"); cmd.arg("--export=__tls_size");
cmd.arg("--export=__tls_base"); cmd.arg("--export=__tls_align");
cmd.arg("--export=__tls_base");
}
} }
WasmLd { cmd, sess } WasmLd { cmd, sess }
} }