mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #98516 - dlrobertson:uefi_va_list, r=joshtriplett

Browse Source 
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
This commit is contained in:
Dylan DPC 2022-06-29 17:59:34 +05:30 committed by GitHub
commit 375ab3e44f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
library/core/src/ffi/mod.rs
View File

@ -231,7 +231,8 @@ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
all(target_arch = "aarch64", any(target_os = "macos", target_os = "ios")), all(target_arch = "aarch64", any(target_os = "macos", target_os = "ios")),
target_family = "wasm", target_family = "wasm",
target_arch = "asmjs", target_arch = "asmjs",
windows target_os = "uefi",
windows,
))] ))]
#[repr(transparent)] #[repr(transparent)]
#[unstable( #[unstable(
@ -254,7 +255,8 @@ pub struct VaListImpl<'f> {
all(target_arch = "aarch64", any(target_os = "macos", target_os = "ios")), all(target_arch = "aarch64", any(target_os = "macos", target_os = "ios")),
target_family = "wasm", target_family = "wasm",
target_arch = "asmjs", target_arch = "asmjs",
windows target_os = "uefi",
windows,
))] ))]
#[unstable( #[unstable(
feature = "c_variadic", feature = "c_variadic",
@ -276,7 +278,8 @@ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
#[cfg(all( #[cfg(all(
target_arch = "aarch64", target_arch = "aarch64",
not(any(target_os = "macos", target_os = "ios")), not(any(target_os = "macos", target_os = "ios")),
not(windows) not(target_os = "uefi"),
not(windows),
))] ))]
#[repr(C)] #[repr(C)]
#[derive(Debug)] #[derive(Debug)]
@ -297,7 +300,7 @@ pub struct VaListImpl<'f> {
} }
/// PowerPC ABI implementation of a `va_list`. /// 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)] #[repr(C)]
#[derive(Debug)] #[derive(Debug)]
#[unstable( #[unstable(
@ -317,7 +320,7 @@ pub struct VaListImpl<'f> {
} }
/// x86_64 ABI implementation of a `va_list`. /// 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)] #[repr(C)]
#[derive(Debug)] #[derive(Debug)]
#[unstable( #[unstable(
@ -354,7 +357,8 @@ pub struct VaList<'a, 'f: 'a> {
all(target_arch = "aarch64", any(target_os = "macos", target_os = "ios")), all(target_arch = "aarch64", any(target_os = "macos", target_os = "ios")),
target_family = "wasm", target_family = "wasm",
target_arch = "asmjs", target_arch = "asmjs",
windows target_os = "uefi",
windows,
))] ))]
inner: VaListImpl<'f>, 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"))), any(not(target_arch = "aarch64"), not(any(target_os = "macos", target_os = "ios"))),
not(target_family = "wasm"), not(target_family = "wasm"),
not(target_arch = "asmjs"), not(target_arch = "asmjs"),
not(windows) not(target_os = "uefi"),
not(windows),
))] ))]
inner: &'a mut VaListImpl<'f>, 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")), all(target_arch = "aarch64", any(target_os = "macos", target_os = "ios")),
target_family = "wasm", target_family = "wasm",
target_arch = "asmjs", target_arch = "asmjs",
windows target_os = "uefi",
windows,
))] ))]
#[unstable( #[unstable(
feature = "c_variadic", feature = "c_variadic",
@ -396,7 +402,8 @@ pub fn as_va_list<'a>(&'a mut self) -> VaList<'a, 'f> {
any(not(target_arch = "aarch64"), not(any(target_os = "macos", target_os = "ios"))), any(not(target_arch = "aarch64"), not(any(target_os = "macos", target_os = "ios"))),
not(target_family = "wasm"), not(target_family = "wasm"),
not(target_arch = "asmjs"), not(target_arch = "asmjs"),
not(windows) not(target_os = "uefi"),
not(windows),
))] ))]
#[unstable( #[unstable(
feature = "c_variadic", feature = "c_variadic",