Skip to content

Commit 6a0a0c2

Browse files
committed
Adjust the std library for sanitizer_cfi cfgs changes
1 parent cc6cbaa commit 6a0a0c2

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

library/std/src/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,7 @@
270270
#![feature(allow_internal_unsafe)]
271271
#![feature(allow_internal_unstable)]
272272
#![feature(c_unwind)]
273+
#![feature(cfg_sanitizer_cfi)]
273274
#![feature(cfg_target_thread_local)]
274275
#![feature(cfi_encoding)]
275276
#![feature(concat_idents)]

library/std/src/sys/unix/thread_local_dtor.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// Note, however, that we run on lots older linuxes, as well as cross
1212
// compiling from a newer linux to an older linux, so we also have a
1313
// fallback implementation to use as well.
14-
#[allow(unexpected_cfgs)]
14+
#[cfg_attr(not(bootstrap), allow(unexpected_cfgs))]
1515
#[cfg(any(
1616
target_os = "linux",
1717
target_os = "android",

0 commit comments

Comments
 (0)