diff options
| author | bors <bors@rust-lang.org> | 2019-10-04 20:33:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-10-04 20:33:02 +0000 |
| commit | 7870050796e5904a0fc85ecbe6fa6dde1cfe0c91 (patch) | |
| tree | 9a1cd1fe1091eb7e2ddaf1df8f9ea93eb70c6fa2 /src/libstd | |
| parent | 2e7244807a7878f6eca3eb7d97ae9b413aa49014 (diff) | |
| parent | 4a4df29d6fa12c303e3991f0e0e3677342c4787c (diff) | |
| download | rust-7870050796e5904a0fc85ecbe6fa6dde1cfe0c91.tar.gz rust-7870050796e5904a0fc85ecbe6fa6dde1cfe0c91.zip | |
Auto merge of #63649 - tlively:emscripten-upstream-upgrade, r=alexcrichton
Upgrade Emscripten targets to use upstream LLVM backend - Refactors the Emscripten target spec to share code with other wasm targets. - Replaces the incorrect wasm32 C call ABI with the old asmjs version, which is correct for both wasm32 and JS. - Updates the varargs ABI used by Emscripten and deletes the old one. - Removes the obsolete wasm32-experimental-emscripten target. - Temporarily makes Emscripten targets use panic=abort by default because supporting unwinding will require an LLVM patch.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/sys/unix/fast_thread_local.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libstd/sys/unix/fast_thread_local.rs b/src/libstd/sys/unix/fast_thread_local.rs index 952ba40ee87..d7e733b7fa0 100644 --- a/src/libstd/sys/unix/fast_thread_local.rs +++ b/src/libstd/sys/unix/fast_thread_local.rs @@ -10,7 +10,8 @@ // fallback implementation to use as well. // // Due to rust-lang/rust#18804, make sure this is not generic! -#[cfg(any(target_os = "linux", target_os = "fuchsia", target_os = "hermit", target_os = "redox"))] +#[cfg(any(target_os = "linux", target_os = "fuchsia", target_os = "hermit", target_os = "redox", + target_os = "emscripten"))] pub unsafe fn register_dtor(t: *mut u8, dtor: unsafe extern fn(*mut u8)) { use crate::mem; use crate::sys_common::thread_local::register_dtor_fallback; |