Skip to content

Commit 62c159e

Browse files
author
James Duley
committed
Fix missing cfg for aarch64 + ios in ffi.rs
1 parent 8485f58 commit 62c159e

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

src/libcore/ffi.rs

+6-4
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ extern {
5959

6060
#[cfg(any(all(not(target_arch = "aarch64"), not(target_arch = "powerpc"),
6161
not(target_arch = "x86_64")),
62+
all(target_arch = "aarch64", target_os = "ios"),
6263
windows))]
6364
impl fmt::Debug for VaListImpl {
6465
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
@@ -71,7 +72,7 @@ impl fmt::Debug for VaListImpl {
7172
///
7273
/// [AArch64 Procedure Call Standard]:
7374
/// http://infocenter.arm.com/help/topic/com.arm.doc.ihi0055b/IHI0055B_aapcs64.pdf
74-
#[cfg(all(target_arch = "aarch64", not(windows)))]
75+
#[cfg(all(target_arch = "aarch64", not(target_os = "ios"), not(windows)))]
7576
#[repr(C)]
7677
#[derive(Debug)]
7778
#[unstable(feature = "c_variadic",
@@ -197,10 +198,10 @@ impl<'a> VaList<'a> {
197198
windows))]
198199
let mut ap = va_copy(self);
199200
#[cfg(all(any(target_arch = "aarch64", target_arch = "powerpc", target_arch = "x86_64"),
200-
not(windows)))]
201+
not(windows), not(all(target_arch = "aarch64", target_os = "ios"))))]
201202
let mut ap_inner = va_copy(self);
202203
#[cfg(all(any(target_arch = "aarch64", target_arch = "powerpc", target_arch = "x86_64"),
203-
not(windows)))]
204+
not(windows), not(all(target_arch = "aarch64", target_os = "ios"))))]
204205
let mut ap = VaList(&mut ap_inner);
205206
let ret = f(VaList(ap.0));
206207
va_end(&mut ap);
@@ -216,10 +217,11 @@ extern "rust-intrinsic" {
216217
/// Copies the current location of arglist `src` to the arglist `dst`.
217218
#[cfg(any(all(not(target_arch = "aarch64"), not(target_arch = "powerpc"),
218219
not(target_arch = "x86_64")),
220+
all(target_arch = "aarch64", target_os = "ios"),
219221
windows))]
220222
fn va_copy<'a>(src: &VaList<'a>) -> VaList<'a>;
221223
#[cfg(all(any(target_arch = "aarch64", target_arch = "powerpc", target_arch = "x86_64"),
222-
not(windows)))]
224+
not(windows), not(all(target_arch = "aarch64", target_os = "ios"))))]
223225
fn va_copy(src: &VaList) -> VaListImpl;
224226

225227
/// Loads an argument of type `T` from the `va_list` `ap` and increment the

0 commit comments

Comments
 (0)