From d499bbb99d72c991f1d1691f83ffe96bcfafc80a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20K=C3=A5re=20Alsaker?= Date: Wed, 29 Mar 2023 14:50:10 +0200 Subject: [PATCH] Use #[cfg(target_thread_local)] on items --- tests/ui/thread-local/auxiliary/tls-export.rs | 3 ++- tests/ui/thread-local/auxiliary/tls-rlib.rs | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/ui/thread-local/auxiliary/tls-export.rs b/tests/ui/thread-local/auxiliary/tls-export.rs index aab48f871c9b8..027213bc03349 100644 --- a/tests/ui/thread-local/auxiliary/tls-export.rs +++ b/tests/ui/thread-local/auxiliary/tls-export.rs @@ -1,15 +1,16 @@ #![crate_type = "dylib"] #![feature(thread_local)] #![feature(cfg_target_thread_local)] -#![cfg(target_thread_local)] extern crate tls_rlib; pub use tls_rlib::*; +#[cfg(target_thread_local)] #[thread_local] pub static FOO: bool = true; +#[cfg(target_thread_local)] #[inline(never)] pub fn foo_addr() -> usize { &FOO as *const bool as usize diff --git a/tests/ui/thread-local/auxiliary/tls-rlib.rs b/tests/ui/thread-local/auxiliary/tls-rlib.rs index 0fbcf387b5fa9..20bc998ec11d8 100644 --- a/tests/ui/thread-local/auxiliary/tls-rlib.rs +++ b/tests/ui/thread-local/auxiliary/tls-rlib.rs @@ -3,11 +3,12 @@ #![crate_type = "rlib"] #![feature(thread_local)] #![feature(cfg_target_thread_local)] -#![cfg(target_thread_local)] +#[cfg(target_thread_local)] #[thread_local] pub static BAR: bool = true; +#[cfg(target_thread_local)] #[inline(never)] pub fn bar_addr() -> usize { &BAR as *const bool as usize