diff options
| author | Tyler Mandry <tmandry@gmail.com> | 2019-10-05 21:55:13 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-05 21:55:13 -0700 |
| commit | 69598dc3cfd7e0ad63282268ea58ebac0b6031dc (patch) | |
| tree | b096ac2dd13c5edbfc3edaf9ecce9edde915470d /src/libstd/sys/unix | |
| parent | 485f5c953dea4ae05e1592d90747a0c2068aaed7 (diff) | |
| parent | d16b7f705bd7c266a924e43a31495477dc4c9321 (diff) | |
| download | rust-69598dc3cfd7e0ad63282268ea58ebac0b6031dc.tar.gz rust-69598dc3cfd7e0ad63282268ea58ebac0b6031dc.zip | |
Rollup merge of #65151 - tmandry:revert-emscripten-upgrade, r=tmandry
Revert #63649 - "Upgrade Emscripten targets to use upstream LLVM backend" This change caused the runtime of the linux-asmjs builder to nearly double from 2+ hours to about 4 hours, which happens to be the bors timeout. (It made it in barely under 4 hours when it was merged.) This is causing timeouts on all new changes. This reverts commit 7870050796e5904a0fc85ecbe6fa6dde1cfe0c91, reversing changes made to 2e7244807a7878f6eca3eb7d97ae9b413aa49014.
Diffstat (limited to 'src/libstd/sys/unix')
| -rw-r--r-- | src/libstd/sys/unix/fast_thread_local.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libstd/sys/unix/fast_thread_local.rs b/src/libstd/sys/unix/fast_thread_local.rs index d7e733b7fa0..952ba40ee87 100644 --- a/src/libstd/sys/unix/fast_thread_local.rs +++ b/src/libstd/sys/unix/fast_thread_local.rs @@ -10,8 +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", - target_os = "emscripten"))] +#[cfg(any(target_os = "linux", target_os = "fuchsia", target_os = "hermit", target_os = "redox"))] 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; |