diff options
| author | bors <bors@rust-lang.org> | 2019-11-20 14:04:12 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-11-20 14:04:12 +0000 |
| commit | b9cf5417892ef242c783ef963deff5436205b0f6 (patch) | |
| tree | 0a875cafe855dc3b67841e2846155b2160ea0154 /src/libstd/sys/unix | |
| parent | ea540b0892ed6b62d170c7f0a9aa362e590de8b4 (diff) | |
| parent | ebd0ef9a39cbec962ed246d523186a8b88ccb351 (diff) | |
| download | rust-b9cf5417892ef242c783ef963deff5436205b0f6.tar.gz rust-b9cf5417892ef242c783ef963deff5436205b0f6.zip | |
Auto merge of #66571 - Centril:rollup-41tn2fw, r=Centril
Rollup of 8 pull requests Successful merges: - #65665 (Update Source Code Pro and include italics) - #66478 (rustc_plugin: Remove the compatibility shim) - #66497 (Fix #53820) - #66526 (Add more context to `async fn` trait error) - #66532 (Generate DWARF address ranges for faster lookups) - #66546 (Remove duplicate function) - #66548 ([RISCV] Disable Atomics on all Non-A RISC-V targets) - #66553 (remove HermitCore leftovers from sys/unix) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd/sys/unix')
| -rw-r--r-- | src/libstd/sys/unix/fast_thread_local.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sys/unix/fast_thread_local.rs b/src/libstd/sys/unix/fast_thread_local.rs index d7e733b7fa0..7d718032ef6 100644 --- a/src/libstd/sys/unix/fast_thread_local.rs +++ b/src/libstd/sys/unix/fast_thread_local.rs @@ -10,7 +10,7 @@ // 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 = "redox", target_os = "emscripten"))] pub unsafe fn register_dtor(t: *mut u8, dtor: unsafe extern fn(*mut u8)) { use crate::mem; |