diff options
| author | Dylan DPC <99973273+Dylan-DPC@users.noreply.github.com> | 2022-06-29 17:59:34 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-29 17:59:34 +0530 |
| commit | 375ab3e44f721bb65f7cf975de06b2daf52c8563 (patch) | |
| tree | 1f17bcbece05d90fc07c93de3213575a50f8d0d1 | |
| parent | 7b9a7ef218fbdc3cbb9f7828bc9f032bcfd9a6dc (diff) | |
| parent | 3b117c4823bbe0f7250d4bd516bb370d12ca0952 (diff) | |
| download | rust-375ab3e44f721bb65f7cf975de06b2daf52c8563.tar.gz rust-375ab3e44f721bb65f7cf975de06b2daf52c8563.zip | |
Rollup merge of #98516 - dlrobertson:uefi_va_list, r=joshtriplett
library: fix uefi va_list type definition For uefi the `va_list` should always be the void pointer variant. Related to: https://github.com/rust-lang/rust/issues/44930
| -rw-r--r-- | library/core/src/ffi/mod.rs | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/library/core/src/ffi/mod.rs b/library/core/src/ffi/mod.rs index 93cdf121fbe..43e4b7f08e2 100644 --- a/library/core/src/ffi/mod.rs +++ b/library/core/src/ffi/mod.rs @@ -231,7 +231,8 @@ impl fmt::Debug for c_void { all(target_arch = "aarch64", any(target_os = "macos", target_os = "ios")), target_family = "wasm", target_arch = "asmjs", - windows + target_os = "uefi", + windows, ))] #[repr(transparent)] #[unstable( @@ -254,7 +255,8 @@ pub struct VaListImpl<'f> { all(target_arch = "aarch64", any(target_os = "macos", target_os = "ios")), target_family = "wasm", target_arch = "asmjs", - windows + target_os = "uefi", + windows, ))] #[unstable( feature = "c_variadic", @@ -276,7 +278,8 @@ impl<'f> fmt::Debug for VaListImpl<'f> { #[cfg(all( target_arch = "aarch64", not(any(target_os = "macos", target_os = "ios")), - not(windows) + not(target_os = "uefi"), + not(windows), ))] #[repr(C)] #[derive(Debug)] @@ -297,7 +300,7 @@ pub struct VaListImpl<'f> { } /// PowerPC ABI implementation of a `va_list`. -#[cfg(all(target_arch = "powerpc", not(windows)))] +#[cfg(all(target_arch = "powerpc", not(target_os = "uefi"), not(windows)))] #[repr(C)] #[derive(Debug)] #[unstable( @@ -317,7 +320,7 @@ pub struct VaListImpl<'f> { } /// x86_64 ABI implementation of a `va_list`. -#[cfg(all(target_arch = "x86_64", not(windows)))] +#[cfg(all(target_arch = "x86_64", not(target_os = "uefi"), not(windows)))] #[repr(C)] #[derive(Debug)] #[unstable( @@ -354,7 +357,8 @@ pub struct VaList<'a, 'f: 'a> { all(target_arch = "aarch64", any(target_os = "macos", target_os = "ios")), target_family = "wasm", target_arch = "asmjs", - windows + target_os = "uefi", + windows, ))] inner: VaListImpl<'f>, @@ -363,7 +367,8 @@ pub struct VaList<'a, 'f: 'a> { any(not(target_arch = "aarch64"), not(any(target_os = "macos", target_os = "ios"))), not(target_family = "wasm"), not(target_arch = "asmjs"), - not(windows) + not(target_os = "uefi"), + not(windows), ))] inner: &'a mut VaListImpl<'f>, @@ -375,7 +380,8 @@ pub struct VaList<'a, 'f: 'a> { all(target_arch = "aarch64", any(target_os = "macos", target_os = "ios")), target_family = "wasm", target_arch = "asmjs", - windows + target_os = "uefi", + windows, ))] #[unstable( feature = "c_variadic", @@ -396,7 +402,8 @@ impl<'f> VaListImpl<'f> { any(not(target_arch = "aarch64"), not(any(target_os = "macos", target_os = "ios"))), not(target_family = "wasm"), not(target_arch = "asmjs"), - not(windows) + not(target_os = "uefi"), + not(windows), ))] #[unstable( feature = "c_variadic", |