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

Fix va_list on watchOS and visionOS

Browse Source
This commit is contained in:
Mads Marquart 2024-04-28 18:04:08 +02:00
parent a6d9da6b2a
commit 214d588a5b
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -213,7 +213,7 @@ impl fmt::Debug for c_void {
not(target_arch = "s390x"), not(target_arch = "s390x"),
not(target_arch = "x86_64") not(target_arch = "x86_64")
), ),
all(target_arch = "aarch64", any(target_os = "macos", target_os = "ios", target_os = "tvos")), all(target_arch = "aarch64", target_vendor = "apple"),
target_family = "wasm", target_family = "wasm",
target_os = "uefi", target_os = "uefi",
windows, windows,
@ -241,7 +241,7 @@ pub struct VaListImpl<'f> {
not(target_arch = "s390x"), not(target_arch = "s390x"),
not(target_arch = "x86_64") not(target_arch = "x86_64")
), ),
all(target_arch = "aarch64", any(target_os = "macos", target_os = "ios", target_os = "tvos")), all(target_arch = "aarch64", target_vendor = "apple"),
target_family = "wasm", target_family = "wasm",
target_os = "uefi", target_os = "uefi",
windows, windows,
@ -265,7 +265,7 @@ impl<'f> fmt::Debug for VaListImpl<'f> {
/// http://infocenter.arm.com/help/topic/com.arm.doc.ihi0055b/IHI0055B_aapcs64.pdf /// http://infocenter.arm.com/help/topic/com.arm.doc.ihi0055b/IHI0055B_aapcs64.pdf
#[cfg(all( #[cfg(all(
target_arch = "aarch64", target_arch = "aarch64",
not(any(target_os = "macos", target_os = "ios", target_os = "tvos")), not(target_vendor = "apple"),
not(target_os = "uefi"), not(target_os = "uefi"),
not(windows), not(windows),
))] ))]
@ -362,10 +362,7 @@ pub struct VaList<'a, 'f: 'a> {
not(target_arch = "s390x"), not(target_arch = "s390x"),
not(target_arch = "x86_64") not(target_arch = "x86_64")
), ),
all( all(target_arch = "aarch64", target_vendor = "apple"),
target_arch = "aarch64",
any(target_os = "macos", target_os = "ios", target_os = "tvos")
),
target_family = "wasm", target_family = "wasm",
target_os = "uefi", target_os = "uefi",
windows, windows,
@ -379,10 +376,7 @@ pub struct VaList<'a, 'f: 'a> {
target_arch = "s390x", target_arch = "s390x",
target_arch = "x86_64" target_arch = "x86_64"
), ),
any( any(not(target_arch = "aarch64"), not(target_vendor = "apple")),
not(target_arch = "aarch64"),
not(any(target_os = "macos", target_os = "ios", target_os = "tvos"))
),
not(target_family = "wasm"), not(target_family = "wasm"),
not(target_os = "uefi"), not(target_os = "uefi"),
not(windows), not(windows),
@ -399,7 +393,7 @@ pub struct VaList<'a, 'f: 'a> {
not(target_arch = "s390x"), not(target_arch = "s390x"),
not(target_arch = "x86_64") not(target_arch = "x86_64")
), ),
all(target_arch = "aarch64", any(target_os = "macos", target_os = "ios", target_os = "tvos")), all(target_arch = "aarch64", target_vendor = "apple"),
target_family = "wasm", target_family = "wasm",
target_os = "uefi", target_os = "uefi",
windows, windows,
@ -425,10 +419,7 @@ impl<'f> VaListImpl<'f> {
target_arch = "s390x", target_arch = "s390x",
target_arch = "x86_64" target_arch = "x86_64"
), ),
any( any(not(target_arch = "aarch64"), not(target_vendor = "apple")),
not(target_arch = "aarch64"),
not(any(target_os = "macos", target_os = "ios", target_os = "tvos"))
),
not(target_family = "wasm"), not(target_family = "wasm"),
not(target_os = "uefi"), not(target_os = "uefi"),
not(windows), not(windows),