From 4851d5663cf74fafc1d753d68394ea0011cfde36 Mon Sep 17 00:00:00 2001
From: Joshua Nelson <github@jyn.dev>
Date: Thu, 30 Mar 2023 08:46:31 -0500
Subject: [PATCH] ignore failing cross-compiled run-make tests

`run-make-fulldeps` is never cross-compiled, so a lot of these tests
never accounted for --target. Ignore them when cross-compiling for
now.
---
 tests/run-make/a-b-a-linker-guard/Makefile                 | 1 +
 tests/run-make/allow-non-lint-warnings-cmdline/Makefile    | 1 +
 tests/run-make/allow-warnings-cmdline-stability/Makefile   | 1 +
 tests/run-make/archive-duplicate-names/Makefile            | 1 +
 tests/run-make/arguments-non-c-like-enum/Makefile          | 1 +
 tests/run-make/bare-outfile/Makefile                       | 1 +
 tests/run-make/c-dynamic-dylib/Makefile                    | 1 +
 tests/run-make/c-dynamic-rlib/Makefile                     | 1 +
 tests/run-make/c-link-to-rust-dylib/Makefile               | 1 +
 tests/run-make/c-link-to-rust-staticlib/Makefile           | 1 +
 tests/run-make/c-link-to-rust-va-list-fn/Makefile          | 1 +
 tests/run-make/c-static-dylib/Makefile                     | 1 +
 tests/run-make/c-static-rlib/Makefile                      | 1 +
 tests/run-make/c-unwind-abi-catch-lib-panic/Makefile       | 1 +
 tests/run-make/c-unwind-abi-catch-panic/Makefile           | 1 +
 tests/run-make/cdylib-dylib-linkage/Makefile               | 1 +
 tests/run-make/cdylib-fewer-symbols/Makefile               | 1 +
 tests/run-make/cdylib/Makefile                             | 1 +
 tests/run-make/codegen-options-parsing/Makefile            | 1 +
 tests/run-make/compile-stdin/Makefile                      | 1 +
 tests/run-make/crate-hash-rustc-version/Makefile           | 1 +
 tests/run-make/crate-name-priority/Makefile                | 1 +
 tests/run-make/debug-assertions/Makefile                   | 1 +
 tests/run-make/doctests-keep-binaries/Makefile             | 1 +
 tests/run-make/dylib-chain/Makefile                        | 1 +
 tests/run-make/emit/Makefile                               | 1 +
 tests/run-make/exit-code/Makefile                          | 1 +
 tests/run-make/extern-diff-internal-name/Makefile          | 1 +
 tests/run-make/extern-flag-disambiguates/Makefile          | 1 +
 tests/run-make/extern-flag-fun/Makefile                    | 1 +
 tests/run-make/extern-flag-pathless/Makefile               | 1 +
 tests/run-make/extern-fn-generic/Makefile                  | 1 +
 tests/run-make/extern-fn-mangle/Makefile                   | 1 +
 tests/run-make/extern-fn-reachable/Makefile                | 1 +
 tests/run-make/extern-fn-struct-passing-abi/Makefile       | 1 +
 tests/run-make/extern-fn-with-extern-types/Makefile        | 1 +
 tests/run-make/extern-fn-with-packed-struct/Makefile       | 1 +
 tests/run-make/extern-fn-with-union/Makefile               | 1 +
 tests/run-make/extern-multiple-copies/Makefile             | 1 +
 tests/run-make/extern-multiple-copies2/Makefile            | 1 +
 tests/run-make/extern-overrides-distribution/Makefile      | 1 +
 tests/run-make/extra-filename-with-temp-outputs/Makefile   | 1 +
 tests/run-make/foreign-double-unwind/Makefile              | 1 +
 tests/run-make/foreign-exceptions/Makefile                 | 1 +
 tests/run-make/foreign-rust-exceptions/Makefile            | 1 +
 tests/run-make/fpic/Makefile                               | 1 +
 tests/run-make/glibc-staticlib-args/Makefile               | 1 +
 tests/run-make/incr-add-rust-src-component/Makefile        | 1 +
 tests/run-make/interdependent-c-libraries/Makefile         | 1 +
 tests/run-make/issue-11908/Makefile                        | 1 +
 tests/run-make/issue-14500/Makefile                        | 2 ++
 tests/run-make/issue-15460/Makefile                        | 1 +
 tests/run-make/issue-20626/Makefile                        | 1 +
 tests/run-make/issue-22131/Makefile                        | 1 +
 tests/run-make/issue-24445/Makefile                        | 1 +
 tests/run-make/issue-25581/Makefile                        | 1 +
 tests/run-make/issue-26006/Makefile                        | 1 +
 tests/run-make/issue-28595/Makefile                        | 1 +
 tests/run-make/issue-30063/Makefile                        | 1 +
 tests/run-make/issue-36710/Makefile                        | 1 +
 tests/run-make/issue-37839/Makefile                        | 1 +
 tests/run-make/issue-37893/Makefile                        | 1 +
 tests/run-make/issue-38237/Makefile                        | 1 +
 tests/run-make/issue-46239/Makefile                        | 1 +
 tests/run-make/issue-68794-textrel-on-minimal-lib/Makefile | 1 +
 tests/run-make/issue-69368/Makefile                        | 1 +
 tests/run-make/issue-97463-abi-param-passing/Makefile      | 1 +
 tests/run-make/issue64319/Makefile                         | 1 +
 tests/run-make/libs-through-symlinks/Makefile              | 1 +
 tests/run-make/libtest-json/Makefile                       | 1 +
 tests/run-make/link-cfg/Makefile                           | 1 +
 tests/run-make/link-path-order/Makefile                    | 1 +
 tests/run-make/linkage-attr-on-static/Makefile             | 1 +
 tests/run-make/long-linker-command-lines-cmd-exe/Makefile  | 1 +
 tests/run-make/long-linker-command-lines/Makefile          | 1 +
 tests/run-make/longjmp-across-rust/Makefile                | 1 +
 tests/run-make/ls-metadata/Makefile                        | 1 +
 tests/run-make/lto-dylib-dep/Makefile                      | 1 +
 tests/run-make/lto-empty/Makefile                          | 1 +
 tests/run-make/lto-no-link-whole-rlib/Makefile             | 1 +
 tests/run-make/lto-readonly-lib/Makefile                   | 1 +
 tests/run-make/lto-smoke-c/Makefile                        | 1 +
 tests/run-make/lto-smoke/Makefile                          | 1 +
 tests/run-make/manual-link/Makefile                        | 1 +
 tests/run-make/metadata-flag-frobs-symbols/Makefile        | 1 +
 tests/run-make/mixing-deps/Makefile                        | 1 +
 tests/run-make/mixing-formats/Makefile                     | 1 +
 tests/run-make/mixing-libs/Makefile                        | 1 +
 tests/run-make/msvc-opt-minsize/Makefile                   | 1 +
 tests/run-make/no-duplicate-libs/Makefile                  | 1 +
 tests/run-make/no-intermediate-extras/Makefile             | 1 +
 tests/run-make/obey-crate-type-flag/Makefile               | 1 +
 tests/run-make/output-filename-overwrites-input/Makefile   | 1 +
 tests/run-make/output-type-permutations/Makefile           | 1 +
 tests/run-make/output-with-hyphens/Makefile                | 1 +
 tests/run-make/override-aliased-flags/Makefile             | 1 +
 tests/run-make/pass-non-c-like-enum-to-c/Makefile          | 1 +
 tests/run-make/prefer-dylib/Makefile                       | 1 +
 tests/run-make/prefer-rlib/Makefile                        | 1 +
 tests/run-make/prune-link-args/Makefile                    | 1 +
 tests/run-make/redundant-libs/Makefile                     | 1 +
 tests/run-make/relocation-model/Makefile                   | 1 +
 tests/run-make/relro-levels/Makefile                       | 1 +
 tests/run-make/reproducible-build-2/Makefile               | 1 +
 tests/run-make/reproducible-build/Makefile                 | 1 +
 tests/run-make/return-non-c-like-enum-from-c/Makefile      | 1 +
 tests/run-make/return-non-c-like-enum/Makefile             | 1 +
 tests/run-make/rlib-chain/Makefile                         | 1 +
 tests/run-make/rustdoc-scrape-examples-macros/Makefile     | 1 +
 tests/run-make/separate-link/Makefile                      | 1 +
 tests/run-make/share-generics-dylib/Makefile               | 1 +
 tests/run-make/simple-dylib/Makefile                       | 1 +
 tests/run-make/simple-rlib/Makefile                        | 1 +
 tests/run-make/split-debuginfo/Makefile                    | 1 +
 tests/run-make/static-dylib-by-default/Makefile            | 1 +
 tests/run-make/static-extern-type/Makefile                 | 1 +
 tests/run-make/static-unwinding/Makefile                   | 1 +
 tests/run-make/std-core-cycle/Makefile                     | 1 +
 tests/run-make/suspicious-library/Makefile                 | 1 +
 tests/run-make/symbol-visibility/Makefile                  | 1 +
 tests/run-make/symlinked-extern/Makefile                   | 1 +
 tests/run-make/symlinked-libraries/Makefile                | 1 +
 tests/run-make/symlinked-rlib/Makefile                     | 1 +
 tests/run-make/test-harness/Makefile                       | 1 +
 tests/run-make/volatile-intrinsics/Makefile                | 1 +
 tests/run-make/windows-subsystem/Makefile                  | 1 +
 126 files changed, 127 insertions(+)

diff --git a/tests/run-make/a-b-a-linker-guard/Makefile b/tests/run-make/a-b-a-linker-guard/Makefile
index adc9e3d091609..43282eae09c59 100644
--- a/tests/run-make/a-b-a-linker-guard/Makefile
+++ b/tests/run-make/a-b-a-linker-guard/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 # Test that if we build `b` against a version of `a` that has one set
diff --git a/tests/run-make/allow-non-lint-warnings-cmdline/Makefile b/tests/run-make/allow-non-lint-warnings-cmdline/Makefile
index 60d9c7c374590..78b9a7b989895 100644
--- a/tests/run-make/allow-non-lint-warnings-cmdline/Makefile
+++ b/tests/run-make/allow-non-lint-warnings-cmdline/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 # Test that -A warnings makes the 'empty trait list for derive' warning go away
diff --git a/tests/run-make/allow-warnings-cmdline-stability/Makefile b/tests/run-make/allow-warnings-cmdline-stability/Makefile
index 1ce8d0ec28417..368a39af6bfe2 100644
--- a/tests/run-make/allow-warnings-cmdline-stability/Makefile
+++ b/tests/run-make/allow-warnings-cmdline-stability/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 # Test that -A warnings makes the 'empty trait list for derive' warning go away
diff --git a/tests/run-make/archive-duplicate-names/Makefile b/tests/run-make/archive-duplicate-names/Makefile
index bbdcd2a34fe04..5433a42d25286 100644
--- a/tests/run-make/archive-duplicate-names/Makefile
+++ b/tests/run-make/archive-duplicate-names/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:
diff --git a/tests/run-make/arguments-non-c-like-enum/Makefile b/tests/run-make/arguments-non-c-like-enum/Makefile
index 513311c828946..0c8d8bf3acc60 100644
--- a/tests/run-make/arguments-non-c-like-enum/Makefile
+++ b/tests/run-make/arguments-non-c-like-enum/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:
diff --git a/tests/run-make/bare-outfile/Makefile b/tests/run-make/bare-outfile/Makefile
index 858466e942b15..23b619ea0ba32 100644
--- a/tests/run-make/bare-outfile/Makefile
+++ b/tests/run-make/bare-outfile/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:
diff --git a/tests/run-make/c-dynamic-dylib/Makefile b/tests/run-make/c-dynamic-dylib/Makefile
index ac68778922d6d..b5bfbc7653911 100644
--- a/tests/run-make/c-dynamic-dylib/Makefile
+++ b/tests/run-make/c-dynamic-dylib/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 # ignore-macos
diff --git a/tests/run-make/c-dynamic-rlib/Makefile b/tests/run-make/c-dynamic-rlib/Makefile
index c65d648b92957..0475bd8acae5a 100644
--- a/tests/run-make/c-dynamic-rlib/Makefile
+++ b/tests/run-make/c-dynamic-rlib/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 # ignore-macos
diff --git a/tests/run-make/c-link-to-rust-dylib/Makefile b/tests/run-make/c-link-to-rust-dylib/Makefile
index 2a371b54541e5..2763cb6ed1d73 100644
--- a/tests/run-make/c-link-to-rust-dylib/Makefile
+++ b/tests/run-make/c-link-to-rust-dylib/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all: $(TMPDIR)/$(call BIN,bar)
diff --git a/tests/run-make/c-link-to-rust-staticlib/Makefile b/tests/run-make/c-link-to-rust-staticlib/Makefile
index d38bcef309a76..e14775f5c181c 100644
--- a/tests/run-make/c-link-to-rust-staticlib/Makefile
+++ b/tests/run-make/c-link-to-rust-staticlib/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 # ignore-freebsd
diff --git a/tests/run-make/c-link-to-rust-va-list-fn/Makefile b/tests/run-make/c-link-to-rust-va-list-fn/Makefile
index 9ce2a34e677b3..596c0fce3ceae 100644
--- a/tests/run-make/c-link-to-rust-va-list-fn/Makefile
+++ b/tests/run-make/c-link-to-rust-va-list-fn/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:
diff --git a/tests/run-make/c-static-dylib/Makefile b/tests/run-make/c-static-dylib/Makefile
index 5b78005e3ee35..4e23edb6c57a4 100644
--- a/tests/run-make/c-static-dylib/Makefile
+++ b/tests/run-make/c-static-dylib/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all: $(call NATIVE_STATICLIB,cfoo)
diff --git a/tests/run-make/c-static-rlib/Makefile b/tests/run-make/c-static-rlib/Makefile
index 11a3cf1940c64..4e351127cb67c 100644
--- a/tests/run-make/c-static-rlib/Makefile
+++ b/tests/run-make/c-static-rlib/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all: $(call NATIVE_STATICLIB,cfoo)
diff --git a/tests/run-make/c-unwind-abi-catch-lib-panic/Makefile b/tests/run-make/c-unwind-abi-catch-lib-panic/Makefile
index 134f000d4535b..9c41a5a717e75 100644
--- a/tests/run-make/c-unwind-abi-catch-lib-panic/Makefile
+++ b/tests/run-make/c-unwind-abi-catch-lib-panic/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all: archive
diff --git a/tests/run-make/c-unwind-abi-catch-panic/Makefile b/tests/run-make/c-unwind-abi-catch-panic/Makefile
index e93ec99da2a57..4398ac2ee24c4 100644
--- a/tests/run-make/c-unwind-abi-catch-panic/Makefile
+++ b/tests/run-make/c-unwind-abi-catch-panic/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all: $(call NATIVE_STATICLIB,add)
diff --git a/tests/run-make/cdylib-dylib-linkage/Makefile b/tests/run-make/cdylib-dylib-linkage/Makefile
index 5c9b2d1bb2f1e..51fbfef2d85f7 100644
--- a/tests/run-make/cdylib-dylib-linkage/Makefile
+++ b/tests/run-make/cdylib-dylib-linkage/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 TARGET_SYSROOT := $(shell $(RUSTC) --print sysroot)/lib/rustlib/$(TARGET)/lib
diff --git a/tests/run-make/cdylib-fewer-symbols/Makefile b/tests/run-make/cdylib-fewer-symbols/Makefile
index 324791af8dee5..4e08f979c36b4 100644
--- a/tests/run-make/cdylib-fewer-symbols/Makefile
+++ b/tests/run-make/cdylib-fewer-symbols/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 # Test that allocator-related symbols don't show up as exported from a cdylib as
 # they're internal to Rust and not part of the public ABI.
 
diff --git a/tests/run-make/cdylib/Makefile b/tests/run-make/cdylib/Makefile
index 47ec762b3e94c..3c8b526955452 100644
--- a/tests/run-make/cdylib/Makefile
+++ b/tests/run-make/cdylib/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all: $(call RUN_BINFILE,foo)
diff --git a/tests/run-make/codegen-options-parsing/Makefile b/tests/run-make/codegen-options-parsing/Makefile
index b063593c9d97a..56bb900b7d8e8 100644
--- a/tests/run-make/codegen-options-parsing/Makefile
+++ b/tests/run-make/codegen-options-parsing/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:
diff --git a/tests/run-make/compile-stdin/Makefile b/tests/run-make/compile-stdin/Makefile
index be15548690fb5..2a495281c247f 100644
--- a/tests/run-make/compile-stdin/Makefile
+++ b/tests/run-make/compile-stdin/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:
diff --git a/tests/run-make/crate-hash-rustc-version/Makefile b/tests/run-make/crate-hash-rustc-version/Makefile
index cd5950e2bb340..f1d2a36041045 100644
--- a/tests/run-make/crate-hash-rustc-version/Makefile
+++ b/tests/run-make/crate-hash-rustc-version/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 # Ensure that crates compiled with different rustc versions cannot
diff --git a/tests/run-make/crate-name-priority/Makefile b/tests/run-make/crate-name-priority/Makefile
index 08a07c325e310..4adaa75a71cf6 100644
--- a/tests/run-make/crate-name-priority/Makefile
+++ b/tests/run-make/crate-name-priority/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:
diff --git a/tests/run-make/debug-assertions/Makefile b/tests/run-make/debug-assertions/Makefile
index 73beb4b03ae10..e83337c597f5b 100644
--- a/tests/run-make/debug-assertions/Makefile
+++ b/tests/run-make/debug-assertions/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:
diff --git a/tests/run-make/doctests-keep-binaries/Makefile b/tests/run-make/doctests-keep-binaries/Makefile
index 7bfff690b1f0e..6254e93d3334f 100644
--- a/tests/run-make/doctests-keep-binaries/Makefile
+++ b/tests/run-make/doctests-keep-binaries/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 # Check that valid binaries are persisted by running them, regardless of whether the --run or --no-run option is used.
diff --git a/tests/run-make/dylib-chain/Makefile b/tests/run-make/dylib-chain/Makefile
index 1139822f4ea91..f1fea99c5ee91 100644
--- a/tests/run-make/dylib-chain/Makefile
+++ b/tests/run-make/dylib-chain/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:
diff --git a/tests/run-make/emit/Makefile b/tests/run-make/emit/Makefile
index 78e68bd61114f..b3ca0b79fb0cf 100644
--- a/tests/run-make/emit/Makefile
+++ b/tests/run-make/emit/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:
diff --git a/tests/run-make/exit-code/Makefile b/tests/run-make/exit-code/Makefile
index 3ffaafe90657c..6458b71688fff 100644
--- a/tests/run-make/exit-code/Makefile
+++ b/tests/run-make/exit-code/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:
diff --git a/tests/run-make/extern-diff-internal-name/Makefile b/tests/run-make/extern-diff-internal-name/Makefile
index 54596c2f029e1..250f82dfac08e 100644
--- a/tests/run-make/extern-diff-internal-name/Makefile
+++ b/tests/run-make/extern-diff-internal-name/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:
diff --git a/tests/run-make/extern-flag-disambiguates/Makefile b/tests/run-make/extern-flag-disambiguates/Makefile
index a8f142a6402e2..e54a537ecd062 100644
--- a/tests/run-make/extern-flag-disambiguates/Makefile
+++ b/tests/run-make/extern-flag-disambiguates/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 # Attempt to build this dependency tree:
diff --git a/tests/run-make/extern-flag-fun/Makefile b/tests/run-make/extern-flag-fun/Makefile
index a0b7c15edb9a5..687cdfd76755b 100644
--- a/tests/run-make/extern-flag-fun/Makefile
+++ b/tests/run-make/extern-flag-fun/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:
diff --git a/tests/run-make/extern-flag-pathless/Makefile b/tests/run-make/extern-flag-pathless/Makefile
index 0f23815b6505b..701bfcd28c8a8 100644
--- a/tests/run-make/extern-flag-pathless/Makefile
+++ b/tests/run-make/extern-flag-pathless/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 # Test mixing pathless --extern with paths.
diff --git a/tests/run-make/extern-fn-generic/Makefile b/tests/run-make/extern-fn-generic/Makefile
index 71746fb10cbf4..7dceea6cb887c 100644
--- a/tests/run-make/extern-fn-generic/Makefile
+++ b/tests/run-make/extern-fn-generic/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all: $(call NATIVE_STATICLIB,test)
diff --git a/tests/run-make/extern-fn-mangle/Makefile b/tests/run-make/extern-fn-mangle/Makefile
index 4f5d026f213f2..3cbbf3839969f 100644
--- a/tests/run-make/extern-fn-mangle/Makefile
+++ b/tests/run-make/extern-fn-mangle/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all: $(call NATIVE_STATICLIB,test)
diff --git a/tests/run-make/extern-fn-reachable/Makefile b/tests/run-make/extern-fn-reachable/Makefile
index 05bdb8d65b7bf..3297251bfd1aa 100644
--- a/tests/run-make/extern-fn-reachable/Makefile
+++ b/tests/run-make/extern-fn-reachable/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 # ignore-windows-msvc
diff --git a/tests/run-make/extern-fn-struct-passing-abi/Makefile b/tests/run-make/extern-fn-struct-passing-abi/Makefile
index 4f5d026f213f2..3cbbf3839969f 100644
--- a/tests/run-make/extern-fn-struct-passing-abi/Makefile
+++ b/tests/run-make/extern-fn-struct-passing-abi/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all: $(call NATIVE_STATICLIB,test)
diff --git a/tests/run-make/extern-fn-with-extern-types/Makefile b/tests/run-make/extern-fn-with-extern-types/Makefile
index 1fa708950d436..07ec503aaaea5 100644
--- a/tests/run-make/extern-fn-with-extern-types/Makefile
+++ b/tests/run-make/extern-fn-with-extern-types/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all: $(call NATIVE_STATICLIB,ctest)
diff --git a/tests/run-make/extern-fn-with-packed-struct/Makefile b/tests/run-make/extern-fn-with-packed-struct/Makefile
index 4f5d026f213f2..3cbbf3839969f 100644
--- a/tests/run-make/extern-fn-with-packed-struct/Makefile
+++ b/tests/run-make/extern-fn-with-packed-struct/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all: $(call NATIVE_STATICLIB,test)
diff --git a/tests/run-make/extern-fn-with-union/Makefile b/tests/run-make/extern-fn-with-union/Makefile
index 40bae923e30b9..e6c8c9936791b 100644
--- a/tests/run-make/extern-fn-with-union/Makefile
+++ b/tests/run-make/extern-fn-with-union/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all: $(call NATIVE_STATICLIB,ctest)
diff --git a/tests/run-make/extern-multiple-copies/Makefile b/tests/run-make/extern-multiple-copies/Makefile
index 00668a6bc88c2..b0b84278edac3 100644
--- a/tests/run-make/extern-multiple-copies/Makefile
+++ b/tests/run-make/extern-multiple-copies/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:
diff --git a/tests/run-make/extern-multiple-copies2/Makefile b/tests/run-make/extern-multiple-copies2/Makefile
index 84de2ebf34dfc..708b1c1b5409f 100644
--- a/tests/run-make/extern-multiple-copies2/Makefile
+++ b/tests/run-make/extern-multiple-copies2/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:
diff --git a/tests/run-make/extern-overrides-distribution/Makefile b/tests/run-make/extern-overrides-distribution/Makefile
index c57b062cd5dd1..bfd0dd6991ba7 100644
--- a/tests/run-make/extern-overrides-distribution/Makefile
+++ b/tests/run-make/extern-overrides-distribution/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:
diff --git a/tests/run-make/extra-filename-with-temp-outputs/Makefile b/tests/run-make/extra-filename-with-temp-outputs/Makefile
index 470448cf50c57..64745bef5b869 100644
--- a/tests/run-make/extra-filename-with-temp-outputs/Makefile
+++ b/tests/run-make/extra-filename-with-temp-outputs/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:
diff --git a/tests/run-make/foreign-double-unwind/Makefile b/tests/run-make/foreign-double-unwind/Makefile
index ea2fe9ff881bc..f20fe3ce66e82 100644
--- a/tests/run-make/foreign-double-unwind/Makefile
+++ b/tests/run-make/foreign-double-unwind/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all: foo
diff --git a/tests/run-make/foreign-exceptions/Makefile b/tests/run-make/foreign-exceptions/Makefile
index 38fe2773df2e7..a8e20ffb1f498 100644
--- a/tests/run-make/foreign-exceptions/Makefile
+++ b/tests/run-make/foreign-exceptions/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all: foo
diff --git a/tests/run-make/foreign-rust-exceptions/Makefile b/tests/run-make/foreign-rust-exceptions/Makefile
index 50fca7f24e616..0d007bf1c49a4 100644
--- a/tests/run-make/foreign-rust-exceptions/Makefile
+++ b/tests/run-make/foreign-rust-exceptions/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 # ignore-i686-pc-windows-gnu
 
 # This test doesn't work on 32-bit MinGW as cdylib has its own copy of unwinder
diff --git a/tests/run-make/fpic/Makefile b/tests/run-make/fpic/Makefile
index 5986de3666f71..c38dd8d6e8c4b 100644
--- a/tests/run-make/fpic/Makefile
+++ b/tests/run-make/fpic/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 # ignore-windows
diff --git a/tests/run-make/glibc-staticlib-args/Makefile b/tests/run-make/glibc-staticlib-args/Makefile
index 39e64bacf5813..cad6c049e4594 100644
--- a/tests/run-make/glibc-staticlib-args/Makefile
+++ b/tests/run-make/glibc-staticlib-args/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 # only-gnu
 # only-linux
 
diff --git a/tests/run-make/incr-add-rust-src-component/Makefile b/tests/run-make/incr-add-rust-src-component/Makefile
index 5c1d953cc05b6..fd09c2299f98e 100644
--- a/tests/run-make/incr-add-rust-src-component/Makefile
+++ b/tests/run-make/incr-add-rust-src-component/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 # rust-lang/rust#70924: Test that if we add rust-src component in between two
diff --git a/tests/run-make/interdependent-c-libraries/Makefile b/tests/run-make/interdependent-c-libraries/Makefile
index dc5b55a99256e..53a696d82bf12 100644
--- a/tests/run-make/interdependent-c-libraries/Makefile
+++ b/tests/run-make/interdependent-c-libraries/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 # The rust crate foo will link to the native library foo, while the rust crate
diff --git a/tests/run-make/issue-11908/Makefile b/tests/run-make/issue-11908/Makefile
index 47005537e41af..38586662fc75b 100644
--- a/tests/run-make/issue-11908/Makefile
+++ b/tests/run-make/issue-11908/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 # This test ensures that if you have the same rlib or dylib at two locations
 # in the same path that you don't hit an assertion in the compiler.
 #
diff --git a/tests/run-make/issue-14500/Makefile b/tests/run-make/issue-14500/Makefile
index 52550e57018e4..eeab48de3b950 100644
--- a/tests/run-make/issue-14500/Makefile
+++ b/tests/run-make/issue-14500/Makefile
@@ -1,5 +1,7 @@
 include ../tools.mk
 
+# ignore-cross-compile
+
 # Test to make sure that reachable extern fns are always available in final
 # productcs, including when LTO is used. In this test, the `foo` crate has a
 # reahable symbol, and is a dependency of the `bar` crate. When the `bar` crate
diff --git a/tests/run-make/issue-15460/Makefile b/tests/run-make/issue-15460/Makefile
index 1648d0c0c9b84..a36a085fa6f18 100644
--- a/tests/run-make/issue-15460/Makefile
+++ b/tests/run-make/issue-15460/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all: $(call NATIVE_STATICLIB,foo)
diff --git a/tests/run-make/issue-20626/Makefile b/tests/run-make/issue-20626/Makefile
index f76f31e794af1..63eee910a9c3a 100644
--- a/tests/run-make/issue-20626/Makefile
+++ b/tests/run-make/issue-20626/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 # Test output to be four
diff --git a/tests/run-make/issue-22131/Makefile b/tests/run-make/issue-22131/Makefile
index 770f4b04ec358..4f33a4659cc1e 100644
--- a/tests/run-make/issue-22131/Makefile
+++ b/tests/run-make/issue-22131/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all: foo.rs
diff --git a/tests/run-make/issue-24445/Makefile b/tests/run-make/issue-24445/Makefile
index 2a12226a6c037..a13910aa73ed0 100644
--- a/tests/run-make/issue-24445/Makefile
+++ b/tests/run-make/issue-24445/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 # only-linux
diff --git a/tests/run-make/issue-25581/Makefile b/tests/run-make/issue-25581/Makefile
index 4f5d026f213f2..3cbbf3839969f 100644
--- a/tests/run-make/issue-25581/Makefile
+++ b/tests/run-make/issue-25581/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all: $(call NATIVE_STATICLIB,test)
diff --git a/tests/run-make/issue-26006/Makefile b/tests/run-make/issue-26006/Makefile
index 0ff0730200250..b679c121530ad 100644
--- a/tests/run-make/issue-26006/Makefile
+++ b/tests/run-make/issue-26006/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 # ignore-windows
diff --git a/tests/run-make/issue-28595/Makefile b/tests/run-make/issue-28595/Makefile
index 30a1d9c560a96..258f9788aafa7 100644
--- a/tests/run-make/issue-28595/Makefile
+++ b/tests/run-make/issue-28595/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all: $(call NATIVE_STATICLIB,a) $(call NATIVE_STATICLIB,b)
diff --git a/tests/run-make/issue-30063/Makefile b/tests/run-make/issue-30063/Makefile
index e4ede598f7be8..8a69ca79f5150 100644
--- a/tests/run-make/issue-30063/Makefile
+++ b/tests/run-make/issue-30063/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:
diff --git a/tests/run-make/issue-36710/Makefile b/tests/run-make/issue-36710/Makefile
index c3de474fbbedb..7b91107a23495 100644
--- a/tests/run-make/issue-36710/Makefile
+++ b/tests/run-make/issue-36710/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 # ignore-none no-std is not supported
 # ignore-wasm32 FIXME: don't attempt to compile C++ to WASM
 # ignore-wasm64 FIXME: don't attempt to compile C++ to WASM
diff --git a/tests/run-make/issue-37839/Makefile b/tests/run-make/issue-37839/Makefile
index de50bd7137968..6bad27b7bdcd2 100644
--- a/tests/run-make/issue-37839/Makefile
+++ b/tests/run-make/issue-37839/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:
diff --git a/tests/run-make/issue-37893/Makefile b/tests/run-make/issue-37893/Makefile
index 33a60830e5d19..44e4a321a30a5 100644
--- a/tests/run-make/issue-37893/Makefile
+++ b/tests/run-make/issue-37893/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:
diff --git a/tests/run-make/issue-38237/Makefile b/tests/run-make/issue-38237/Makefile
index 75121d0401243..80dddc5bd1331 100644
--- a/tests/run-make/issue-38237/Makefile
+++ b/tests/run-make/issue-38237/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:
diff --git a/tests/run-make/issue-46239/Makefile b/tests/run-make/issue-46239/Makefile
index a93ef32129846..0006ced25156a 100644
--- a/tests/run-make/issue-46239/Makefile
+++ b/tests/run-make/issue-46239/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:
diff --git a/tests/run-make/issue-68794-textrel-on-minimal-lib/Makefile b/tests/run-make/issue-68794-textrel-on-minimal-lib/Makefile
index 13983f4ffe03a..6140b39c0e2aa 100644
--- a/tests/run-make/issue-68794-textrel-on-minimal-lib/Makefile
+++ b/tests/run-make/issue-68794-textrel-on-minimal-lib/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 # Regression test for issue #68794
 #
 # Verify that no text relocations are accidentally introduced by linking a
diff --git a/tests/run-make/issue-69368/Makefile b/tests/run-make/issue-69368/Makefile
index 41770475db04e..b1229d1b07fc7 100644
--- a/tests/run-make/issue-69368/Makefile
+++ b/tests/run-make/issue-69368/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 # Test that previously triggered a linker failure with root cause
diff --git a/tests/run-make/issue-97463-abi-param-passing/Makefile b/tests/run-make/issue-97463-abi-param-passing/Makefile
index b4ff88d1957ca..7ce7aaeec57a0 100644
--- a/tests/run-make/issue-97463-abi-param-passing/Makefile
+++ b/tests/run-make/issue-97463-abi-param-passing/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 # ignore-msvc
diff --git a/tests/run-make/issue64319/Makefile b/tests/run-make/issue64319/Makefile
index f852fdf2d059c..56346cbcc154c 100644
--- a/tests/run-make/issue64319/Makefile
+++ b/tests/run-make/issue64319/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 # Different optimization levels imply different values for `-Zshare-generics`,
diff --git a/tests/run-make/libs-through-symlinks/Makefile b/tests/run-make/libs-through-symlinks/Makefile
index 45deaecb8406a..592eae663a49a 100644
--- a/tests/run-make/libs-through-symlinks/Makefile
+++ b/tests/run-make/libs-through-symlinks/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 # ignore-windows
diff --git a/tests/run-make/libtest-json/Makefile b/tests/run-make/libtest-json/Makefile
index 37b6cb9e2d4d5..417637cf07276 100644
--- a/tests/run-make/libtest-json/Makefile
+++ b/tests/run-make/libtest-json/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 # Test expected libtest's JSON output
diff --git a/tests/run-make/link-cfg/Makefile b/tests/run-make/link-cfg/Makefile
index 0b25ccded0694..a40997011443c 100644
--- a/tests/run-make/link-cfg/Makefile
+++ b/tests/run-make/link-cfg/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all: $(call DYLIB,return1) $(call DYLIB,return2) $(call NATIVE_STATICLIB,return3)
diff --git a/tests/run-make/link-path-order/Makefile b/tests/run-make/link-path-order/Makefile
index ed7c299e61a77..a3831a63ac7e5 100644
--- a/tests/run-make/link-path-order/Makefile
+++ b/tests/run-make/link-path-order/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 # Verifies that the -L arguments given to the linker is in the same order
diff --git a/tests/run-make/linkage-attr-on-static/Makefile b/tests/run-make/linkage-attr-on-static/Makefile
index 7cc54e40a3a80..ef50a7ef9f13c 100644
--- a/tests/run-make/linkage-attr-on-static/Makefile
+++ b/tests/run-make/linkage-attr-on-static/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all: $(call NATIVE_STATICLIB,foo)
diff --git a/tests/run-make/long-linker-command-lines-cmd-exe/Makefile b/tests/run-make/long-linker-command-lines-cmd-exe/Makefile
index a38f4fe5dc596..e43aab7f8e0fd 100644
--- a/tests/run-make/long-linker-command-lines-cmd-exe/Makefile
+++ b/tests/run-make/long-linker-command-lines-cmd-exe/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:
diff --git a/tests/run-make/long-linker-command-lines/Makefile b/tests/run-make/long-linker-command-lines/Makefile
index 00199ca970d3d..f864ea74f4a95 100644
--- a/tests/run-make/long-linker-command-lines/Makefile
+++ b/tests/run-make/long-linker-command-lines/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:
diff --git a/tests/run-make/longjmp-across-rust/Makefile b/tests/run-make/longjmp-across-rust/Makefile
index 848638d82dd6e..5fd2d4f855ffe 100644
--- a/tests/run-make/longjmp-across-rust/Makefile
+++ b/tests/run-make/longjmp-across-rust/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all: $(call NATIVE_STATICLIB,foo)
diff --git a/tests/run-make/ls-metadata/Makefile b/tests/run-make/ls-metadata/Makefile
index e0f916a248e9b..123dd64e15cbd 100644
--- a/tests/run-make/ls-metadata/Makefile
+++ b/tests/run-make/ls-metadata/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:
diff --git a/tests/run-make/lto-dylib-dep/Makefile b/tests/run-make/lto-dylib-dep/Makefile
index 41487b23c748f..a9344597d081e 100644
--- a/tests/run-make/lto-dylib-dep/Makefile
+++ b/tests/run-make/lto-dylib-dep/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 # Test that we don't run into an assertion when using a Rust dylib dependency
diff --git a/tests/run-make/lto-empty/Makefile b/tests/run-make/lto-empty/Makefile
index b4345ba188321..1b795c4b73805 100644
--- a/tests/run-make/lto-empty/Makefile
+++ b/tests/run-make/lto-empty/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all: cdylib-fat cdylib-thin
diff --git a/tests/run-make/lto-no-link-whole-rlib/Makefile b/tests/run-make/lto-no-link-whole-rlib/Makefile
index e576ee37cf715..3e82322e72d34 100644
--- a/tests/run-make/lto-no-link-whole-rlib/Makefile
+++ b/tests/run-make/lto-no-link-whole-rlib/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all: $(call NATIVE_STATICLIB,foo) $(call NATIVE_STATICLIB,bar)
diff --git a/tests/run-make/lto-readonly-lib/Makefile b/tests/run-make/lto-readonly-lib/Makefile
index a20ecea88ea1c..11d944e3e3d4b 100644
--- a/tests/run-make/lto-readonly-lib/Makefile
+++ b/tests/run-make/lto-readonly-lib/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:
diff --git a/tests/run-make/lto-smoke-c/Makefile b/tests/run-make/lto-smoke-c/Makefile
index 7c6ee3be84950..f1ba3d95da292 100644
--- a/tests/run-make/lto-smoke-c/Makefile
+++ b/tests/run-make/lto-smoke-c/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 # Apparently older versions of GCC segfault if -g is passed...
diff --git a/tests/run-make/lto-smoke/Makefile b/tests/run-make/lto-smoke/Makefile
index 8bce708b44b0b..13a09fce73404 100644
--- a/tests/run-make/lto-smoke/Makefile
+++ b/tests/run-make/lto-smoke/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all: noparam bool_true bool_false thin fat
diff --git a/tests/run-make/manual-link/Makefile b/tests/run-make/manual-link/Makefile
index 401f6eb440a58..8dbf0460fff50 100644
--- a/tests/run-make/manual-link/Makefile
+++ b/tests/run-make/manual-link/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all: $(TMPDIR)/libbar.a
diff --git a/tests/run-make/metadata-flag-frobs-symbols/Makefile b/tests/run-make/metadata-flag-frobs-symbols/Makefile
index dc6b10f4e9db2..53d7d0657695f 100644
--- a/tests/run-make/metadata-flag-frobs-symbols/Makefile
+++ b/tests/run-make/metadata-flag-frobs-symbols/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:
diff --git a/tests/run-make/mixing-deps/Makefile b/tests/run-make/mixing-deps/Makefile
index 956e704ee168e..c2a5a2a0abbed 100644
--- a/tests/run-make/mixing-deps/Makefile
+++ b/tests/run-make/mixing-deps/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:
diff --git a/tests/run-make/mixing-formats/Makefile b/tests/run-make/mixing-formats/Makefile
index b27e54257f9c1..d01978a159953 100644
--- a/tests/run-make/mixing-formats/Makefile
+++ b/tests/run-make/mixing-formats/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 # Testing various mixings of rlibs and dylibs. Makes sure that it's possible to
diff --git a/tests/run-make/mixing-libs/Makefile b/tests/run-make/mixing-libs/Makefile
index 39cc0708ca1ea..e8262b284011b 100644
--- a/tests/run-make/mixing-libs/Makefile
+++ b/tests/run-make/mixing-libs/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:
diff --git a/tests/run-make/msvc-opt-minsize/Makefile b/tests/run-make/msvc-opt-minsize/Makefile
index a5f019f244e2a..32e6e28018f7a 100644
--- a/tests/run-make/msvc-opt-minsize/Makefile
+++ b/tests/run-make/msvc-opt-minsize/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:
diff --git a/tests/run-make/no-duplicate-libs/Makefile b/tests/run-make/no-duplicate-libs/Makefile
index b05aff7826e09..4be8c0262941a 100644
--- a/tests/run-make/no-duplicate-libs/Makefile
+++ b/tests/run-make/no-duplicate-libs/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 ifdef IS_MSVC
diff --git a/tests/run-make/no-intermediate-extras/Makefile b/tests/run-make/no-intermediate-extras/Makefile
index 4116aac1b8f0b..83b5cedcf2a65 100644
--- a/tests/run-make/no-intermediate-extras/Makefile
+++ b/tests/run-make/no-intermediate-extras/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 # Regression test for issue #10973
 
 include ../tools.mk
diff --git a/tests/run-make/obey-crate-type-flag/Makefile b/tests/run-make/obey-crate-type-flag/Makefile
index effcfc94cc5ee..ecbb2e620ed38 100644
--- a/tests/run-make/obey-crate-type-flag/Makefile
+++ b/tests/run-make/obey-crate-type-flag/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 # check that rustc builds all crate_type attributes
diff --git a/tests/run-make/output-filename-overwrites-input/Makefile b/tests/run-make/output-filename-overwrites-input/Makefile
index 33069c06f5ade..605b86b253ea3 100644
--- a/tests/run-make/output-filename-overwrites-input/Makefile
+++ b/tests/run-make/output-filename-overwrites-input/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:
diff --git a/tests/run-make/output-type-permutations/Makefile b/tests/run-make/output-type-permutations/Makefile
index 791606c643b14..035033b9fddd3 100644
--- a/tests/run-make/output-type-permutations/Makefile
+++ b/tests/run-make/output-type-permutations/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:
diff --git a/tests/run-make/output-with-hyphens/Makefile b/tests/run-make/output-with-hyphens/Makefile
index 365fb6e591a91..846c9a66a89a0 100644
--- a/tests/run-make/output-with-hyphens/Makefile
+++ b/tests/run-make/output-with-hyphens/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:
diff --git a/tests/run-make/override-aliased-flags/Makefile b/tests/run-make/override-aliased-flags/Makefile
index 186b8c7c85ead..db1ff1ff98161 100644
--- a/tests/run-make/override-aliased-flags/Makefile
+++ b/tests/run-make/override-aliased-flags/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 # FIXME: it would be good to check that it's actually the rightmost flags
diff --git a/tests/run-make/pass-non-c-like-enum-to-c/Makefile b/tests/run-make/pass-non-c-like-enum-to-c/Makefile
index 42d3c977f757d..bd441d321bfab 100644
--- a/tests/run-make/pass-non-c-like-enum-to-c/Makefile
+++ b/tests/run-make/pass-non-c-like-enum-to-c/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all: $(call NATIVE_STATICLIB,test)
diff --git a/tests/run-make/prefer-dylib/Makefile b/tests/run-make/prefer-dylib/Makefile
index 3817ca195eb2d..cc26e70ae67ca 100644
--- a/tests/run-make/prefer-dylib/Makefile
+++ b/tests/run-make/prefer-dylib/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:
diff --git a/tests/run-make/prefer-rlib/Makefile b/tests/run-make/prefer-rlib/Makefile
index adc345d760da5..2e86b9c1dd7e0 100644
--- a/tests/run-make/prefer-rlib/Makefile
+++ b/tests/run-make/prefer-rlib/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:
diff --git a/tests/run-make/prune-link-args/Makefile b/tests/run-make/prune-link-args/Makefile
index a359dc5aef102..c21ba6ace38d6 100644
--- a/tests/run-make/prune-link-args/Makefile
+++ b/tests/run-make/prune-link-args/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 # ignore-windows
diff --git a/tests/run-make/redundant-libs/Makefile b/tests/run-make/redundant-libs/Makefile
index b2dff05d1639a..0a48b2b280136 100644
--- a/tests/run-make/redundant-libs/Makefile
+++ b/tests/run-make/redundant-libs/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 # ignore-windows-msvc
diff --git a/tests/run-make/relocation-model/Makefile b/tests/run-make/relocation-model/Makefile
index a31dbfd916772..8cc5205ed51b4 100644
--- a/tests/run-make/relocation-model/Makefile
+++ b/tests/run-make/relocation-model/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all: others
diff --git a/tests/run-make/relro-levels/Makefile b/tests/run-make/relro-levels/Makefile
index 6176fc1a58954..e0402f59f12dd 100644
--- a/tests/run-make/relro-levels/Makefile
+++ b/tests/run-make/relro-levels/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 # only-linux
diff --git a/tests/run-make/reproducible-build-2/Makefile b/tests/run-make/reproducible-build-2/Makefile
index 1df5e102ce36c..68fcac8b47f5f 100644
--- a/tests/run-make/reproducible-build-2/Makefile
+++ b/tests/run-make/reproducible-build-2/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 # ignore-musl
diff --git a/tests/run-make/reproducible-build/Makefile b/tests/run-make/reproducible-build/Makefile
index 642a480815b7b..f5d17a234c0ac 100644
--- a/tests/run-make/reproducible-build/Makefile
+++ b/tests/run-make/reproducible-build/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 # ignore-musl
diff --git a/tests/run-make/return-non-c-like-enum-from-c/Makefile b/tests/run-make/return-non-c-like-enum-from-c/Makefile
index 42d3c977f757d..bd441d321bfab 100644
--- a/tests/run-make/return-non-c-like-enum-from-c/Makefile
+++ b/tests/run-make/return-non-c-like-enum-from-c/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all: $(call NATIVE_STATICLIB,test)
diff --git a/tests/run-make/return-non-c-like-enum/Makefile b/tests/run-make/return-non-c-like-enum/Makefile
index 513311c828946..0c8d8bf3acc60 100644
--- a/tests/run-make/return-non-c-like-enum/Makefile
+++ b/tests/run-make/return-non-c-like-enum/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:
diff --git a/tests/run-make/rlib-chain/Makefile b/tests/run-make/rlib-chain/Makefile
index 236943a2a3b35..7a1f887fa5271 100644
--- a/tests/run-make/rlib-chain/Makefile
+++ b/tests/run-make/rlib-chain/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:
diff --git a/tests/run-make/rustdoc-scrape-examples-macros/Makefile b/tests/run-make/rustdoc-scrape-examples-macros/Makefile
index 3cc6dcac366c2..edc19d8cb5de4 100644
--- a/tests/run-make/rustdoc-scrape-examples-macros/Makefile
+++ b/tests/run-make/rustdoc-scrape-examples-macros/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../../run-make/tools.mk
 
 OUTPUT_DIR := "$(TMPDIR)/rustdoc"
diff --git a/tests/run-make/separate-link/Makefile b/tests/run-make/separate-link/Makefile
index 3ccdb6275d158..d01158d9f5fb0 100644
--- a/tests/run-make/separate-link/Makefile
+++ b/tests/run-make/separate-link/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:
diff --git a/tests/run-make/share-generics-dylib/Makefile b/tests/run-make/share-generics-dylib/Makefile
index 5fea91bb4c264..9d97eca80d3f5 100644
--- a/tests/run-make/share-generics-dylib/Makefile
+++ b/tests/run-make/share-generics-dylib/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 # This test makes sure all generic instances get re-exported from Rust dylibs for use by
 # `-Zshare-generics`. There are two rlibs (`instance_provider_a` and `instance_provider_b`)
 # which both provide an instance of `Cell<i32>::set`. There is `instance_user_dylib` which is
diff --git a/tests/run-make/simple-dylib/Makefile b/tests/run-make/simple-dylib/Makefile
index 5dda5d66d1c84..f3e1c1da88cec 100644
--- a/tests/run-make/simple-dylib/Makefile
+++ b/tests/run-make/simple-dylib/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 all:
 	$(RUSTC) bar.rs --crate-type=dylib -C prefer-dynamic
diff --git a/tests/run-make/simple-rlib/Makefile b/tests/run-make/simple-rlib/Makefile
index d912b8a7bab1f..28df61a15478d 100644
--- a/tests/run-make/simple-rlib/Makefile
+++ b/tests/run-make/simple-rlib/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 all:
 	$(RUSTC) bar.rs --crate-type=rlib
diff --git a/tests/run-make/split-debuginfo/Makefile b/tests/run-make/split-debuginfo/Makefile
index 44cda0d3d117f..71e014c1f7147 100644
--- a/tests/run-make/split-debuginfo/Makefile
+++ b/tests/run-make/split-debuginfo/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all: off packed unpacked
diff --git a/tests/run-make/static-dylib-by-default/Makefile b/tests/run-make/static-dylib-by-default/Makefile
index eedd0b320920a..cdaab42d06c5c 100644
--- a/tests/run-make/static-dylib-by-default/Makefile
+++ b/tests/run-make/static-dylib-by-default/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 TO_LINK := $(call DYLIB,bar)
diff --git a/tests/run-make/static-extern-type/Makefile b/tests/run-make/static-extern-type/Makefile
index e9aa95e63a05f..778971543221e 100644
--- a/tests/run-make/static-extern-type/Makefile
+++ b/tests/run-make/static-extern-type/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all: $(call NATIVE_STATICLIB,define-foo)
diff --git a/tests/run-make/static-unwinding/Makefile b/tests/run-make/static-unwinding/Makefile
index 9c755d4ab1819..dec94fb16f408 100644
--- a/tests/run-make/static-unwinding/Makefile
+++ b/tests/run-make/static-unwinding/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:
diff --git a/tests/run-make/std-core-cycle/Makefile b/tests/run-make/std-core-cycle/Makefile
index 4f25286376790..5ed6be905dffa 100644
--- a/tests/run-make/std-core-cycle/Makefile
+++ b/tests/run-make/std-core-cycle/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 ifeq ($(UNAME),Darwin)
diff --git a/tests/run-make/suspicious-library/Makefile b/tests/run-make/suspicious-library/Makefile
index 2af9e85c228fd..3b5ab3c53a564 100644
--- a/tests/run-make/suspicious-library/Makefile
+++ b/tests/run-make/suspicious-library/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:
diff --git a/tests/run-make/symbol-visibility/Makefile b/tests/run-make/symbol-visibility/Makefile
index 17052ef4e6346..9159af214ca7b 100644
--- a/tests/run-make/symbol-visibility/Makefile
+++ b/tests/run-make/symbol-visibility/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 # ignore-windows-msvc
diff --git a/tests/run-make/symlinked-extern/Makefile b/tests/run-make/symlinked-extern/Makefile
index 058f43e857a2b..28c764b84e8b7 100644
--- a/tests/run-make/symlinked-extern/Makefile
+++ b/tests/run-make/symlinked-extern/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 # ignore-windows
diff --git a/tests/run-make/symlinked-libraries/Makefile b/tests/run-make/symlinked-libraries/Makefile
index 576bf7e54bed8..fb0b6127e6f5c 100644
--- a/tests/run-make/symlinked-libraries/Makefile
+++ b/tests/run-make/symlinked-libraries/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 # ignore-windows
diff --git a/tests/run-make/symlinked-rlib/Makefile b/tests/run-make/symlinked-rlib/Makefile
index 49d3f220a353f..a8565f683c3e8 100644
--- a/tests/run-make/symlinked-rlib/Makefile
+++ b/tests/run-make/symlinked-rlib/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 # ignore-windows
diff --git a/tests/run-make/test-harness/Makefile b/tests/run-make/test-harness/Makefile
index 1fe059b07d2a0..ee8c9294f91ab 100644
--- a/tests/run-make/test-harness/Makefile
+++ b/tests/run-make/test-harness/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:
diff --git a/tests/run-make/volatile-intrinsics/Makefile b/tests/run-make/volatile-intrinsics/Makefile
index 2a78c7b9cfe17..5672a045873dd 100644
--- a/tests/run-make/volatile-intrinsics/Makefile
+++ b/tests/run-make/volatile-intrinsics/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:
diff --git a/tests/run-make/windows-subsystem/Makefile b/tests/run-make/windows-subsystem/Makefile
index 78c4e2ac1e875..e3cf9181de418 100644
--- a/tests/run-make/windows-subsystem/Makefile
+++ b/tests/run-make/windows-subsystem/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all: