Backport upstream test fixes for ARM/AArch64

debian/patches/backport-test-fixes-arm-01.patch

@@ -0,0 +1,16 @@
+Description: Fix asm-misplaced-option on ARM/AArch64
+Author: Mátyás Mustoha <mmatyas@inf.u-szeged.hu>
+Applied-Upstream: commit:ba8d46eac80fef496790486f1cb08dec61a2555d
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/test/compile-fail/asm-misplaced-option.rs
++++ b/src/test/compile-fail/asm-misplaced-option.rs
+@@ -9,6 +9,8 @@
+ // except according to those terms.
+ 
+ // ignore-android
++// ignore-arm
++// ignore-aarch64
+ 
+ #![feature(asm, rustc_attrs)]
+ 

debian/patches/backport-test-fixes-arm-02.patch

@@ -0,0 +1,17 @@
+Description: test: disable more stdcall tests for ARM arches. temp workaround for #24958
+Author: Ximin Luo <infinity0@pwned.gg>
+Bug: https://github.com/rust-lang/rust/pull/34889
+Applied-Upstream: commit:4e5e36fb79e1cffc6f7c3a9670df222060bb0e4b
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- 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
+ 

debian/patches/backport-test-fixes-arm-03.patch

@@ -0,0 +1,45 @@
+Description: doc/book: fix tests for non-x86 architectures, such as aarch64
+ `rustdoc --test` gets confused when "main" exists for some architectures but not others.
+Author: Ximin Luo <infinity0@pwned.gg>
+Bug: https://github.com/rust-lang/rust/pull/34889
+Applied-Upstream: commit:8aaf0f894bfbbc8e1135e42ce7cb9258d55f41cc
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/doc/book/inline-assembly.md
++++ b/src/doc/book/inline-assembly.md
+@@ -60,6 +60,8 @@
+     : "{eax}"
+    );
+ # } }
++# #[cfg(not(any(target_arch = "x86", target_arch = "x86_64")))]
++# fn main() {}
+ ```
+ 
+ Whitespace also doesn't matter:
+@@ -70,6 +72,8 @@
+ # 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 @@
+ // 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 @@
+ }
+ println!("eax is currently {}", result);
+ # }
++# #[cfg(not(any(target_arch = "x86", target_arch = "x86_64")))]
++# fn main() {}
+ ```
+ 
+ ## More Information

debian/patches/series

@@ -9,3 +9,6 @@ auto-local-rebuild_01.patch
 auto-local-rebuild_02.patch
 auto-local-rebuild_03.patch
 reproducible-dl-stage0.patch
+backport-test-fixes-arm-01.patch
+backport-test-fixes-arm-02.patch
+backport-test-fixes-arm-03.patch