diff options
| author | Nilstrieb <48135649+Nilstrieb@users.noreply.github.com> | 2023-11-21 09:06:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-21 09:06:27 +0100 |
| commit | 6bb671e7e8981954a5ad87fbd917e2a05b3e4060 (patch) | |
| tree | 0d333d9c38f6080a4bf0dc032bcf12609b5a6b82 | |
| parent | 390e3c8b6615afb4f0b9bb2c3db3ad033ac75d78 (diff) | |
| parent | 55e3dc487fdf8025fb99301883e24af15323912a (diff) | |
| download | rust-6bb671e7e8981954a5ad87fbd917e2a05b3e4060.tar.gz rust-6bb671e7e8981954a5ad87fbd917e2a05b3e4060.zip | |
Rollup merge of #117790 - rcvalle:rust-cfi-fix-000000, r=workingjubilee
CFI: Add missing use core::ffi::c_int Adds missing use core::ffi::c_int for when sanitizer_cfi_normalize_integers is defined.
| -rw-r--r-- | library/std/src/sys/unix/thread_local_dtor.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/library/std/src/sys/unix/thread_local_dtor.rs b/library/std/src/sys/unix/thread_local_dtor.rs index 06399e8a274..667fd516962 100644 --- a/library/std/src/sys/unix/thread_local_dtor.rs +++ b/library/std/src/sys/unix/thread_local_dtor.rs @@ -23,6 +23,8 @@ pub unsafe fn register_dtor(t: *mut u8, dtor: unsafe extern "C" fn(*mut u8)) { /// This is necessary because the __cxa_thread_atexit_impl implementation /// std links to by default may be a C or C++ implementation that was not /// compiled using the Clang integer normalization option. + #[cfg(sanitizer_cfi_normalize_integers)] + use core::ffi::c_int; #[cfg(not(sanitizer_cfi_normalize_integers))] #[cfi_encoding = "i"] #[repr(transparent)] |