about summary refs log tree commit diff
path: root/src/test/compile-fail
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-06-09 23:19:49 +0000
committerbors <bors@rust-lang.org>2017-06-09 23:19:49 +0000
commit60ac9f467cbbf8481a6f09e3e90e470dec85cf65 (patch)
treed2e8f91eb7cb3e7594cbefaf71224e12c87cf133 /src/test/compile-fail
parent3d5b8c6266fd58cefa0d7af8c6115fe22532d069 (diff)
parent3be7f8bfed5966ef0f4c9cf348424cf3ebaf0f1e (diff)
downloadrust-60ac9f467cbbf8481a6f09e3e90e470dec85cf65.tar.gz
rust-60ac9f467cbbf8481a6f09e3e90e470dec85cf65.zip
Auto merge of #42573 - frewsxcv:rollup, r=frewsxcv
Rollup of 5 pull requests

- Successful merges: #42307, #42385, #42531, #42551, #42558
- Failed merges:
Diffstat (limited to 'src/test/compile-fail')
-rw-r--r--src/test/compile-fail/variadic-ffi.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/test/compile-fail/variadic-ffi.rs b/src/test/compile-fail/variadic-ffi.rs
index 125177efc53..f245306f4d8 100644
--- a/src/test/compile-fail/variadic-ffi.rs
+++ b/src/test/compile-fail/variadic-ffi.rs
@@ -9,6 +9,7 @@
 // except according to those terms.
 
 // ignore-arm stdcall isn't suppported
+// ignore-aarch64 stdcall isn't suppported
 
 extern "stdcall" {
     fn printf(_: *const u8, ...); //~ ERROR: variadic function must have C or cdecl calling