diff options
| author | bjorn3 <bjorn3@users.noreply.github.com> | 2021-03-29 10:45:09 +0200 |
|---|---|---|
| committer | bjorn3 <bjorn3@users.noreply.github.com> | 2021-03-29 10:45:09 +0200 |
| commit | 07968a001d9e7dfd2417dfb57d3227e395691418 (patch) | |
| tree | 367afabb3d748473281bbd2548c3de46d9c9c96f /example | |
| parent | 500bcfcdb3122d68cabdfc2eb9034d88b708e0bc (diff) | |
| download | rust-07968a001d9e7dfd2417dfb57d3227e395691418.tar.gz rust-07968a001d9e7dfd2417dfb57d3227e395691418.zip | |
Merge commit '0969bc6dde001e01e7e1f58c8ccd7750f8a49ae1' into sync_cg_clif-2021-03-29
Diffstat (limited to 'example')
| -rw-r--r-- | example/mini_core.rs | 1 | ||||
| -rw-r--r-- | example/mini_core_hello_world.rs | 9 |
2 files changed, 4 insertions, 6 deletions
diff --git a/example/mini_core.rs b/example/mini_core.rs index 7c6d7fc106d..c4834c80408 100644 --- a/example/mini_core.rs +++ b/example/mini_core.rs @@ -621,6 +621,7 @@ struct PanicLocation { } #[no_mangle] +#[cfg(not(windows))] pub fn get_tls() -> u8 { #[thread_local] static A: u8 = 42; diff --git a/example/mini_core_hello_world.rs b/example/mini_core_hello_world.rs index 237f4d11d57..ea37ca98b59 100644 --- a/example/mini_core_hello_world.rs +++ b/example/mini_core_hello_world.rs @@ -1,7 +1,4 @@ -#![feature( - no_core, start, lang_items, box_syntax, never_type, linkage, - extern_types, thread_local -)] +#![feature(no_core, lang_items, box_syntax, never_type, linkage, extern_types, thread_local)] #![no_core] #![allow(dead_code, non_camel_case_types)] @@ -239,7 +236,7 @@ fn main() { assert_eq!(((|()| 42u8) as fn(()) -> u8)(()), 42); - #[cfg(not(jit))] + #[cfg(not(any(jit, windows)))] { extern { #[linkage = "extern_weak"] @@ -292,7 +289,7 @@ fn main() { from_decimal_string(); - #[cfg(not(jit))] + #[cfg(not(any(jit, windows)))] test_tls(); #[cfg(all(not(jit), target_os = "linux"))] |