Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Account for wasm32v1-none when exporting TLS symbols #133244

Merged
merged 1 commit into from
Nov 21, 2024

Conversation

daxpedda
Copy link
Contributor

Exporting TLS related symbols was limited to wasm32-unknown-unknown because WASI and Emscripten (?) have their own infrastructure to deal with TLS. However, the introduction of wasm32v1-none is in the same boat as wasm32-unknown-unknown.

This PR adjust the mechanism to account for wasm32v1-none as well.

See #102385 and #102440.

r? @alexcrichton

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Nov 20, 2024
@daxpedda daxpedda changed the title Fix wasm32v1-none target_feature = "atomics" Account for wasm32v1-none when exporting TLS symbols Nov 20, 2024
@rust-log-analyzer

This comment has been minimized.

@jieyouxu jieyouxu added the O-wasm Target: WASM (WebAssembly), http://webassembly.org/ label Nov 20, 2024
@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Nov 20, 2024

📌 Commit f37d021 has been approved by alexcrichton

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 20, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Nov 20, 2024
…lexcrichton

Account for `wasm32v1-none` when exporting TLS symbols

Exporting TLS related symbols was limited to `wasm32-unknown-unknown` because WASI and Emscripten (?) have their own infrastructure to deal with TLS. However, the introduction of `wasm32v1-none` is in the same boat as `wasm32-unknown-unknown`.

This PR adjust the mechanism to account for `wasm32v1-none` as well.

See rust-lang#102385 and rust-lang#102440.

r? `@alexcrichton`
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 20, 2024
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#129838 (uefi: process: Add args support)
 - rust-lang#130800 (Mark `get_mut` and `set_position` in `std::io::Cursor` as const.)
 - rust-lang#132708 (Point at `const` definition when used instead of a binding in a `let` statement)
 - rust-lang#133226 (Make `PointerLike` opt-in instead of built-in)
 - rust-lang#133244 (Account for `wasm32v1-none` when exporting TLS symbols)
 - rust-lang#133257 (Add `UnordMap::clear` method)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 1099bc8 into rust-lang:master Nov 21, 2024
6 checks passed
@rustbot rustbot added this to the 1.84.0 milestone Nov 21, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Nov 21, 2024
Rollup merge of rust-lang#133244 - daxpedda:wasm32v1-none-atomic, r=alexcrichton

Account for `wasm32v1-none` when exporting TLS symbols

Exporting TLS related symbols was limited to `wasm32-unknown-unknown` because WASI and Emscripten (?) have their own infrastructure to deal with TLS. However, the introduction of `wasm32v1-none` is in the same boat as `wasm32-unknown-unknown`.

This PR adjust the mechanism to account for `wasm32v1-none` as well.

See rust-lang#102385 and rust-lang#102440.

r? ``@alexcrichton``
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
O-wasm Target: WASM (WebAssembly), http://webassembly.org/ S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants