diff options
| author | bors <bors@rust-lang.org> | 2017-11-25 00:17:03 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-11-25 00:17:03 +0000 |
| commit | db162922f7e43fffccbf534028b36055ae9af014 (patch) | |
| tree | 33f0058718020f6573529274e84f107240e416b2 /src/libstd/sys | |
| parent | a550f2d3b3d4eb57e7fcad284d60c4bea4aed687 (diff) | |
| parent | 95e9609b9dade04590b7f3b9f6c3f7b02d116b3f (diff) | |
| download | rust-db162922f7e43fffccbf534028b36055ae9af014.tar.gz rust-db162922f7e43fffccbf534028b36055ae9af014.zip | |
Auto merge of #46008 - alexcrichton:update-llvm, r=Mark-Simulacrum
rustbuild: Update LLVM and enable ThinLTO This commit updates LLVM to fix #45511 (https://reviews.llvm.org/D39981) and also reenables ThinLTO for libtest now that we shouldn't hit #45768. This also opportunistically enables ThinLTO for libstd which was previously blocked (#45661) on test failures related to debuginfo with a presumed cause of #45511. Closes #45511
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/windows/thread_local.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libstd/sys/windows/thread_local.rs b/src/libstd/sys/windows/thread_local.rs index 7ae9ed917bd..cdad320e122 100644 --- a/src/libstd/sys/windows/thread_local.rs +++ b/src/libstd/sys/windows/thread_local.rs @@ -200,8 +200,9 @@ unsafe fn register_dtor(key: Key, dtor: Dtor) { // the address of the symbol to ensure it sticks around. #[link_section = ".CRT$XLB"] -#[linkage = "external"] #[allow(dead_code, unused_variables)] +#[used] // we don't want LLVM eliminating this symbol for any reason, and + // when the symbol makes it to the linker the linker will take over pub static p_thread_callback: unsafe extern "system" fn(c::LPVOID, c::DWORD, c::LPVOID) = on_tls_callback; |