From 4e5e36fb79e1cffc6f7c3a9670df222060bb0e4b Mon Sep 17 00:00:00 2001
From: Ximin Luo <infinity0@pwned.gg>
Date: Sun, 17 Jul 2016 20:57:54 +0200
Subject: [PATCH 1/2] test: disable more stdcall tests for ARM arches. temp
 workaround for #24958

---
 src/test/debuginfo/type-names.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/test/debuginfo/type-names.rs b/src/test/debuginfo/type-names.rs
index a74369ed3c3a1..2419625cbd374 100644
--- a/src/test/debuginfo/type-names.rs
+++ b/src/test/debuginfo/type-names.rs
@@ -11,6 +11,8 @@
 // ignore-tidy-linelength
 // ignore-lldb
 // ignore-android: FIXME(#24958)
+// ignore-arm: FIXME(#24958)
+// ignore-aarch64: FIXME(#24958)
 
 // compile-flags:-g
 

From 8aaf0f894bfbbc8e1135e42ce7cb9258d55f41cc Mon Sep 17 00:00:00 2001
From: Ximin Luo <infinity0@pwned.gg>
Date: Sun, 17 Jul 2016 21:00:24 +0200
Subject: [PATCH 2/2] doc/book: fix tests for non-x86 architectures, such as
 aarch64

`rustdoc --test` gets confused when "main" exists for some architectures but not others.
---
 src/doc/book/inline-assembly.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/doc/book/inline-assembly.md b/src/doc/book/inline-assembly.md
index a8340d9d31e79..62e196a7ccdf3 100644
--- a/src/doc/book/inline-assembly.md
+++ b/src/doc/book/inline-assembly.md
@@ -60,6 +60,8 @@ asm!("xor %eax, %eax"
     : "eax"
    );
 # } }
+# #[cfg(not(any(target_arch = "x86", target_arch = "x86_64")))]
+# fn main() {}
 ```
 
 Whitespace also doesn't matter:
@@ -70,6 +72,8 @@ Whitespace also doesn't matter:
 # fn main() { unsafe {
 asm!("xor %eax, %eax" ::: "eax");
 # } }
+# #[cfg(not(any(target_arch = "x86", target_arch = "x86_64")))]
+# fn main() {}
 ```
 
 ## Operands
@@ -129,6 +133,8 @@ stay valid.
 // Put the value 0x200 in eax
 asm!("mov $$0x200, %eax" : /* no outputs */ : /* no inputs */ : "eax");
 # } }
+# #[cfg(not(any(target_arch = "x86", target_arch = "x86_64")))]
+# fn main() {}
 ```
 
 Input and output registers need not be listed since that information
@@ -164,6 +170,8 @@ unsafe {
 }
 println!("eax is currently {}", result);
 # }
+# #[cfg(not(any(target_arch = "x86", target_arch = "x86_64")))]
+# fn main() {}
 ```
 
 ## More Information