934 files changed, 1604 insertions, 339 deletions

diff --git a/tests/codegen/vec-in-place.rs b/tests/codegen/vec-in-place.rs
index 9992604221b..d68067ceb19 100644
--- a/tests/codegen/vec-in-place.rs
+++ b/tests/codegen/vec-in-place.rs
@@ -1,11 +1,13 @@
 // ignore-debug: the debug assertions get in the way
 // compile-flags: -O -Z merge-functions=disabled
+// min-llvm-version: 16
 #![crate_type = "lib"]
 
 // Ensure that trivial casts of vec elements are O(1)
 
 pub struct Wrapper<T>(T);
 
+// previously repr(C) caused the optimization to fail
 #[repr(C)]
 pub struct Foo {
     a: u64,
@@ -14,9 +16,8 @@ pub struct Foo {
     d: u64,
 }
 
-// Going from an aggregate struct to another type currently requires Copy to
-// enable the TrustedRandomAccess specialization. Without it optimizations do not yet
-// reliably recognize the loops as noop for repr(C) or non-Copy structs.
+// implementing Copy exercises the TrustedRandomAccess specialization inside the in-place
+// specialization
 #[derive(Copy, Clone)]
 pub struct Bar {
     a: u64,
@@ -25,6 +26,14 @@ pub struct Bar {
     d: u64,
 }
 
+// this exercises the try-fold codepath
+pub struct Baz {
+    a: u64,
+    b: u64,
+    c: u64,
+    d: u64,
+}
+
 // CHECK-LABEL: @vec_iterator_cast_primitive
 #[no_mangle]
 pub fn vec_iterator_cast_primitive(vec: Vec<i8>) -> Vec<u8> {
@@ -52,18 +61,29 @@ pub fn vec_iterator_cast_unwrap(vec: Vec<Wrapper<u8>>) -> Vec<u8> {
 // CHECK-LABEL: @vec_iterator_cast_aggregate
 #[no_mangle]
 pub fn vec_iterator_cast_aggregate(vec: Vec<[u64; 4]>) -> Vec<Foo> {
-    // FIXME These checks should be the same as other functions.
-    // CHECK-NOT: @__rust_alloc
-    // CHECK-NOT: @__rust_alloc
+    // CHECK-NOT: loop
+    // CHECK-NOT: call
     vec.into_iter().map(|e| unsafe { std::mem::transmute(e) }).collect()
 }
 
-// CHECK-LABEL: @vec_iterator_cast_deaggregate
+// CHECK-LABEL: @vec_iterator_cast_deaggregate_tra
 #[no_mangle]
-pub fn vec_iterator_cast_deaggregate(vec: Vec<Bar>) -> Vec<[u64; 4]> {
-    // FIXME These checks should be the same as other functions.
-    // CHECK-NOT: @__rust_alloc
-    // CHECK-NOT: @__rust_alloc
+pub fn vec_iterator_cast_deaggregate_tra(vec: Vec<Bar>) -> Vec<[u64; 4]> {
+    // CHECK-NOT: loop
+    // CHECK-NOT: call
+
+    // Safety: For the purpose of this test we assume that Bar layout matches [u64; 4].
+    // This currently is not guaranteed for repr(Rust) types, but it happens to work here and
+    // the UCG may add additional guarantees for homogenous types in the future that would make this
+    // correct.
+    vec.into_iter().map(|e| unsafe { std::mem::transmute(e) }).collect()
+}
+
+// CHECK-LABEL: @vec_iterator_cast_deaggregate_fold
+#[no_mangle]
+pub fn vec_iterator_cast_deaggregate_fold(vec: Vec<Baz>) -> Vec<[u64; 4]> {
+    // CHECK-NOT: loop
+    // CHECK-NOT: call
 
     // Safety: For the purpose of this test we assume that Bar layout matches [u64; 4].
     // This currently is not guaranteed for repr(Rust) types, but it happens to work here and
diff --git a/tests/run-make-fulldeps/hotplug_codegen_backend/Makefile b/tests/run-make-fulldeps/hotplug_codegen_backend/Makefile
index 4cda243ffb5..6752091e699 100644
--- a/tests/run-make-fulldeps/hotplug_codegen_backend/Makefile
+++ b/tests/run-make-fulldeps/hotplug_codegen_backend/Makefile
@@ -1,4 +1,4 @@
-include ../tools.mk
+include ../../run-make/tools.mk
 
 # ignore-stage1
 
diff --git a/tests/run-make-fulldeps/issue-19371/Makefile b/tests/run-make-fulldeps/issue-19371/Makefile
index 994e50801c8..edec68f0862 100644
--- a/tests/run-make-fulldeps/issue-19371/Makefile
+++ b/tests/run-make-fulldeps/issue-19371/Makefile
@@ -1,4 +1,4 @@
-include ../tools.mk
+include ../../run-make/tools.mk
 
 # This test ensures that rustc compile_input can be called twice in one task
 # without causing a panic.
diff --git a/tests/run-make-fulldeps/issue-25581/Makefile b/tests/run-make-fulldeps/issue-25581/Makefile
deleted file mode 100644
index 4f5d026f213..00000000000
--- a/tests/run-make-fulldeps/issue-25581/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-include ../tools.mk
-
-all: $(call NATIVE_STATICLIB,test)
-	$(RUSTC) test.rs
-	$(call RUN,test) || exit 1
diff --git a/tests/run-make-fulldeps/obtain-borrowck/Makefile b/tests/run-make-fulldeps/obtain-borrowck/Makefile
index 212d0f67d00..233f5c9eaf4 100644
--- a/tests/run-make-fulldeps/obtain-borrowck/Makefile
+++ b/tests/run-make-fulldeps/obtain-borrowck/Makefile
@@ -1,4 +1,4 @@
-include ../tools.mk
+include ../../run-make/tools.mk
 
 # This example shows how to implement a rustc driver that retrieves MIR bodies
 # together with the borrow checker information.
diff --git a/tests/run-make-fulldeps/pretty-expanded/Makefile b/tests/run-make-fulldeps/pretty-expanded/Makefile
index 5a0097a8351..48199179ece 100644
--- a/tests/run-make-fulldeps/pretty-expanded/Makefile
+++ b/tests/run-make-fulldeps/pretty-expanded/Makefile
@@ -1,4 +1,4 @@
-include ../tools.mk
+include ../../run-make/tools.mk
 
 all:
 	$(RUSTC) -o $(TMPDIR)/input.expanded.rs -Zunpretty=expanded input.rs
diff --git a/tests/run-make-fulldeps/a-b-a-linker-guard/Makefile b/tests/run-make/a-b-a-linker-guard/Makefile
index adc9e3d0916..43282eae09c 100644
--- a/tests/run-make-fulldeps/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-fulldeps/a-b-a-linker-guard/a.rs b/tests/run-make/a-b-a-linker-guard/a.rs
index aa07b1e7160..aa07b1e7160 100644
--- a/tests/run-make-fulldeps/a-b-a-linker-guard/a.rs
+++ b/tests/run-make/a-b-a-linker-guard/a.rs
diff --git a/tests/run-make-fulldeps/a-b-a-linker-guard/b.rs b/tests/run-make/a-b-a-linker-guard/b.rs
index f30df120a3b..f30df120a3b 100644
--- a/tests/run-make-fulldeps/a-b-a-linker-guard/b.rs
+++ b/tests/run-make/a-b-a-linker-guard/b.rs
diff --git a/tests/run-make-fulldeps/alloc-no-oom-handling/Makefile b/tests/run-make/alloc-no-oom-handling/Makefile
index 87f74c69c79..87f74c69c79 100644
--- a/tests/run-make-fulldeps/alloc-no-oom-handling/Makefile
+++ b/tests/run-make/alloc-no-oom-handling/Makefile
diff --git a/tests/run-make-fulldeps/alloc-no-rc/Makefile b/tests/run-make/alloc-no-rc/Makefile
index 9824b17e6c2..9824b17e6c2 100644
--- a/tests/run-make-fulldeps/alloc-no-rc/Makefile
+++ b/tests/run-make/alloc-no-rc/Makefile
diff --git a/tests/run-make-fulldeps/alloc-no-sync/Makefile b/tests/run-make/alloc-no-sync/Makefile
index 04ec4c7d8bc..04ec4c7d8bc 100644
--- a/tests/run-make-fulldeps/alloc-no-sync/Makefile
+++ b/tests/run-make/alloc-no-sync/Makefile
diff --git a/tests/run-make-fulldeps/allow-non-lint-warnings-cmdline/Makefile b/tests/run-make/allow-non-lint-warnings-cmdline/Makefile
index 60d9c7c3745..78b9a7b9898 100644
--- a/tests/run-make-fulldeps/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-fulldeps/allow-non-lint-warnings-cmdline/foo.rs b/tests/run-make/allow-non-lint-warnings-cmdline/foo.rs
index 46e72da2de9..46e72da2de9 100644
--- a/tests/run-make-fulldeps/allow-non-lint-warnings-cmdline/foo.rs
+++ b/tests/run-make/allow-non-lint-warnings-cmdline/foo.rs
diff --git a/tests/run-make-fulldeps/allow-warnings-cmdline-stability/Makefile b/tests/run-make/allow-warnings-cmdline-stability/Makefile
index 1ce8d0ec284..368a39af6bf 100644
--- a/tests/run-make-fulldeps/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-fulldeps/allow-warnings-cmdline-stability/bar.rs b/tests/run-make/allow-warnings-cmdline-stability/bar.rs
index 3dcfb9dadd8..3dcfb9dadd8 100644
--- a/tests/run-make-fulldeps/allow-warnings-cmdline-stability/bar.rs
+++ b/tests/run-make/allow-warnings-cmdline-stability/bar.rs
diff --git a/tests/run-make-fulldeps/allow-warnings-cmdline-stability/foo.rs b/tests/run-make/allow-warnings-cmdline-stability/foo.rs
index 869b5435416..869b5435416 100644
--- a/tests/run-make-fulldeps/allow-warnings-cmdline-stability/foo.rs
+++ b/tests/run-make/allow-warnings-cmdline-stability/foo.rs
diff --git a/tests/run-make-fulldeps/archive-duplicate-names/Makefile b/tests/run-make/archive-duplicate-names/Makefile
index bbdcd2a34fe..5433a42d252 100644
--- a/tests/run-make-fulldeps/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-fulldeps/archive-duplicate-names/bar.c b/tests/run-make/archive-duplicate-names/bar.c
index e4259998678..e4259998678 100644
--- a/tests/run-make-fulldeps/archive-duplicate-names/bar.c
+++ b/tests/run-make/archive-duplicate-names/bar.c
diff --git a/tests/run-make-fulldeps/archive-duplicate-names/bar.rs b/tests/run-make/archive-duplicate-names/bar.rs
index 994a98c2cd8..994a98c2cd8 100644
--- a/tests/run-make-fulldeps/archive-duplicate-names/bar.rs
+++ b/tests/run-make/archive-duplicate-names/bar.rs
diff --git a/tests/run-make-fulldeps/archive-duplicate-names/foo.c b/tests/run-make/archive-duplicate-names/foo.c
index 85e6cd8c390..85e6cd8c390 100644
--- a/tests/run-make-fulldeps/archive-duplicate-names/foo.c
+++ b/tests/run-make/archive-duplicate-names/foo.c
diff --git a/tests/run-make-fulldeps/archive-duplicate-names/foo.rs b/tests/run-make/archive-duplicate-names/foo.rs
index 0bf13c406ab..0bf13c406ab 100644
--- a/tests/run-make-fulldeps/archive-duplicate-names/foo.rs
+++ b/tests/run-make/archive-duplicate-names/foo.rs
diff --git a/tests/run-make-fulldeps/arguments-non-c-like-enum/Makefile b/tests/run-make/arguments-non-c-like-enum/Makefile
index 513311c8289..0c8d8bf3acc 100644
--- a/tests/run-make-fulldeps/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-fulldeps/arguments-non-c-like-enum/nonclike.rs b/tests/run-make/arguments-non-c-like-enum/nonclike.rs
index 57c2c6127ed..57c2c6127ed 100644
--- a/tests/run-make-fulldeps/arguments-non-c-like-enum/nonclike.rs
+++ b/tests/run-make/arguments-non-c-like-enum/nonclike.rs
diff --git a/tests/run-make-fulldeps/arguments-non-c-like-enum/test.c b/tests/run-make/arguments-non-c-like-enum/test.c
index 0a1621e49f2..0a1621e49f2 100644
--- a/tests/run-make-fulldeps/arguments-non-c-like-enum/test.c
+++ b/tests/run-make/arguments-non-c-like-enum/test.c
diff --git a/tests/run-make-fulldeps/atomic-lock-free/Makefile b/tests/run-make/atomic-lock-free/Makefile
index 37e59624a25..37e59624a25 100644
--- a/tests/run-make-fulldeps/atomic-lock-free/Makefile
+++ b/tests/run-make/atomic-lock-free/Makefile
diff --git a/tests/run-make-fulldeps/atomic-lock-free/atomic_lock_free.rs b/tests/run-make/atomic-lock-free/atomic_lock_free.rs
index 47d90b1856b..47d90b1856b 100644
--- a/tests/run-make-fulldeps/atomic-lock-free/atomic_lock_free.rs
+++ b/tests/run-make/atomic-lock-free/atomic_lock_free.rs
diff --git a/tests/run-make-fulldeps/bare-outfile/Makefile b/tests/run-make/bare-outfile/Makefile
index 858466e942b..23b619ea0ba 100644
--- a/tests/run-make-fulldeps/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-fulldeps/bare-outfile/foo.rs b/tests/run-make/bare-outfile/foo.rs
index f79c691f085..f79c691f085 100644
--- a/tests/run-make-fulldeps/bare-outfile/foo.rs
+++ b/tests/run-make/bare-outfile/foo.rs
diff --git a/tests/run-make-fulldeps/c-dynamic-dylib/Makefile b/tests/run-make/c-dynamic-dylib/Makefile
index ac68778922d..b5bfbc76539 100644
--- a/tests/run-make-fulldeps/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-fulldeps/c-dynamic-dylib/bar.rs b/tests/run-make/c-dynamic-dylib/bar.rs
index b8c798ffdb4..b8c798ffdb4 100644
--- a/tests/run-make-fulldeps/c-dynamic-dylib/bar.rs
+++ b/tests/run-make/c-dynamic-dylib/bar.rs
diff --git a/tests/run-make-fulldeps/c-dynamic-dylib/cfoo.c b/tests/run-make/c-dynamic-dylib/cfoo.c
index fea490cf9b4..fea490cf9b4 100644
--- a/tests/run-make-fulldeps/c-dynamic-dylib/cfoo.c
+++ b/tests/run-make/c-dynamic-dylib/cfoo.c
diff --git a/tests/run-make-fulldeps/c-dynamic-dylib/foo.rs b/tests/run-make/c-dynamic-dylib/foo.rs
index 9f7a9e2213c..9f7a9e2213c 100644
--- a/tests/run-make-fulldeps/c-dynamic-dylib/foo.rs
+++ b/tests/run-make/c-dynamic-dylib/foo.rs
diff --git a/tests/run-make-fulldeps/c-dynamic-rlib/Makefile b/tests/run-make/c-dynamic-rlib/Makefile
index c65d648b929..0475bd8acae 100644
--- a/tests/run-make-fulldeps/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-fulldeps/c-dynamic-rlib/bar.rs b/tests/run-make/c-dynamic-rlib/bar.rs
index b8c798ffdb4..b8c798ffdb4 100644
--- a/tests/run-make-fulldeps/c-dynamic-rlib/bar.rs
+++ b/tests/run-make/c-dynamic-rlib/bar.rs
diff --git a/tests/run-make-fulldeps/c-dynamic-rlib/cfoo.c b/tests/run-make/c-dynamic-rlib/cfoo.c
index fea490cf9b4..fea490cf9b4 100644
--- a/tests/run-make-fulldeps/c-dynamic-rlib/cfoo.c
+++ b/tests/run-make/c-dynamic-rlib/cfoo.c
diff --git a/tests/run-make-fulldeps/c-dynamic-rlib/foo.rs b/tests/run-make/c-dynamic-rlib/foo.rs
index 3dd376f1ff5..3dd376f1ff5 100644
--- a/tests/run-make-fulldeps/c-dynamic-rlib/foo.rs
+++ b/tests/run-make/c-dynamic-rlib/foo.rs
diff --git a/tests/run-make-fulldeps/c-link-to-rust-dylib/Makefile b/tests/run-make/c-link-to-rust-dylib/Makefile
index 2a371b54541..2763cb6ed1d 100644
--- a/tests/run-make-fulldeps/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-fulldeps/c-link-to-rust-dylib/bar.c b/tests/run-make/c-link-to-rust-dylib/bar.c
index bb4036b06e1..bb4036b06e1 100644
--- a/tests/run-make-fulldeps/c-link-to-rust-dylib/bar.c
+++ b/tests/run-make/c-link-to-rust-dylib/bar.c
diff --git a/tests/run-make-fulldeps/c-link-to-rust-dylib/foo.rs b/tests/run-make/c-link-to-rust-dylib/foo.rs
index f197fa51334..f197fa51334 100644
--- a/tests/run-make-fulldeps/c-link-to-rust-dylib/foo.rs
+++ b/tests/run-make/c-link-to-rust-dylib/foo.rs
diff --git a/tests/run-make-fulldeps/c-link-to-rust-staticlib/Makefile b/tests/run-make/c-link-to-rust-staticlib/Makefile
index d38bcef309a..e14775f5c18 100644
--- a/tests/run-make-fulldeps/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-fulldeps/c-link-to-rust-staticlib/bar.c b/tests/run-make/c-link-to-rust-staticlib/bar.c
index bb4036b06e1..bb4036b06e1 100644
--- a/tests/run-make-fulldeps/c-link-to-rust-staticlib/bar.c
+++ b/tests/run-make/c-link-to-rust-staticlib/bar.c
diff --git a/tests/run-make-fulldeps/c-link-to-rust-staticlib/foo.rs b/tests/run-make/c-link-to-rust-staticlib/foo.rs
index 2e59432cdb1..2e59432cdb1 100644
--- a/tests/run-make-fulldeps/c-link-to-rust-staticlib/foo.rs
+++ b/tests/run-make/c-link-to-rust-staticlib/foo.rs
diff --git a/tests/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile b/tests/run-make/c-link-to-rust-va-list-fn/Makefile
index 9ce2a34e677..596c0fce3ce 100644
--- a/tests/run-make-fulldeps/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-fulldeps/c-link-to-rust-va-list-fn/checkrust.rs b/tests/run-make/c-link-to-rust-va-list-fn/checkrust.rs
index 5830ef033d3..5830ef033d3 100644
--- a/tests/run-make-fulldeps/c-link-to-rust-va-list-fn/checkrust.rs
+++ b/tests/run-make/c-link-to-rust-va-list-fn/checkrust.rs
diff --git a/tests/run-make-fulldeps/c-link-to-rust-va-list-fn/test.c b/tests/run-make/c-link-to-rust-va-list-fn/test.c
index 5bdb51680a6..5bdb51680a6 100644
--- a/tests/run-make-fulldeps/c-link-to-rust-va-list-fn/test.c
+++ b/tests/run-make/c-link-to-rust-va-list-fn/test.c
diff --git a/tests/run-make-fulldeps/c-static-dylib/Makefile b/tests/run-make/c-static-dylib/Makefile
index 5b78005e3ee..4e23edb6c57 100644
--- a/tests/run-make-fulldeps/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-fulldeps/c-static-dylib/bar.rs b/tests/run-make/c-static-dylib/bar.rs
index b8c798ffdb4..b8c798ffdb4 100644
--- a/tests/run-make-fulldeps/c-static-dylib/bar.rs
+++ b/tests/run-make/c-static-dylib/bar.rs
diff --git a/tests/run-make-fulldeps/c-static-dylib/cfoo.c b/tests/run-make/c-static-dylib/cfoo.c
index 9fe07f82f9e..9fe07f82f9e 100644
--- a/tests/run-make-fulldeps/c-static-dylib/cfoo.c
+++ b/tests/run-make/c-static-dylib/cfoo.c
diff --git a/tests/run-make-fulldeps/c-static-dylib/foo.rs b/tests/run-make/c-static-dylib/foo.rs
index 1e8af4d4404..1e8af4d4404 100644
--- a/tests/run-make-fulldeps/c-static-dylib/foo.rs
+++ b/tests/run-make/c-static-dylib/foo.rs
diff --git a/tests/run-make-fulldeps/c-static-rlib/Makefile b/tests/run-make/c-static-rlib/Makefile
index 11a3cf1940c..4e351127cb6 100644
--- a/tests/run-make-fulldeps/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-fulldeps/c-static-rlib/bar.rs b/tests/run-make/c-static-rlib/bar.rs
index b8c798ffdb4..b8c798ffdb4 100644
--- a/tests/run-make-fulldeps/c-static-rlib/bar.rs
+++ b/tests/run-make/c-static-rlib/bar.rs
diff --git a/tests/run-make-fulldeps/c-static-rlib/cfoo.c b/tests/run-make/c-static-rlib/cfoo.c
index 9fe07f82f9e..9fe07f82f9e 100644
--- a/tests/run-make-fulldeps/c-static-rlib/cfoo.c
+++ b/tests/run-make/c-static-rlib/cfoo.c
diff --git a/tests/run-make-fulldeps/c-static-rlib/foo.rs b/tests/run-make/c-static-rlib/foo.rs
index 9c6d2080ef4..9c6d2080ef4 100644
--- a/tests/run-make-fulldeps/c-static-rlib/foo.rs
+++ b/tests/run-make/c-static-rlib/foo.rs
diff --git a/tests/run-make-fulldeps/c-unwind-abi-catch-lib-panic/Makefile b/tests/run-make/c-unwind-abi-catch-lib-panic/Makefile
index 134f000d453..9c41a5a717e 100644
--- a/tests/run-make-fulldeps/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-fulldeps/c-unwind-abi-catch-lib-panic/add.c b/tests/run-make/c-unwind-abi-catch-lib-panic/add.c
index 444359451f6..444359451f6 100644
--- a/tests/run-make-fulldeps/c-unwind-abi-catch-lib-panic/add.c
+++ b/tests/run-make/c-unwind-abi-catch-lib-panic/add.c
diff --git a/tests/run-make-fulldeps/c-unwind-abi-catch-lib-panic/main.rs b/tests/run-make/c-unwind-abi-catch-lib-panic/main.rs
index 78a71219c78..78a71219c78 100644
--- a/tests/run-make-fulldeps/c-unwind-abi-catch-lib-panic/main.rs
+++ b/tests/run-make/c-unwind-abi-catch-lib-panic/main.rs
diff --git a/tests/run-make-fulldeps/c-unwind-abi-catch-lib-panic/panic.rs b/tests/run-make/c-unwind-abi-catch-lib-panic/panic.rs
index a99a04d5c6f..a99a04d5c6f 100644
--- a/tests/run-make-fulldeps/c-unwind-abi-catch-lib-panic/panic.rs
+++ b/tests/run-make/c-unwind-abi-catch-lib-panic/panic.rs
diff --git a/tests/run-make-fulldeps/c-unwind-abi-catch-panic/Makefile b/tests/run-make/c-unwind-abi-catch-panic/Makefile
index e93ec99da2a..4398ac2ee24 100644
--- a/tests/run-make-fulldeps/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-fulldeps/c-unwind-abi-catch-panic/add.c b/tests/run-make/c-unwind-abi-catch-panic/add.c
index 444359451f6..444359451f6 100644
--- a/tests/run-make-fulldeps/c-unwind-abi-catch-panic/add.c
+++ b/tests/run-make/c-unwind-abi-catch-panic/add.c
diff --git a/tests/run-make-fulldeps/c-unwind-abi-catch-panic/main.rs b/tests/run-make/c-unwind-abi-catch-panic/main.rs
index 15d38d72160..15d38d72160 100644
--- a/tests/run-make-fulldeps/c-unwind-abi-catch-panic/main.rs
+++ b/tests/run-make/c-unwind-abi-catch-panic/main.rs
diff --git a/tests/run-make-fulldeps/cat-and-grep-sanity-check/Makefile b/tests/run-make/cat-and-grep-sanity-check/Makefile
index 82351e22009..82351e22009 100644
--- a/tests/run-make-fulldeps/cat-and-grep-sanity-check/Makefile
+++ b/tests/run-make/cat-and-grep-sanity-check/Makefile
diff --git a/tests/run-make-fulldeps/cdylib-dylib-linkage/Makefile b/tests/run-make/cdylib-dylib-linkage/Makefile
index 5c9b2d1bb2f..51fbfef2d85 100644
--- a/tests/run-make-fulldeps/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-fulldeps/cdylib-dylib-linkage/bar.rs b/tests/run-make/cdylib-dylib-linkage/bar.rs
index b3a7539abae..b3a7539abae 100644
--- a/tests/run-make-fulldeps/cdylib-dylib-linkage/bar.rs
+++ b/tests/run-make/cdylib-dylib-linkage/bar.rs
diff --git a/tests/run-make-fulldeps/cdylib-dylib-linkage/foo.c b/tests/run-make/cdylib-dylib-linkage/foo.c
index 154f9682ef8..154f9682ef8 100644
--- a/tests/run-make-fulldeps/cdylib-dylib-linkage/foo.c
+++ b/tests/run-make/cdylib-dylib-linkage/foo.c
diff --git a/tests/run-make-fulldeps/cdylib-dylib-linkage/foo.rs b/tests/run-make/cdylib-dylib-linkage/foo.rs
index c4069495aaf..c4069495aaf 100644
--- a/tests/run-make-fulldeps/cdylib-dylib-linkage/foo.rs
+++ b/tests/run-make/cdylib-dylib-linkage/foo.rs
diff --git a/tests/run-make-fulldeps/cdylib-fewer-symbols/Makefile b/tests/run-make/cdylib-fewer-symbols/Makefile
index 324791af8de..4e08f979c36 100644
--- a/tests/run-make-fulldeps/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-fulldeps/cdylib-fewer-symbols/foo.rs b/tests/run-make/cdylib-fewer-symbols/foo.rs
index af37bc8e953..af37bc8e953 100644
--- a/tests/run-make-fulldeps/cdylib-fewer-symbols/foo.rs
+++ b/tests/run-make/cdylib-fewer-symbols/foo.rs
diff --git a/tests/run-make-fulldeps/cdylib/Makefile b/tests/run-make/cdylib/Makefile
index 47ec762b3e9..3c8b5269554 100644
--- a/tests/run-make-fulldeps/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-fulldeps/cdylib/bar.rs b/tests/run-make/cdylib/bar.rs
index fe665abc7c1..fe665abc7c1 100644
--- a/tests/run-make-fulldeps/cdylib/bar.rs
+++ b/tests/run-make/cdylib/bar.rs
diff --git a/tests/run-make-fulldeps/cdylib/foo.c b/tests/run-make/cdylib/foo.c
index 154f9682ef8..154f9682ef8 100644
--- a/tests/run-make-fulldeps/cdylib/foo.c
+++ b/tests/run-make/cdylib/foo.c
diff --git a/tests/run-make-fulldeps/cdylib/foo.rs b/tests/run-make/cdylib/foo.rs
index c4069495aaf..c4069495aaf 100644
--- a/tests/run-make-fulldeps/cdylib/foo.rs
+++ b/tests/run-make/cdylib/foo.rs
diff --git a/tests/run-make-fulldeps/codegen-options-parsing/Makefile b/tests/run-make/codegen-options-parsing/Makefile
index b063593c9d9..56bb900b7d8 100644
--- a/tests/run-make-fulldeps/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-fulldeps/codegen-options-parsing/dummy.rs b/tests/run-make/codegen-options-parsing/dummy.rs
index f328e4d9d04..f328e4d9d04 100644
--- a/tests/run-make-fulldeps/codegen-options-parsing/dummy.rs
+++ b/tests/run-make/codegen-options-parsing/dummy.rs
diff --git a/tests/run-make-fulldeps/compile-stdin/Makefile b/tests/run-make/compile-stdin/Makefile
index be15548690f..2a495281c24 100644
--- a/tests/run-make-fulldeps/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-fulldeps/compiler-lookup-paths-2/Makefile b/tests/run-make/compiler-lookup-paths-2/Makefile
index d4ff7d8daab..d4ff7d8daab 100644
--- a/tests/run-make-fulldeps/compiler-lookup-paths-2/Makefile
+++ b/tests/run-make/compiler-lookup-paths-2/Makefile
diff --git a/tests/run-make-fulldeps/compiler-lookup-paths-2/a.rs b/tests/run-make/compiler-lookup-paths-2/a.rs
index 83be6e807e0..83be6e807e0 100644
--- a/tests/run-make-fulldeps/compiler-lookup-paths-2/a.rs
+++ b/tests/run-make/compiler-lookup-paths-2/a.rs
diff --git a/tests/run-make-fulldeps/compiler-lookup-paths-2/b.rs b/tests/run-make/compiler-lookup-paths-2/b.rs
index 1be6cbc919d..1be6cbc919d 100644
--- a/tests/run-make-fulldeps/compiler-lookup-paths-2/b.rs
+++ b/tests/run-make/compiler-lookup-paths-2/b.rs
diff --git a/tests/run-make-fulldeps/compiler-lookup-paths-2/c.rs b/tests/run-make/compiler-lookup-paths-2/c.rs
index e37bc2e1dce..e37bc2e1dce 100644
--- a/tests/run-make-fulldeps/compiler-lookup-paths-2/c.rs
+++ b/tests/run-make/compiler-lookup-paths-2/c.rs
diff --git a/tests/run-make-fulldeps/compiler-lookup-paths/Makefile b/tests/run-make/compiler-lookup-paths/Makefile
index c16bf7af6c4..310d6772c34 100644
--- a/tests/run-make-fulldeps/compiler-lookup-paths/Makefile
+++ b/tests/run-make/compiler-lookup-paths/Makefile
@@ -1,5 +1,8 @@
 include ../tools.mk
 
+# ignore-wasm32 (need a C compiler)
+# ignore-wasm64 (need a C compiler)
+
 all: $(TMPDIR)/libnative.a
 	mkdir -p $(TMPDIR)/crate
 	mkdir -p $(TMPDIR)/native
diff --git a/tests/run-make-fulldeps/compiler-lookup-paths/a.rs b/tests/run-make/compiler-lookup-paths/a.rs
index 83be6e807e0..83be6e807e0 100644
--- a/tests/run-make-fulldeps/compiler-lookup-paths/a.rs
+++ b/tests/run-make/compiler-lookup-paths/a.rs
diff --git a/tests/run-make-fulldeps/compiler-lookup-paths/b.rs b/tests/run-make/compiler-lookup-paths/b.rs
index 1be6cbc919d..1be6cbc919d 100644
--- a/tests/run-make-fulldeps/compiler-lookup-paths/b.rs
+++ b/tests/run-make/compiler-lookup-paths/b.rs
diff --git a/tests/run-make-fulldeps/compiler-lookup-paths/c.rs b/tests/run-make/compiler-lookup-paths/c.rs
index 4c7ce01b6a0..4c7ce01b6a0 100644
--- a/tests/run-make-fulldeps/compiler-lookup-paths/c.rs
+++ b/tests/run-make/compiler-lookup-paths/c.rs
diff --git a/tests/run-make-fulldeps/compiler-lookup-paths/d.rs b/tests/run-make/compiler-lookup-paths/d.rs
index 6cd9916b6f6..6cd9916b6f6 100644
--- a/tests/run-make-fulldeps/compiler-lookup-paths/d.rs
+++ b/tests/run-make/compiler-lookup-paths/d.rs
diff --git a/tests/run-make-fulldeps/compiler-lookup-paths/e.rs b/tests/run-make/compiler-lookup-paths/e.rs
index 18eb60aca97..18eb60aca97 100644
--- a/tests/run-make-fulldeps/compiler-lookup-paths/e.rs
+++ b/tests/run-make/compiler-lookup-paths/e.rs
diff --git a/tests/run-make-fulldeps/compiler-lookup-paths/e2.rs b/tests/run-make/compiler-lookup-paths/e2.rs
index cbf08b98e7e..cbf08b98e7e 100644
--- a/tests/run-make-fulldeps/compiler-lookup-paths/e2.rs
+++ b/tests/run-make/compiler-lookup-paths/e2.rs
diff --git a/tests/run-make-fulldeps/compiler-lookup-paths/f.rs b/tests/run-make/compiler-lookup-paths/f.rs
index 483deaaea49..483deaaea49 100644
--- a/tests/run-make-fulldeps/compiler-lookup-paths/f.rs
+++ b/tests/run-make/compiler-lookup-paths/f.rs
diff --git a/tests/run-make-fulldeps/compiler-lookup-paths/native.c b/tests/run-make/compiler-lookup-paths/native.c
index d11c69f812a..d11c69f812a 100644
--- a/tests/run-make-fulldeps/compiler-lookup-paths/native.c
+++ b/tests/run-make/compiler-lookup-paths/native.c
diff --git a/tests/run-make-fulldeps/compiler-rt-works-on-mingw/Makefile b/tests/run-make/compiler-rt-works-on-mingw/Makefile
index 74917570a01..74917570a01 100644
--- a/tests/run-make-fulldeps/compiler-rt-works-on-mingw/Makefile
+++ b/tests/run-make/compiler-rt-works-on-mingw/Makefile
diff --git a/tests/run-make-fulldeps/compiler-rt-works-on-mingw/foo.cpp b/tests/run-make/compiler-rt-works-on-mingw/foo.cpp
index 4c2fb9cdb87..4c2fb9cdb87 100644
--- a/tests/run-make-fulldeps/compiler-rt-works-on-mingw/foo.cpp
+++ b/tests/run-make/compiler-rt-works-on-mingw/foo.cpp
diff --git a/tests/run-make-fulldeps/compiler-rt-works-on-mingw/foo.rs b/tests/run-make/compiler-rt-works-on-mingw/foo.rs
index 7fdb8158871..7fdb8158871 100644
--- a/tests/run-make-fulldeps/compiler-rt-works-on-mingw/foo.rs
+++ b/tests/run-make/compiler-rt-works-on-mingw/foo.rs
diff --git a/tests/run-make/const_fn_mir/Makefile b/tests/run-make/const_fn_mir/Makefile
index ad5695093a1..b2c268f0439 100644
--- a/tests/run-make/const_fn_mir/Makefile
+++ b/tests/run-make/const_fn_mir/Makefile
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 all:
 	$(RUSTC) main.rs --emit=mir -o "$(TMPDIR)"/dump.mir
diff --git a/tests/run-make-fulldeps/core-no-fp-fmt-parse/Makefile b/tests/run-make/core-no-fp-fmt-parse/Makefile
index 837664d92b9..837664d92b9 100644
--- a/tests/run-make-fulldeps/core-no-fp-fmt-parse/Makefile
+++ b/tests/run-make/core-no-fp-fmt-parse/Makefile
diff --git a/tests/run-make/coverage/coverage_tools.mk b/tests/run-make/coverage/coverage_tools.mk
index 0b6bbc33167..028c020a461 100644
--- a/tests/run-make/coverage/coverage_tools.mk
+++ b/tests/run-make/coverage/coverage_tools.mk
@@ -3,4 +3,4 @@
 #
 # include ../coverage/coverage_tools.mk
 
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
diff --git a/tests/run-make-fulldeps/crate-data-smoke/Makefile b/tests/run-make/crate-data-smoke/Makefile
index a453f65ff3e..a453f65ff3e 100644
--- a/tests/run-make-fulldeps/crate-data-smoke/Makefile
+++ b/tests/run-make/crate-data-smoke/Makefile
diff --git a/tests/run-make-fulldeps/crate-data-smoke/crate.rs b/tests/run-make/crate-data-smoke/crate.rs
index a48a6f51c42..a48a6f51c42 100644
--- a/tests/run-make-fulldeps/crate-data-smoke/crate.rs
+++ b/tests/run-make/crate-data-smoke/crate.rs
diff --git a/tests/run-make-fulldeps/crate-data-smoke/lib.rs b/tests/run-make/crate-data-smoke/lib.rs
index 8002f11ec87..8002f11ec87 100644
--- a/tests/run-make-fulldeps/crate-data-smoke/lib.rs
+++ b/tests/run-make/crate-data-smoke/lib.rs
diff --git a/tests/run-make-fulldeps/crate-data-smoke/rlib.rs b/tests/run-make/crate-data-smoke/rlib.rs
index 47fcce4a7f6..47fcce4a7f6 100644
--- a/tests/run-make-fulldeps/crate-data-smoke/rlib.rs
+++ b/tests/run-make/crate-data-smoke/rlib.rs
diff --git a/tests/run-make-fulldeps/crate-hash-rustc-version/Makefile b/tests/run-make/crate-hash-rustc-version/Makefile
index 4f25a865ebd..f1d2a360410 100644
--- a/tests/run-make-fulldeps/crate-hash-rustc-version/Makefile
+++ b/tests/run-make/crate-hash-rustc-version/Makefile
@@ -1,4 +1,5 @@
-include ../../run-make-fulldeps/tools.mk
+# ignore-cross-compile
+include ../tools.mk
 
 # Ensure that crates compiled with different rustc versions cannot
 # be dynamically linked.
diff --git a/tests/run-make-fulldeps/crate-hash-rustc-version/a.rs b/tests/run-make/crate-hash-rustc-version/a.rs
index d65b5ce8e88..d65b5ce8e88 100644
--- a/tests/run-make-fulldeps/crate-hash-rustc-version/a.rs
+++ b/tests/run-make/crate-hash-rustc-version/a.rs
diff --git a/tests/run-make-fulldeps/crate-hash-rustc-version/b.rs b/tests/run-make/crate-hash-rustc-version/b.rs
index 316ac26e73f..316ac26e73f 100644
--- a/tests/run-make-fulldeps/crate-hash-rustc-version/b.rs
+++ b/tests/run-make/crate-hash-rustc-version/b.rs
diff --git a/tests/run-make-fulldeps/crate-name-priority/Makefile b/tests/run-make/crate-name-priority/Makefile
index 08a07c325e3..4adaa75a71c 100644
--- a/tests/run-make-fulldeps/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-fulldeps/crate-name-priority/foo.rs b/tests/run-make/crate-name-priority/foo.rs
index f328e4d9d04..f328e4d9d04 100644
--- a/tests/run-make-fulldeps/crate-name-priority/foo.rs
+++ b/tests/run-make/crate-name-priority/foo.rs
diff --git a/tests/run-make-fulldeps/crate-name-priority/foo1.rs b/tests/run-make/crate-name-priority/foo1.rs
index 4ff3bd9516b..4ff3bd9516b 100644
--- a/tests/run-make-fulldeps/crate-name-priority/foo1.rs
+++ b/tests/run-make/crate-name-priority/foo1.rs
diff --git a/tests/run-make-fulldeps/cross-lang-lto-clang/Makefile b/tests/run-make/cross-lang-lto-clang/Makefile
index acaebf439d6..acaebf439d6 100644
--- a/tests/run-make-fulldeps/cross-lang-lto-clang/Makefile
+++ b/tests/run-make/cross-lang-lto-clang/Makefile
diff --git a/tests/run-make-fulldeps/cross-lang-lto-clang/clib.c b/tests/run-make/cross-lang-lto-clang/clib.c
index 90f33f24dc4..90f33f24dc4 100644
--- a/tests/run-make-fulldeps/cross-lang-lto-clang/clib.c
+++ b/tests/run-make/cross-lang-lto-clang/clib.c
diff --git a/tests/run-make-fulldeps/cross-lang-lto-clang/cmain.c b/tests/run-make/cross-lang-lto-clang/cmain.c
index e62a40117ce..e62a40117ce 100644
--- a/tests/run-make-fulldeps/cross-lang-lto-clang/cmain.c
+++ b/tests/run-make/cross-lang-lto-clang/cmain.c
diff --git a/tests/run-make-fulldeps/cross-lang-lto-clang/main.rs b/tests/run-make/cross-lang-lto-clang/main.rs
index 8129dcb85d9..8129dcb85d9 100644
--- a/tests/run-make-fulldeps/cross-lang-lto-clang/main.rs
+++ b/tests/run-make/cross-lang-lto-clang/main.rs
diff --git a/tests/run-make-fulldeps/cross-lang-lto-clang/rustlib.rs b/tests/run-make/cross-lang-lto-clang/rustlib.rs
index 8a74d74a420..8a74d74a420 100644
--- a/tests/run-make-fulldeps/cross-lang-lto-clang/rustlib.rs
+++ b/tests/run-make/cross-lang-lto-clang/rustlib.rs
diff --git a/tests/run-make-fulldeps/cross-lang-lto-pgo-smoketest/Makefile b/tests/run-make/cross-lang-lto-pgo-smoketest/Makefile
index 70085d9bde1..70085d9bde1 100644
--- a/tests/run-make-fulldeps/cross-lang-lto-pgo-smoketest/Makefile
+++ b/tests/run-make/cross-lang-lto-pgo-smoketest/Makefile
diff --git a/tests/run-make-fulldeps/cross-lang-lto-pgo-smoketest/clib.c b/tests/run-make/cross-lang-lto-pgo-smoketest/clib.c
index 90f33f24dc4..90f33f24dc4 100644
--- a/tests/run-make-fulldeps/cross-lang-lto-pgo-smoketest/clib.c
+++ b/tests/run-make/cross-lang-lto-pgo-smoketest/clib.c
diff --git a/tests/run-make-fulldeps/cross-lang-lto-pgo-smoketest/cmain.c b/tests/run-make/cross-lang-lto-pgo-smoketest/cmain.c
index e3f24828be3..e3f24828be3 100644
--- a/tests/run-make-fulldeps/cross-lang-lto-pgo-smoketest/cmain.c
+++ b/tests/run-make/cross-lang-lto-pgo-smoketest/cmain.c
diff --git a/tests/run-make-fulldeps/cross-lang-lto-pgo-smoketest/main.rs b/tests/run-make/cross-lang-lto-pgo-smoketest/main.rs
index 8129dcb85d9..8129dcb85d9 100644
--- a/tests/run-make-fulldeps/cross-lang-lto-pgo-smoketest/main.rs
+++ b/tests/run-make/cross-lang-lto-pgo-smoketest/main.rs
diff --git a/tests/run-make-fulldeps/cross-lang-lto-pgo-smoketest/rustlib.rs b/tests/run-make/cross-lang-lto-pgo-smoketest/rustlib.rs
index 8a74d74a420..8a74d74a420 100644
--- a/tests/run-make-fulldeps/cross-lang-lto-pgo-smoketest/rustlib.rs
+++ b/tests/run-make/cross-lang-lto-pgo-smoketest/rustlib.rs
diff --git a/tests/run-make-fulldeps/cross-lang-lto-upstream-rlibs/Makefile b/tests/run-make/cross-lang-lto-upstream-rlibs/Makefile
index 6f1caa31a80..6f1caa31a80 100644
--- a/tests/run-make-fulldeps/cross-lang-lto-upstream-rlibs/Makefile
+++ b/tests/run-make/cross-lang-lto-upstream-rlibs/Makefile
diff --git a/tests/run-make-fulldeps/cross-lang-lto-upstream-rlibs/staticlib.rs b/tests/run-make/cross-lang-lto-upstream-rlibs/staticlib.rs
index 34951dda3b6..34951dda3b6 100644
--- a/tests/run-make-fulldeps/cross-lang-lto-upstream-rlibs/staticlib.rs
+++ b/tests/run-make/cross-lang-lto-upstream-rlibs/staticlib.rs
diff --git a/tests/run-make-fulldeps/cross-lang-lto-upstream-rlibs/upstream.rs b/tests/run-make/cross-lang-lto-upstream-rlibs/upstream.rs
index bd6820098ee..bd6820098ee 100644
--- a/tests/run-make-fulldeps/cross-lang-lto-upstream-rlibs/upstream.rs
+++ b/tests/run-make/cross-lang-lto-upstream-rlibs/upstream.rs
diff --git a/tests/run-make-fulldeps/cross-lang-lto/Makefile b/tests/run-make/cross-lang-lto/Makefile
index 92058f952a9..92058f952a9 100644
--- a/tests/run-make-fulldeps/cross-lang-lto/Makefile
+++ b/tests/run-make/cross-lang-lto/Makefile
diff --git a/tests/run-make-fulldeps/cross-lang-lto/lib.rs b/tests/run-make/cross-lang-lto/lib.rs
index 94cfef6ada5..94cfef6ada5 100644
--- a/tests/run-make-fulldeps/cross-lang-lto/lib.rs
+++ b/tests/run-make/cross-lang-lto/lib.rs
diff --git a/tests/run-make-fulldeps/cross-lang-lto/main.rs b/tests/run-make/cross-lang-lto/main.rs
index f6320bcb04a..f6320bcb04a 100644
--- a/tests/run-make-fulldeps/cross-lang-lto/main.rs
+++ b/tests/run-make/cross-lang-lto/main.rs
diff --git a/tests/run-make-fulldeps/debug-assertions/Makefile b/tests/run-make/debug-assertions/Makefile
index 73beb4b03ae..e83337c597f 100644
--- a/tests/run-make-fulldeps/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-fulldeps/debug-assertions/debug.rs b/tests/run-make/debug-assertions/debug.rs
index 76ca60a71c8..76ca60a71c8 100644
--- a/tests/run-make-fulldeps/debug-assertions/debug.rs
+++ b/tests/run-make/debug-assertions/debug.rs
diff --git a/tests/run-make/dep-graph/Makefile b/tests/run-make/dep-graph/Makefile
index ae97b1672ae..d06333f4454 100644
--- a/tests/run-make/dep-graph/Makefile
+++ b/tests/run-make/dep-graph/Makefile
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 # ignore-cross-compile
 
diff --git a/tests/run-make-fulldeps/dep-info-doesnt-run-much/Makefile b/tests/run-make/dep-info-doesnt-run-much/Makefile
index b4dc44ad2be..b4dc44ad2be 100644
--- a/tests/run-make-fulldeps/dep-info-doesnt-run-much/Makefile
+++ b/tests/run-make/dep-info-doesnt-run-much/Makefile
diff --git a/tests/run-make-fulldeps/dep-info-doesnt-run-much/foo.rs b/tests/run-make/dep-info-doesnt-run-much/foo.rs
index 316e681293e..316e681293e 100644
--- a/tests/run-make-fulldeps/dep-info-doesnt-run-much/foo.rs
+++ b/tests/run-make/dep-info-doesnt-run-much/foo.rs
diff --git a/tests/run-make-fulldeps/dep-info-spaces/Makefile b/tests/run-make/dep-info-spaces/Makefile
index 0cfe513e490..0cfe513e490 100644
--- a/tests/run-make-fulldeps/dep-info-spaces/Makefile
+++ b/tests/run-make/dep-info-spaces/Makefile
diff --git a/tests/run-make-fulldeps/dep-info-spaces/Makefile.foo b/tests/run-make/dep-info-spaces/Makefile.foo
index 80a5d4333cd..80a5d4333cd 100644
--- a/tests/run-make-fulldeps/dep-info-spaces/Makefile.foo
+++ b/tests/run-make/dep-info-spaces/Makefile.foo
diff --git a/tests/run-make-fulldeps/dep-info-spaces/bar.rs b/tests/run-make/dep-info-spaces/bar.rs
index c5c0bc606cd..c5c0bc606cd 100644
--- a/tests/run-make-fulldeps/dep-info-spaces/bar.rs
+++ b/tests/run-make/dep-info-spaces/bar.rs
diff --git a/tests/run-make-fulldeps/dep-info-spaces/foo foo.rs b/tests/run-make/dep-info-spaces/foo foo.rs
index b76b4321d62..b76b4321d62 100644
--- a/tests/run-make-fulldeps/dep-info-spaces/foo foo.rs
+++ b/tests/run-make/dep-info-spaces/foo foo.rs
diff --git a/tests/run-make-fulldeps/dep-info-spaces/lib.rs b/tests/run-make/dep-info-spaces/lib.rs
index 6264e7b67ec..6264e7b67ec 100644
--- a/tests/run-make-fulldeps/dep-info-spaces/lib.rs
+++ b/tests/run-make/dep-info-spaces/lib.rs
diff --git a/tests/run-make-fulldeps/dep-info/Makefile b/tests/run-make/dep-info/Makefile
index c76f43a8eed..c76f43a8eed 100644
--- a/tests/run-make-fulldeps/dep-info/Makefile
+++ b/tests/run-make/dep-info/Makefile
diff --git a/tests/run-make-fulldeps/dep-info/Makefile.foo b/tests/run-make/dep-info/Makefile.foo
index e5df31f88c1..e5df31f88c1 100644
--- a/tests/run-make-fulldeps/dep-info/Makefile.foo
+++ b/tests/run-make/dep-info/Makefile.foo
diff --git a/tests/run-make-fulldeps/dep-info/bar.rs b/tests/run-make/dep-info/bar.rs
index c5c0bc606cd..c5c0bc606cd 100644
--- a/tests/run-make-fulldeps/dep-info/bar.rs
+++ b/tests/run-make/dep-info/bar.rs
diff --git a/tests/run-make-fulldeps/dep-info/foo.rs b/tests/run-make/dep-info/foo.rs
index b76b4321d62..b76b4321d62 100644
--- a/tests/run-make-fulldeps/dep-info/foo.rs
+++ b/tests/run-make/dep-info/foo.rs
diff --git a/tests/run-make-fulldeps/dep-info/lib.rs b/tests/run-make/dep-info/lib.rs
index eb8631259d4..eb8631259d4 100644
--- a/tests/run-make-fulldeps/dep-info/lib.rs
+++ b/tests/run-make/dep-info/lib.rs
diff --git a/tests/run-make-fulldeps/dep-info/lib2.rs b/tests/run-make/dep-info/lib2.rs
index f4fda9c93c5..f4fda9c93c5 100644
--- a/tests/run-make-fulldeps/dep-info/lib2.rs
+++ b/tests/run-make/dep-info/lib2.rs
diff --git a/tests/run-make-fulldeps/doctests-keep-binaries/Makefile b/tests/run-make/doctests-keep-binaries/Makefile
index 273c8980b02..6254e93d333 100644
--- a/tests/run-make-fulldeps/doctests-keep-binaries/Makefile
+++ b/tests/run-make/doctests-keep-binaries/Makefile
@@ -1,4 +1,5 @@
-include ../../run-make-fulldeps/tools.mk
+# 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-fulldeps/doctests-keep-binaries/t.rs b/tests/run-make/doctests-keep-binaries/t.rs
index c38cf0a0b25..c38cf0a0b25 100644
--- a/tests/run-make-fulldeps/doctests-keep-binaries/t.rs
+++ b/tests/run-make/doctests-keep-binaries/t.rs
diff --git a/tests/run-make/dump-mono-stats/Makefile b/tests/run-make/dump-mono-stats/Makefile
index fe1112fb0a4..196f84be6ec 100644
--- a/tests/run-make/dump-mono-stats/Makefile
+++ b/tests/run-make/dump-mono-stats/Makefile
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 all:
 	$(RUSTC) --crate-type lib foo.rs -Z dump-mono-stats=$(TMPDIR) -Zdump-mono-stats-format=json
diff --git a/tests/run-make-fulldeps/duplicate-output-flavors/Makefile b/tests/run-make/duplicate-output-flavors/Makefile
index e33279966c9..e33279966c9 100644
--- a/tests/run-make-fulldeps/duplicate-output-flavors/Makefile
+++ b/tests/run-make/duplicate-output-flavors/Makefile
diff --git a/tests/run-make-fulldeps/duplicate-output-flavors/foo.rs b/tests/run-make/duplicate-output-flavors/foo.rs
index c1bfaa6cab5..c1bfaa6cab5 100644
--- a/tests/run-make-fulldeps/duplicate-output-flavors/foo.rs
+++ b/tests/run-make/duplicate-output-flavors/foo.rs
diff --git a/tests/run-make-fulldeps/dylib-chain/Makefile b/tests/run-make/dylib-chain/Makefile
index 1139822f4ea..f1fea99c5ee 100644
--- a/tests/run-make-fulldeps/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-fulldeps/dylib-chain/m1.rs b/tests/run-make/dylib-chain/m1.rs
index 08c3f37522c..08c3f37522c 100644
--- a/tests/run-make-fulldeps/dylib-chain/m1.rs
+++ b/tests/run-make/dylib-chain/m1.rs
diff --git a/tests/run-make-fulldeps/dylib-chain/m2.rs b/tests/run-make/dylib-chain/m2.rs
index 62176ddc9f3..62176ddc9f3 100644
--- a/tests/run-make-fulldeps/dylib-chain/m2.rs
+++ b/tests/run-make/dylib-chain/m2.rs
diff --git a/tests/run-make-fulldeps/dylib-chain/m3.rs b/tests/run-make/dylib-chain/m3.rs
index d213aeda9ac..d213aeda9ac 100644
--- a/tests/run-make-fulldeps/dylib-chain/m3.rs
+++ b/tests/run-make/dylib-chain/m3.rs
diff --git a/tests/run-make-fulldeps/dylib-chain/m4.rs b/tests/run-make/dylib-chain/m4.rs
index fa8ec6079de..fa8ec6079de 100644
--- a/tests/run-make-fulldeps/dylib-chain/m4.rs
+++ b/tests/run-make/dylib-chain/m4.rs
diff --git a/tests/run-make/emit-named-files/Makefile b/tests/run-make/emit-named-files/Makefile
index e081fa4793b..2b97b841fc0 100644
--- a/tests/run-make/emit-named-files/Makefile
+++ b/tests/run-make/emit-named-files/Makefile
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 OUT=$(TMPDIR)/emit
 
diff --git a/tests/run-make/emit-path-unhashed/Makefile b/tests/run-make/emit-path-unhashed/Makefile
index c144d4aa92f..74047fe5f86 100644
--- a/tests/run-make/emit-path-unhashed/Makefile
+++ b/tests/run-make/emit-path-unhashed/Makefile
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 OUT=$(TMPDIR)/emit
 
diff --git a/tests/run-make/emit-shared-files/Makefile b/tests/run-make/emit-shared-files/Makefile
index cad0c9e5b81..27c72b00368 100644
--- a/tests/run-make/emit-shared-files/Makefile
+++ b/tests/run-make/emit-shared-files/Makefile
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 INVOCATION_ONLY = $(TMPDIR)/invocation-only
 TOOLCHAIN_ONLY = $(TMPDIR)/toolchain-only
diff --git a/tests/run-make-fulldeps/emit-stack-sizes/Makefile b/tests/run-make/emit-stack-sizes/Makefile
index f636ebd28f2..f636ebd28f2 100644
--- a/tests/run-make-fulldeps/emit-stack-sizes/Makefile
+++ b/tests/run-make/emit-stack-sizes/Makefile
diff --git a/tests/run-make-fulldeps/emit-stack-sizes/foo.rs b/tests/run-make/emit-stack-sizes/foo.rs
index ee51ae32886..ee51ae32886 100644
--- a/tests/run-make-fulldeps/emit-stack-sizes/foo.rs
+++ b/tests/run-make/emit-stack-sizes/foo.rs
diff --git a/tests/run-make-fulldeps/emit/Makefile b/tests/run-make/emit/Makefile
index 78e68bd6111..b3ca0b79fb0 100644
--- a/tests/run-make-fulldeps/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-fulldeps/emit/test-24876.rs b/tests/run-make/emit/test-24876.rs
index 734e2ee4bd4..734e2ee4bd4 100644
--- a/tests/run-make-fulldeps/emit/test-24876.rs
+++ b/tests/run-make/emit/test-24876.rs
diff --git a/tests/run-make-fulldeps/emit/test-26235.rs b/tests/run-make/emit/test-26235.rs
index 07d975f3317..07d975f3317 100644
--- a/tests/run-make-fulldeps/emit/test-26235.rs
+++ b/tests/run-make/emit/test-26235.rs
diff --git a/tests/run-make/env-dep-info/Makefile b/tests/run-make/env-dep-info/Makefile
index 1675a61b167..bc0ffc2df1e 100644
--- a/tests/run-make/env-dep-info/Makefile
+++ b/tests/run-make/env-dep-info/Makefile
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 # FIXME(eddyb) provide `HOST_RUSTC` and `TARGET_RUSTC`
 # instead of hardcoding them everywhere they're needed.
diff --git a/tests/run-make-fulldeps/error-found-staticlib-instead-crate/Makefile b/tests/run-make/error-found-staticlib-instead-crate/Makefile
index 0eae41d720c..0eae41d720c 100644
--- a/tests/run-make-fulldeps/error-found-staticlib-instead-crate/Makefile
+++ b/tests/run-make/error-found-staticlib-instead-crate/Makefile
diff --git a/tests/run-make-fulldeps/error-found-staticlib-instead-crate/bar.rs b/tests/run-make/error-found-staticlib-instead-crate/bar.rs
index fe35f1f8e2e..fe35f1f8e2e 100644
--- a/tests/run-make-fulldeps/error-found-staticlib-instead-crate/bar.rs
+++ b/tests/run-make/error-found-staticlib-instead-crate/bar.rs
diff --git a/tests/run-make-fulldeps/error-found-staticlib-instead-crate/foo.rs b/tests/run-make/error-found-staticlib-instead-crate/foo.rs
index b76b4321d62..b76b4321d62 100644
--- a/tests/run-make-fulldeps/error-found-staticlib-instead-crate/foo.rs
+++ b/tests/run-make/error-found-staticlib-instead-crate/foo.rs
diff --git a/tests/run-make-fulldeps/error-writing-dependencies/Makefile b/tests/run-make/error-writing-dependencies/Makefile
index a5d30a647f8..a5d30a647f8 100644
--- a/tests/run-make-fulldeps/error-writing-dependencies/Makefile
+++ b/tests/run-make/error-writing-dependencies/Makefile
diff --git a/tests/run-make-fulldeps/error-writing-dependencies/foo.rs b/tests/run-make/error-writing-dependencies/foo.rs
index f328e4d9d04..f328e4d9d04 100644
--- a/tests/run-make-fulldeps/error-writing-dependencies/foo.rs
+++ b/tests/run-make/error-writing-dependencies/foo.rs
diff --git a/tests/run-make-fulldeps/exit-code/Makefile b/tests/run-make/exit-code/Makefile
index 3ffaafe9065..6458b71688f 100644
--- a/tests/run-make-fulldeps/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-fulldeps/exit-code/compile-error.rs b/tests/run-make/exit-code/compile-error.rs
index a96c197606c..a96c197606c 100644
--- a/tests/run-make-fulldeps/exit-code/compile-error.rs
+++ b/tests/run-make/exit-code/compile-error.rs
diff --git a/tests/run-make-fulldeps/exit-code/lint-failure.rs b/tests/run-make/exit-code/lint-failure.rs
index df876ec237f..df876ec237f 100644
--- a/tests/run-make-fulldeps/exit-code/lint-failure.rs
+++ b/tests/run-make/exit-code/lint-failure.rs
diff --git a/tests/run-make-fulldeps/exit-code/success.rs b/tests/run-make/exit-code/success.rs
index 55b8e42b6e2..55b8e42b6e2 100644
--- a/tests/run-make-fulldeps/exit-code/success.rs
+++ b/tests/run-make/exit-code/success.rs
diff --git a/tests/run-make/export-executable-symbols/Makefile b/tests/run-make/export-executable-symbols/Makefile
index daa77c99dcd..c4d29aa2bf4 100644
--- a/tests/run-make/export-executable-symbols/Makefile
+++ b/tests/run-make/export-executable-symbols/Makefile
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 # ignore-wasm32
 # ignore-wasm64
diff --git a/tests/run-make-fulldeps/extern-diff-internal-name/Makefile b/tests/run-make/extern-diff-internal-name/Makefile
index 54596c2f029..250f82dfac0 100644
--- a/tests/run-make-fulldeps/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-fulldeps/extern-diff-internal-name/lib.rs b/tests/run-make/extern-diff-internal-name/lib.rs
index ad96f70866e..ad96f70866e 100644
--- a/tests/run-make-fulldeps/extern-diff-internal-name/lib.rs
+++ b/tests/run-make/extern-diff-internal-name/lib.rs
diff --git a/tests/run-make-fulldeps/extern-diff-internal-name/test.rs b/tests/run-make/extern-diff-internal-name/test.rs
index 4c53dc28a80..4c53dc28a80 100644
--- a/tests/run-make-fulldeps/extern-diff-internal-name/test.rs
+++ b/tests/run-make/extern-diff-internal-name/test.rs
diff --git a/tests/run-make-fulldeps/extern-flag-disambiguates/Makefile b/tests/run-make/extern-flag-disambiguates/Makefile
index a8f142a6402..e54a537ecd0 100644
--- a/tests/run-make-fulldeps/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-fulldeps/extern-flag-disambiguates/a.rs b/tests/run-make/extern-flag-disambiguates/a.rs
index 2b1a3190150..2b1a3190150 100644
--- a/tests/run-make-fulldeps/extern-flag-disambiguates/a.rs
+++ b/tests/run-make/extern-flag-disambiguates/a.rs
diff --git a/tests/run-make-fulldeps/extern-flag-disambiguates/b.rs b/tests/run-make/extern-flag-disambiguates/b.rs
index 1d7a7339ce2..1d7a7339ce2 100644
--- a/tests/run-make-fulldeps/extern-flag-disambiguates/b.rs
+++ b/tests/run-make/extern-flag-disambiguates/b.rs
diff --git a/tests/run-make-fulldeps/extern-flag-disambiguates/c.rs b/tests/run-make/extern-flag-disambiguates/c.rs
index 3f9d143ed2d..3f9d143ed2d 100644
--- a/tests/run-make-fulldeps/extern-flag-disambiguates/c.rs
+++ b/tests/run-make/extern-flag-disambiguates/c.rs
diff --git a/tests/run-make-fulldeps/extern-flag-disambiguates/d.rs b/tests/run-make/extern-flag-disambiguates/d.rs
index 249c6a107ff..249c6a107ff 100644
--- a/tests/run-make-fulldeps/extern-flag-disambiguates/d.rs
+++ b/tests/run-make/extern-flag-disambiguates/d.rs
diff --git a/tests/run-make-fulldeps/extern-flag-fun/Makefile b/tests/run-make/extern-flag-fun/Makefile
index a0b7c15edb9..687cdfd7675 100644
--- a/tests/run-make-fulldeps/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-fulldeps/extern-flag-fun/bar-alt.rs b/tests/run-make/extern-flag-fun/bar-alt.rs
index cdc6c27d800..cdc6c27d800 100644
--- a/tests/run-make-fulldeps/extern-flag-fun/bar-alt.rs
+++ b/tests/run-make/extern-flag-fun/bar-alt.rs
diff --git a/tests/run-make-fulldeps/extern-flag-fun/bar.rs b/tests/run-make/extern-flag-fun/bar.rs
index d11c69f812a..d11c69f812a 100644
--- a/tests/run-make-fulldeps/extern-flag-fun/bar.rs
+++ b/tests/run-make/extern-flag-fun/bar.rs
diff --git a/tests/run-make-fulldeps/extern-flag-fun/foo.rs b/tests/run-make/extern-flag-fun/foo.rs
index 0edda7d7b88..0edda7d7b88 100644
--- a/tests/run-make-fulldeps/extern-flag-fun/foo.rs
+++ b/tests/run-make/extern-flag-fun/foo.rs
diff --git a/tests/run-make-fulldeps/extern-flag-fun/gated_unstable.rs b/tests/run-make/extern-flag-fun/gated_unstable.rs
index 03600c830ff..03600c830ff 100644
--- a/tests/run-make-fulldeps/extern-flag-fun/gated_unstable.rs
+++ b/tests/run-make/extern-flag-fun/gated_unstable.rs
diff --git a/tests/run-make-fulldeps/extern-flag-fun/rustc.rs b/tests/run-make/extern-flag-fun/rustc.rs
index b76b4321d62..b76b4321d62 100644
--- a/tests/run-make-fulldeps/extern-flag-fun/rustc.rs
+++ b/tests/run-make/extern-flag-fun/rustc.rs
diff --git a/tests/run-make-fulldeps/extern-flag-pathless/Makefile b/tests/run-make/extern-flag-pathless/Makefile
index 0f23815b650..701bfcd28c8 100644
--- a/tests/run-make-fulldeps/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-fulldeps/extern-flag-pathless/bar-dynamic.rs b/tests/run-make/extern-flag-pathless/bar-dynamic.rs
index e2d68d517ff..e2d68d517ff 100644
--- a/tests/run-make-fulldeps/extern-flag-pathless/bar-dynamic.rs
+++ b/tests/run-make/extern-flag-pathless/bar-dynamic.rs
diff --git a/tests/run-make-fulldeps/extern-flag-pathless/bar-static.rs b/tests/run-make/extern-flag-pathless/bar-static.rs
index 240d8bde4d1..240d8bde4d1 100644
--- a/tests/run-make-fulldeps/extern-flag-pathless/bar-static.rs
+++ b/tests/run-make/extern-flag-pathless/bar-static.rs
diff --git a/tests/run-make-fulldeps/extern-flag-pathless/foo.rs b/tests/run-make/extern-flag-pathless/foo.rs
index 1ea64da7dad..1ea64da7dad 100644
--- a/tests/run-make-fulldeps/extern-flag-pathless/foo.rs
+++ b/tests/run-make/extern-flag-pathless/foo.rs
diff --git a/tests/run-make-fulldeps/extern-flag-rename-transitive/Makefile b/tests/run-make/extern-flag-rename-transitive/Makefile
index d16a8e20868..d16a8e20868 100644
--- a/tests/run-make-fulldeps/extern-flag-rename-transitive/Makefile
+++ b/tests/run-make/extern-flag-rename-transitive/Makefile
diff --git a/tests/run-make-fulldeps/extern-flag-rename-transitive/bar.rs b/tests/run-make/extern-flag-rename-transitive/bar.rs
index 94446a07d6c..94446a07d6c 100644
--- a/tests/run-make-fulldeps/extern-flag-rename-transitive/bar.rs
+++ b/tests/run-make/extern-flag-rename-transitive/bar.rs
diff --git a/tests/run-make-fulldeps/extern-flag-rename-transitive/baz.rs b/tests/run-make/extern-flag-rename-transitive/baz.rs
index c3908db3429..c3908db3429 100644
--- a/tests/run-make-fulldeps/extern-flag-rename-transitive/baz.rs
+++ b/tests/run-make/extern-flag-rename-transitive/baz.rs
diff --git a/tests/run-make-fulldeps/extern-flag-rename-transitive/foo.rs b/tests/run-make/extern-flag-rename-transitive/foo.rs
index c1bfaa6cab5..c1bfaa6cab5 100644
--- a/tests/run-make-fulldeps/extern-flag-rename-transitive/foo.rs
+++ b/tests/run-make/extern-flag-rename-transitive/foo.rs
diff --git a/tests/run-make-fulldeps/extern-fn-generic/Makefile b/tests/run-make/extern-fn-generic/Makefile
index 71746fb10cb..7dceea6cb88 100644
--- a/tests/run-make-fulldeps/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-fulldeps/extern-fn-generic/test.c b/tests/run-make/extern-fn-generic/test.c
index a8504ff2afb..a8504ff2afb 100644
--- a/tests/run-make-fulldeps/extern-fn-generic/test.c
+++ b/tests/run-make/extern-fn-generic/test.c
diff --git a/tests/run-make-fulldeps/extern-fn-generic/test.rs b/tests/run-make/extern-fn-generic/test.rs
index c9baa489881..c9baa489881 100644
--- a/tests/run-make-fulldeps/extern-fn-generic/test.rs
+++ b/tests/run-make/extern-fn-generic/test.rs
diff --git a/tests/run-make-fulldeps/extern-fn-generic/testcrate.rs b/tests/run-make/extern-fn-generic/testcrate.rs
index 39f76e59ca0..39f76e59ca0 100644
--- a/tests/run-make-fulldeps/extern-fn-generic/testcrate.rs
+++ b/tests/run-make/extern-fn-generic/testcrate.rs
diff --git a/tests/run-make-fulldeps/extern-fn-mangle/Makefile b/tests/run-make/extern-fn-mangle/Makefile
index 4f5d026f213..3cbbf383996 100644
--- a/tests/run-make-fulldeps/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-fulldeps/extern-fn-mangle/test.c b/tests/run-make/extern-fn-mangle/test.c
index e94d75083b8..e94d75083b8 100644
--- a/tests/run-make-fulldeps/extern-fn-mangle/test.c
+++ b/tests/run-make/extern-fn-mangle/test.c
diff --git a/tests/run-make-fulldeps/extern-fn-mangle/test.rs b/tests/run-make/extern-fn-mangle/test.rs
index 40b08f1ed70..40b08f1ed70 100644
--- a/tests/run-make-fulldeps/extern-fn-mangle/test.rs
+++ b/tests/run-make/extern-fn-mangle/test.rs
diff --git a/tests/run-make-fulldeps/extern-fn-reachable/Makefile b/tests/run-make/extern-fn-reachable/Makefile
index 05bdb8d65b7..3297251bfd1 100644
--- a/tests/run-make-fulldeps/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-fulldeps/extern-fn-reachable/dylib.rs b/tests/run-make/extern-fn-reachable/dylib.rs
index cd017934870..cd017934870 100644
--- a/tests/run-make-fulldeps/extern-fn-reachable/dylib.rs
+++ b/tests/run-make/extern-fn-reachable/dylib.rs
diff --git a/tests/run-make-fulldeps/extern-fn-struct-passing-abi/Makefile b/tests/run-make/extern-fn-struct-passing-abi/Makefile
index 4f5d026f213..3cbbf383996 100644
--- a/tests/run-make-fulldeps/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-fulldeps/extern-fn-struct-passing-abi/test.c b/tests/run-make/extern-fn-struct-passing-abi/test.c
index 136b07129e1..136b07129e1 100644
--- a/tests/run-make-fulldeps/extern-fn-struct-passing-abi/test.c
+++ b/tests/run-make/extern-fn-struct-passing-abi/test.c
diff --git a/tests/run-make-fulldeps/extern-fn-struct-passing-abi/test.rs b/tests/run-make/extern-fn-struct-passing-abi/test.rs
index afe0f52ef0b..afe0f52ef0b 100644
--- a/tests/run-make-fulldeps/extern-fn-struct-passing-abi/test.rs
+++ b/tests/run-make/extern-fn-struct-passing-abi/test.rs
diff --git a/tests/run-make-fulldeps/extern-fn-with-extern-types/Makefile b/tests/run-make/extern-fn-with-extern-types/Makefile
index 1fa708950d4..07ec503aaae 100644
--- a/tests/run-make-fulldeps/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-fulldeps/extern-fn-with-extern-types/ctest.c b/tests/run-make/extern-fn-with-extern-types/ctest.c
index 3b6fb4cfce9..3b6fb4cfce9 100644
--- a/tests/run-make-fulldeps/extern-fn-with-extern-types/ctest.c
+++ b/tests/run-make/extern-fn-with-extern-types/ctest.c
diff --git a/tests/run-make-fulldeps/extern-fn-with-extern-types/test.rs b/tests/run-make/extern-fn-with-extern-types/test.rs
index 90a6ebaf1aa..90a6ebaf1aa 100644
--- a/tests/run-make-fulldeps/extern-fn-with-extern-types/test.rs
+++ b/tests/run-make/extern-fn-with-extern-types/test.rs
diff --git a/tests/run-make-fulldeps/extern-fn-with-packed-struct/Makefile b/tests/run-make/extern-fn-with-packed-struct/Makefile
index 4f5d026f213..3cbbf383996 100644
--- a/tests/run-make-fulldeps/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-fulldeps/extern-fn-with-packed-struct/test.c b/tests/run-make/extern-fn-with-packed-struct/test.c
index c89f8272b1e..c89f8272b1e 100644
--- a/tests/run-make-fulldeps/extern-fn-with-packed-struct/test.c
+++ b/tests/run-make/extern-fn-with-packed-struct/test.c
diff --git a/tests/run-make-fulldeps/extern-fn-with-packed-struct/test.rs b/tests/run-make/extern-fn-with-packed-struct/test.rs
index 2f261efb510..2f261efb510 100644
--- a/tests/run-make-fulldeps/extern-fn-with-packed-struct/test.rs
+++ b/tests/run-make/extern-fn-with-packed-struct/test.rs
diff --git a/tests/run-make-fulldeps/extern-fn-with-union/Makefile b/tests/run-make/extern-fn-with-union/Makefile
index 40bae923e30..e6c8c993679 100644
--- a/tests/run-make-fulldeps/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-fulldeps/extern-fn-with-union/ctest.c b/tests/run-make/extern-fn-with-union/ctest.c
index 86cb6453723..86cb6453723 100644
--- a/tests/run-make-fulldeps/extern-fn-with-union/ctest.c
+++ b/tests/run-make/extern-fn-with-union/ctest.c
diff --git a/tests/run-make-fulldeps/extern-fn-with-union/test.rs b/tests/run-make/extern-fn-with-union/test.rs
index 438fbddf31f..438fbddf31f 100644
--- a/tests/run-make-fulldeps/extern-fn-with-union/test.rs
+++ b/tests/run-make/extern-fn-with-union/test.rs
diff --git a/tests/run-make-fulldeps/extern-fn-with-union/testcrate.rs b/tests/run-make/extern-fn-with-union/testcrate.rs
index 28d91ff37c3..28d91ff37c3 100644
--- a/tests/run-make-fulldeps/extern-fn-with-union/testcrate.rs
+++ b/tests/run-make/extern-fn-with-union/testcrate.rs
diff --git a/tests/run-make-fulldeps/extern-multiple-copies/Makefile b/tests/run-make/extern-multiple-copies/Makefile
index 00668a6bc88..b0b84278eda 100644
--- a/tests/run-make-fulldeps/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-fulldeps/extern-multiple-copies/bar.rs b/tests/run-make/extern-multiple-copies/bar.rs
index c6b3595f677..c6b3595f677 100644
--- a/tests/run-make-fulldeps/extern-multiple-copies/bar.rs
+++ b/tests/run-make/extern-multiple-copies/bar.rs
diff --git a/tests/run-make-fulldeps/extern-multiple-copies/foo1.rs b/tests/run-make/extern-multiple-copies/foo1.rs
index c1bfaa6cab5..c1bfaa6cab5 100644
--- a/tests/run-make-fulldeps/extern-multiple-copies/foo1.rs
+++ b/tests/run-make/extern-multiple-copies/foo1.rs
diff --git a/tests/run-make-fulldeps/extern-multiple-copies/foo2.rs b/tests/run-make/extern-multiple-copies/foo2.rs
index c1bfaa6cab5..c1bfaa6cab5 100644
--- a/tests/run-make-fulldeps/extern-multiple-copies/foo2.rs
+++ b/tests/run-make/extern-multiple-copies/foo2.rs
diff --git a/tests/run-make-fulldeps/extern-multiple-copies2/Makefile b/tests/run-make/extern-multiple-copies2/Makefile
index 84de2ebf34d..708b1c1b540 100644
--- a/tests/run-make-fulldeps/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-fulldeps/extern-multiple-copies2/bar.rs b/tests/run-make/extern-multiple-copies2/bar.rs
index b3088152d6a..b3088152d6a 100644
--- a/tests/run-make-fulldeps/extern-multiple-copies2/bar.rs
+++ b/tests/run-make/extern-multiple-copies2/bar.rs
diff --git a/tests/run-make-fulldeps/extern-multiple-copies2/foo1.rs b/tests/run-make/extern-multiple-copies2/foo1.rs
index 4c778e52ff4..4c778e52ff4 100644
--- a/tests/run-make-fulldeps/extern-multiple-copies2/foo1.rs
+++ b/tests/run-make/extern-multiple-copies2/foo1.rs
diff --git a/tests/run-make-fulldeps/extern-multiple-copies2/foo2.rs b/tests/run-make/extern-multiple-copies2/foo2.rs
index 2be103507df..2be103507df 100644
--- a/tests/run-make-fulldeps/extern-multiple-copies2/foo2.rs
+++ b/tests/run-make/extern-multiple-copies2/foo2.rs
diff --git a/tests/run-make-fulldeps/extern-overrides-distribution/Makefile b/tests/run-make/extern-overrides-distribution/Makefile
index c57b062cd5d..bfd0dd6991b 100644
--- a/tests/run-make-fulldeps/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-fulldeps/extern-overrides-distribution/libc.rs b/tests/run-make/extern-overrides-distribution/libc.rs
index ee51ae32886..ee51ae32886 100644
--- a/tests/run-make-fulldeps/extern-overrides-distribution/libc.rs
+++ b/tests/run-make/extern-overrides-distribution/libc.rs
diff --git a/tests/run-make-fulldeps/extern-overrides-distribution/main.rs b/tests/run-make/extern-overrides-distribution/main.rs
index 1290a8c5670..1290a8c5670 100644
--- a/tests/run-make-fulldeps/extern-overrides-distribution/main.rs
+++ b/tests/run-make/extern-overrides-distribution/main.rs
diff --git a/tests/run-make-fulldeps/extra-filename-with-temp-outputs/Makefile b/tests/run-make/extra-filename-with-temp-outputs/Makefile
index 470448cf50c..64745bef5b8 100644
--- a/tests/run-make-fulldeps/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-fulldeps/extra-filename-with-temp-outputs/foo.rs b/tests/run-make/extra-filename-with-temp-outputs/foo.rs
index f328e4d9d04..f328e4d9d04 100644
--- a/tests/run-make-fulldeps/extra-filename-with-temp-outputs/foo.rs
+++ b/tests/run-make/extra-filename-with-temp-outputs/foo.rs
diff --git a/tests/run-make/fmt-write-bloat/Makefile b/tests/run-make/fmt-write-bloat/Makefile
index 53615775486..70e04b9af51 100644
--- a/tests/run-make/fmt-write-bloat/Makefile
+++ b/tests/run-make/fmt-write-bloat/Makefile
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 # ignore-windows
 
diff --git a/tests/run-make-fulldeps/foreign-double-unwind/Makefile b/tests/run-make/foreign-double-unwind/Makefile
index ea2fe9ff881..f20fe3ce66e 100644
--- a/tests/run-make-fulldeps/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-fulldeps/foreign-double-unwind/foo.cpp b/tests/run-make/foreign-double-unwind/foo.cpp
index 69a8f11c2db..69a8f11c2db 100644
--- a/tests/run-make-fulldeps/foreign-double-unwind/foo.cpp
+++ b/tests/run-make/foreign-double-unwind/foo.cpp
diff --git a/tests/run-make-fulldeps/foreign-double-unwind/foo.rs b/tests/run-make/foreign-double-unwind/foo.rs
index cae8aa9402d..cae8aa9402d 100644
--- a/tests/run-make-fulldeps/foreign-double-unwind/foo.rs
+++ b/tests/run-make/foreign-double-unwind/foo.rs
diff --git a/tests/run-make-fulldeps/foreign-exceptions/Makefile b/tests/run-make/foreign-exceptions/Makefile
index 38fe2773df2..a8e20ffb1f4 100644
--- a/tests/run-make-fulldeps/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-fulldeps/foreign-exceptions/foo.cpp b/tests/run-make/foreign-exceptions/foo.cpp
index 8182021a2cc..8182021a2cc 100644
--- a/tests/run-make-fulldeps/foreign-exceptions/foo.cpp
+++ b/tests/run-make/foreign-exceptions/foo.cpp
diff --git a/tests/run-make-fulldeps/foreign-exceptions/foo.rs b/tests/run-make/foreign-exceptions/foo.rs
index dd3b7c76f28..dd3b7c76f28 100644
--- a/tests/run-make-fulldeps/foreign-exceptions/foo.rs
+++ b/tests/run-make/foreign-exceptions/foo.rs
diff --git a/tests/run-make-fulldeps/foreign-rust-exceptions/Makefile b/tests/run-make/foreign-rust-exceptions/Makefile
index 50fca7f24e6..0d007bf1c49 100644
--- a/tests/run-make-fulldeps/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-fulldeps/foreign-rust-exceptions/bar.rs b/tests/run-make/foreign-rust-exceptions/bar.rs
index 5f9efe32360..5f9efe32360 100644
--- a/tests/run-make-fulldeps/foreign-rust-exceptions/bar.rs
+++ b/tests/run-make/foreign-rust-exceptions/bar.rs
diff --git a/tests/run-make-fulldeps/foreign-rust-exceptions/foo.rs b/tests/run-make/foreign-rust-exceptions/foo.rs
index 266987c5b6d..266987c5b6d 100644
--- a/tests/run-make-fulldeps/foreign-rust-exceptions/foo.rs
+++ b/tests/run-make/foreign-rust-exceptions/foo.rs
diff --git a/tests/run-make-fulldeps/fpic/Makefile b/tests/run-make/fpic/Makefile
index 5986de3666f..c38dd8d6e8c 100644
--- a/tests/run-make-fulldeps/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-fulldeps/fpic/hello.rs b/tests/run-make/fpic/hello.rs
index 45590d86ba6..45590d86ba6 100644
--- a/tests/run-make-fulldeps/fpic/hello.rs
+++ b/tests/run-make/fpic/hello.rs
diff --git a/tests/run-make-fulldeps/glibc-staticlib-args/Makefile b/tests/run-make/glibc-staticlib-args/Makefile
index 39e64bacf58..cad6c049e45 100644
--- a/tests/run-make-fulldeps/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-fulldeps/glibc-staticlib-args/library.rs b/tests/run-make/glibc-staticlib-args/library.rs
index 5ab627a2ac1..5ab627a2ac1 100644
--- a/tests/run-make-fulldeps/glibc-staticlib-args/library.rs
+++ b/tests/run-make/glibc-staticlib-args/library.rs
diff --git a/tests/run-make-fulldeps/glibc-staticlib-args/program.c b/tests/run-make/glibc-staticlib-args/program.c
index 30f6974b750..30f6974b750 100644
--- a/tests/run-make-fulldeps/glibc-staticlib-args/program.c
+++ b/tests/run-make/glibc-staticlib-args/program.c
diff --git a/tests/run-make-fulldeps/hir-tree/Makefile b/tests/run-make/hir-tree/Makefile
index b0450ea4bc5..b0450ea4bc5 100644
--- a/tests/run-make-fulldeps/hir-tree/Makefile
+++ b/tests/run-make/hir-tree/Makefile
diff --git a/tests/run-make-fulldeps/hir-tree/input.rs b/tests/run-make/hir-tree/input.rs
index 9d1a4e9e47d..9d1a4e9e47d 100644
--- a/tests/run-make-fulldeps/hir-tree/input.rs
+++ b/tests/run-make/hir-tree/input.rs
diff --git a/tests/run-make-fulldeps/include_bytes_deps/Makefile b/tests/run-make/include_bytes_deps/Makefile
index 696dfd207bb..696dfd207bb 100644
--- a/tests/run-make-fulldeps/include_bytes_deps/Makefile
+++ b/tests/run-make/include_bytes_deps/Makefile
diff --git a/tests/run-make-fulldeps/include_bytes_deps/input.bin b/tests/run-make/include_bytes_deps/input.bin
index cd0875583aa..cd0875583aa 100644
--- a/tests/run-make-fulldeps/include_bytes_deps/input.bin
+++ b/tests/run-make/include_bytes_deps/input.bin
diff --git a/tests/run-make-fulldeps/include_bytes_deps/input.md b/tests/run-make/include_bytes_deps/input.md
index 2a19b7405f7..2a19b7405f7 100644
--- a/tests/run-make-fulldeps/include_bytes_deps/input.md
+++ b/tests/run-make/include_bytes_deps/input.md
diff --git a/tests/run-make-fulldeps/include_bytes_deps/input.txt b/tests/run-make/include_bytes_deps/input.txt
index cd0875583aa..cd0875583aa 100644
--- a/tests/run-make-fulldeps/include_bytes_deps/input.txt
+++ b/tests/run-make/include_bytes_deps/input.txt
diff --git a/tests/run-make-fulldeps/include_bytes_deps/main.rs b/tests/run-make/include_bytes_deps/main.rs
index 2fd55699d44..2fd55699d44 100644
--- a/tests/run-make-fulldeps/include_bytes_deps/main.rs
+++ b/tests/run-make/include_bytes_deps/main.rs
diff --git a/tests/run-make-fulldeps/incr-add-rust-src-component/Makefile b/tests/run-make/incr-add-rust-src-component/Makefile
index 5c1d953cc05..fd09c2299f9 100644
--- a/tests/run-make-fulldeps/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-fulldeps/incr-add-rust-src-component/main.rs b/tests/run-make/incr-add-rust-src-component/main.rs
index f6320bcb04a..f6320bcb04a 100644
--- a/tests/run-make-fulldeps/incr-add-rust-src-component/main.rs
+++ b/tests/run-make/incr-add-rust-src-component/main.rs
diff --git a/tests/run-make/incr-foreign-head-span/Makefile b/tests/run-make/incr-foreign-head-span/Makefile
index 712965eaa88..9d6102cdd72 100644
--- a/tests/run-make/incr-foreign-head-span/Makefile
+++ b/tests/run-make/incr-foreign-head-span/Makefile
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 # ignore-none no-std is not supported
 # ignore-nvptx64-nvidia-cuda FIXME: can't find crate for 'std'
diff --git a/tests/run-make/incr-prev-body-beyond-eof/Makefile b/tests/run-make/incr-prev-body-beyond-eof/Makefile
index 24eea3acaea..aa47552f52c 100644
--- a/tests/run-make/incr-prev-body-beyond-eof/Makefile
+++ b/tests/run-make/incr-prev-body-beyond-eof/Makefile
@@ -1,7 +1,7 @@
 # ignore-none no-std is not supported
 # ignore-nvptx64-nvidia-cuda FIXME: can't find crate for `std`
 
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 # Tests that we don't ICE during incremental compilation after modifying a
 # function span such that its previous end line exceeds the number of lines
diff --git a/tests/run-make/incremental-session-fail/Makefile b/tests/run-make/incremental-session-fail/Makefile
index 6ce1370927b..f43eece2eb7 100644
--- a/tests/run-make/incremental-session-fail/Makefile
+++ b/tests/run-make/incremental-session-fail/Makefile
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 SESSION_DIR := $(TMPDIR)/session
 OUTPUT_FILE := $(TMPDIR)/build-output
diff --git a/tests/run-make-fulldeps/inline-always-many-cgu/Makefile b/tests/run-make/inline-always-many-cgu/Makefile
index 9945821db28..9945821db28 100644
--- a/tests/run-make-fulldeps/inline-always-many-cgu/Makefile
+++ b/tests/run-make/inline-always-many-cgu/Makefile
diff --git a/tests/run-make-fulldeps/inline-always-many-cgu/foo.rs b/tests/run-make/inline-always-many-cgu/foo.rs
index 65fe69c16fe..65fe69c16fe 100644
--- a/tests/run-make-fulldeps/inline-always-many-cgu/foo.rs
+++ b/tests/run-make/inline-always-many-cgu/foo.rs
diff --git a/tests/run-make-fulldeps/interdependent-c-libraries/Makefile b/tests/run-make/interdependent-c-libraries/Makefile
index dc5b55a9925..53a696d82bf 100644
--- a/tests/run-make-fulldeps/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-fulldeps/interdependent-c-libraries/bar.c b/tests/run-make/interdependent-c-libraries/bar.c
index 812c9753528..812c9753528 100644
--- a/tests/run-make-fulldeps/interdependent-c-libraries/bar.c
+++ b/tests/run-make/interdependent-c-libraries/bar.c
diff --git a/tests/run-make-fulldeps/interdependent-c-libraries/bar.rs b/tests/run-make/interdependent-c-libraries/bar.rs
index 3c2c3f21814..3c2c3f21814 100644
--- a/tests/run-make-fulldeps/interdependent-c-libraries/bar.rs
+++ b/tests/run-make/interdependent-c-libraries/bar.rs
diff --git a/tests/run-make-fulldeps/interdependent-c-libraries/foo.c b/tests/run-make/interdependent-c-libraries/foo.c
index 85e6cd8c390..85e6cd8c390 100644
--- a/tests/run-make-fulldeps/interdependent-c-libraries/foo.c
+++ b/tests/run-make/interdependent-c-libraries/foo.c
diff --git a/tests/run-make-fulldeps/interdependent-c-libraries/foo.rs b/tests/run-make/interdependent-c-libraries/foo.rs
index a69809726c6..a69809726c6 100644
--- a/tests/run-make-fulldeps/interdependent-c-libraries/foo.rs
+++ b/tests/run-make/interdependent-c-libraries/foo.rs
diff --git a/tests/run-make-fulldeps/interdependent-c-libraries/main.rs b/tests/run-make/interdependent-c-libraries/main.rs
index 2aba427df47..2aba427df47 100644
--- a/tests/run-make-fulldeps/interdependent-c-libraries/main.rs
+++ b/tests/run-make/interdependent-c-libraries/main.rs
diff --git a/tests/run-make-fulldeps/intrinsic-unreachable/Makefile b/tests/run-make/intrinsic-unreachable/Makefile
index ff9cc57098c..ff9cc57098c 100644
--- a/tests/run-make-fulldeps/intrinsic-unreachable/Makefile
+++ b/tests/run-make/intrinsic-unreachable/Makefile
diff --git a/tests/run-make-fulldeps/intrinsic-unreachable/exit-ret.rs b/tests/run-make/intrinsic-unreachable/exit-ret.rs
index e7b9694d9f2..e7b9694d9f2 100644
--- a/tests/run-make-fulldeps/intrinsic-unreachable/exit-ret.rs
+++ b/tests/run-make/intrinsic-unreachable/exit-ret.rs
diff --git a/tests/run-make-fulldeps/intrinsic-unreachable/exit-unreachable.rs b/tests/run-make/intrinsic-unreachable/exit-unreachable.rs
index ec85db733df..ec85db733df 100644
--- a/tests/run-make-fulldeps/intrinsic-unreachable/exit-unreachable.rs
+++ b/tests/run-make/intrinsic-unreachable/exit-unreachable.rs
diff --git a/tests/run-make-fulldeps/invalid-library/Makefile b/tests/run-make/invalid-library/Makefile
index 910d9af7b05..910d9af7b05 100644
--- a/tests/run-make-fulldeps/invalid-library/Makefile
+++ b/tests/run-make/invalid-library/Makefile
diff --git a/tests/run-make-fulldeps/invalid-library/foo.rs b/tests/run-make/invalid-library/foo.rs
index bb7b36c496e..bb7b36c496e 100644
--- a/tests/run-make-fulldeps/invalid-library/foo.rs
+++ b/tests/run-make/invalid-library/foo.rs
diff --git a/tests/run-make/invalid-so/Makefile b/tests/run-make/invalid-so/Makefile
index 5b82ecd207d..e36c7040bc6 100644
--- a/tests/run-make/invalid-so/Makefile
+++ b/tests/run-make/invalid-so/Makefile
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 DYLIB_NAME := $(shell echo | $(RUSTC) --crate-name foo --crate-type dylib --print file-names -)
 
diff --git a/tests/run-make-fulldeps/invalid-staticlib/Makefile b/tests/run-make/invalid-staticlib/Makefile
index 3f0f74ce3cb..3f0f74ce3cb 100644
--- a/tests/run-make-fulldeps/invalid-staticlib/Makefile
+++ b/tests/run-make/invalid-staticlib/Makefile
diff --git a/tests/run-make/issue-10971-temps-dir/Makefile b/tests/run-make/issue-10971-temps-dir/Makefile
index e589bbffe60..6e1649a58d2 100644
--- a/tests/run-make/issue-10971-temps-dir/Makefile
+++ b/tests/run-make/issue-10971-temps-dir/Makefile
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 # Regression test for issue #10971
 # Running two invocations in parallel would overwrite each other's temp files.
diff --git a/tests/run-make-fulldeps/issue-11908/Makefile b/tests/run-make/issue-11908/Makefile
index 47005537e41..38586662fc7 100644
--- a/tests/run-make-fulldeps/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-fulldeps/issue-11908/bar.rs b/tests/run-make/issue-11908/bar.rs
index bb7b36c496e..bb7b36c496e 100644
--- a/tests/run-make-fulldeps/issue-11908/bar.rs
+++ b/tests/run-make/issue-11908/bar.rs
diff --git a/tests/run-make-fulldeps/issue-11908/foo.rs b/tests/run-make/issue-11908/foo.rs
index 82b2dfe9fdb..82b2dfe9fdb 100644
--- a/tests/run-make-fulldeps/issue-11908/foo.rs
+++ b/tests/run-make/issue-11908/foo.rs
diff --git a/tests/run-make-fulldeps/issue-14500/Makefile b/tests/run-make/issue-14500/Makefile
index 52550e57018..eeab48de3b9 100644
--- a/tests/run-make-fulldeps/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-fulldeps/issue-14500/bar.rs b/tests/run-make/issue-14500/bar.rs
index 49af74e1b74..49af74e1b74 100644
--- a/tests/run-make-fulldeps/issue-14500/bar.rs
+++ b/tests/run-make/issue-14500/bar.rs
diff --git a/tests/run-make-fulldeps/issue-14500/foo.c b/tests/run-make/issue-14500/foo.c
index 2353d400df3..2353d400df3 100644
--- a/tests/run-make-fulldeps/issue-14500/foo.c
+++ b/tests/run-make/issue-14500/foo.c
diff --git a/tests/run-make-fulldeps/issue-14500/foo.rs b/tests/run-make/issue-14500/foo.rs
index 7c19c1f2c67..7c19c1f2c67 100644
--- a/tests/run-make-fulldeps/issue-14500/foo.rs
+++ b/tests/run-make/issue-14500/foo.rs
diff --git a/tests/run-make-fulldeps/issue-14698/Makefile b/tests/run-make/issue-14698/Makefile
index a1cfb5abab5..a1cfb5abab5 100644
--- a/tests/run-make-fulldeps/issue-14698/Makefile
+++ b/tests/run-make/issue-14698/Makefile
diff --git a/tests/run-make-fulldeps/issue-14698/foo.rs b/tests/run-make/issue-14698/foo.rs
index f328e4d9d04..f328e4d9d04 100644
--- a/tests/run-make-fulldeps/issue-14698/foo.rs
+++ b/tests/run-make/issue-14698/foo.rs
diff --git a/tests/run-make-fulldeps/issue-15460/Makefile b/tests/run-make/issue-15460/Makefile
index 1648d0c0c9b..a36a085fa6f 100644
--- a/tests/run-make-fulldeps/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-fulldeps/issue-15460/bar.rs b/tests/run-make/issue-15460/bar.rs
index e66aeb6bd39..e66aeb6bd39 100644
--- a/tests/run-make-fulldeps/issue-15460/bar.rs
+++ b/tests/run-make/issue-15460/bar.rs
diff --git a/tests/run-make-fulldeps/issue-15460/foo.c b/tests/run-make/issue-15460/foo.c
index fdf595b574e..fdf595b574e 100644
--- a/tests/run-make-fulldeps/issue-15460/foo.c
+++ b/tests/run-make/issue-15460/foo.c
diff --git a/tests/run-make-fulldeps/issue-15460/foo.rs b/tests/run-make/issue-15460/foo.rs
index b4eaa0b31c5..b4eaa0b31c5 100644
--- a/tests/run-make-fulldeps/issue-15460/foo.rs
+++ b/tests/run-make/issue-15460/foo.rs
diff --git a/tests/run-make-fulldeps/issue-18943/Makefile b/tests/run-make/issue-18943/Makefile
index fc40d756d6f..fc40d756d6f 100644
--- a/tests/run-make-fulldeps/issue-18943/Makefile
+++ b/tests/run-make/issue-18943/Makefile
diff --git a/tests/run-make-fulldeps/issue-18943/foo.rs b/tests/run-make/issue-18943/foo.rs
index d18400dd3a5..d18400dd3a5 100644
--- a/tests/run-make-fulldeps/issue-18943/foo.rs
+++ b/tests/run-make/issue-18943/foo.rs
diff --git a/tests/run-make-fulldeps/issue-20626/Makefile b/tests/run-make/issue-20626/Makefile
index f76f31e794a..63eee910a9c 100644
--- a/tests/run-make-fulldeps/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-fulldeps/issue-20626/foo.rs b/tests/run-make/issue-20626/foo.rs
index a474e234e72..a474e234e72 100644
--- a/tests/run-make-fulldeps/issue-20626/foo.rs
+++ b/tests/run-make/issue-20626/foo.rs
diff --git a/tests/run-make-fulldeps/issue-22131/Makefile b/tests/run-make/issue-22131/Makefile
index 770f4b04ec3..4f33a4659cc 100644
--- a/tests/run-make-fulldeps/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-fulldeps/issue-22131/foo.rs b/tests/run-make/issue-22131/foo.rs
index 33255d76879..33255d76879 100644
--- a/tests/run-make-fulldeps/issue-22131/foo.rs
+++ b/tests/run-make/issue-22131/foo.rs
diff --git a/tests/run-make-fulldeps/issue-24445/Makefile b/tests/run-make/issue-24445/Makefile
index 2a12226a6c0..a13910aa73e 100644
--- a/tests/run-make-fulldeps/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-fulldeps/issue-24445/foo.c b/tests/run-make/issue-24445/foo.c
index bb4036b06e1..bb4036b06e1 100644
--- a/tests/run-make-fulldeps/issue-24445/foo.c
+++ b/tests/run-make/issue-24445/foo.c
diff --git a/tests/run-make-fulldeps/issue-24445/foo.rs b/tests/run-make/issue-24445/foo.rs
index b67f3847cd4..b67f3847cd4 100644
--- a/tests/run-make-fulldeps/issue-24445/foo.rs
+++ b/tests/run-make/issue-24445/foo.rs
diff --git a/tests/run-make/issue-25581/Makefile b/tests/run-make/issue-25581/Makefile
new file mode 100644
index 00000000000..3cbbf383996
--- /dev/null
+++ b/tests/run-make/issue-25581/Makefile
@@ -0,0 +1,6 @@
+# ignore-cross-compile
+include ../tools.mk
+
+all: $(call NATIVE_STATICLIB,test)
+	$(RUSTC) test.rs
+	$(call RUN,test) || exit 1
diff --git a/tests/run-make-fulldeps/issue-25581/test.c b/tests/run-make/issue-25581/test.c
index 52fbf78510a..52fbf78510a 100644
--- a/tests/run-make-fulldeps/issue-25581/test.c
+++ b/tests/run-make/issue-25581/test.c
diff --git a/tests/run-make-fulldeps/issue-25581/test.rs b/tests/run-make/issue-25581/test.rs
index ba6749c9722..ba6749c9722 100644
--- a/tests/run-make-fulldeps/issue-25581/test.rs
+++ b/tests/run-make/issue-25581/test.rs
diff --git a/tests/run-make-fulldeps/issue-26006/Makefile b/tests/run-make/issue-26006/Makefile
index 0ff07302002..b679c121530 100644
--- a/tests/run-make-fulldeps/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-fulldeps/issue-26006/in/libc/lib.rs b/tests/run-make/issue-26006/in/libc/lib.rs
index 23f2bf51800..23f2bf51800 100644
--- a/tests/run-make-fulldeps/issue-26006/in/libc/lib.rs
+++ b/tests/run-make/issue-26006/in/libc/lib.rs
diff --git a/tests/run-make-fulldeps/issue-26006/in/time/lib.rs b/tests/run-make/issue-26006/in/time/lib.rs
index 87f2f824a36..87f2f824a36 100644
--- a/tests/run-make-fulldeps/issue-26006/in/time/lib.rs
+++ b/tests/run-make/issue-26006/in/time/lib.rs
diff --git a/tests/run-make-fulldeps/issue-26092/Makefile b/tests/run-make/issue-26092/Makefile
index 96822e7690b..96822e7690b 100644
--- a/tests/run-make-fulldeps/issue-26092/Makefile
+++ b/tests/run-make/issue-26092/Makefile
diff --git a/tests/run-make-fulldeps/issue-26092/blank.rs b/tests/run-make/issue-26092/blank.rs
index f328e4d9d04..f328e4d9d04 100644
--- a/tests/run-make-fulldeps/issue-26092/blank.rs
+++ b/tests/run-make/issue-26092/blank.rs
diff --git a/tests/run-make-fulldeps/issue-28595/Makefile b/tests/run-make/issue-28595/Makefile
index 30a1d9c560a..258f9788aaf 100644
--- a/tests/run-make-fulldeps/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-fulldeps/issue-28595/a.c b/tests/run-make/issue-28595/a.c
index 7bfd83cca21..7bfd83cca21 100644
--- a/tests/run-make-fulldeps/issue-28595/a.c
+++ b/tests/run-make/issue-28595/a.c
diff --git a/tests/run-make-fulldeps/issue-28595/a.rs b/tests/run-make/issue-28595/a.rs
index 07863cf64d6..07863cf64d6 100644
--- a/tests/run-make-fulldeps/issue-28595/a.rs
+++ b/tests/run-make/issue-28595/a.rs
diff --git a/tests/run-make-fulldeps/issue-28595/b.c b/tests/run-make/issue-28595/b.c
index 6aecb5f9e04..6aecb5f9e04 100644
--- a/tests/run-make-fulldeps/issue-28595/b.c
+++ b/tests/run-make/issue-28595/b.c
diff --git a/tests/run-make-fulldeps/issue-28595/b.rs b/tests/run-make/issue-28595/b.rs
index 1f389859fad..1f389859fad 100644
--- a/tests/run-make-fulldeps/issue-28595/b.rs
+++ b/tests/run-make/issue-28595/b.rs
diff --git a/tests/run-make-fulldeps/issue-28766/Makefile b/tests/run-make/issue-28766/Makefile
index 96d0bdc2b2a..96d0bdc2b2a 100644
--- a/tests/run-make-fulldeps/issue-28766/Makefile
+++ b/tests/run-make/issue-28766/Makefile
diff --git a/tests/run-make-fulldeps/issue-28766/foo.rs b/tests/run-make/issue-28766/foo.rs
index 1dcabe42dc1..1dcabe42dc1 100644
--- a/tests/run-make-fulldeps/issue-28766/foo.rs
+++ b/tests/run-make/issue-28766/foo.rs
diff --git a/tests/run-make-fulldeps/issue-28766/main.rs b/tests/run-make/issue-28766/main.rs
index de12b1fd9dc..de12b1fd9dc 100644
--- a/tests/run-make-fulldeps/issue-28766/main.rs
+++ b/tests/run-make/issue-28766/main.rs
diff --git a/tests/run-make-fulldeps/issue-30063/Makefile b/tests/run-make/issue-30063/Makefile
index e4ede598f7b..8a69ca79f51 100644
--- a/tests/run-make-fulldeps/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-fulldeps/issue-30063/foo.rs b/tests/run-make/issue-30063/foo.rs
index 45590d86ba6..45590d86ba6 100644
--- a/tests/run-make-fulldeps/issue-30063/foo.rs
+++ b/tests/run-make/issue-30063/foo.rs
diff --git a/tests/run-make-fulldeps/issue-33329/Makefile b/tests/run-make/issue-33329/Makefile
index 9c149440d8e..9c149440d8e 100644
--- a/tests/run-make-fulldeps/issue-33329/Makefile
+++ b/tests/run-make/issue-33329/Makefile
diff --git a/tests/run-make-fulldeps/issue-33329/main.rs b/tests/run-make/issue-33329/main.rs
index f328e4d9d04..f328e4d9d04 100644
--- a/tests/run-make-fulldeps/issue-33329/main.rs
+++ b/tests/run-make/issue-33329/main.rs
diff --git a/tests/run-make-fulldeps/issue-35164/Makefile b/tests/run-make/issue-35164/Makefile
index 38aa6f1265f..38aa6f1265f 100644
--- a/tests/run-make-fulldeps/issue-35164/Makefile
+++ b/tests/run-make/issue-35164/Makefile
diff --git a/tests/run-make-fulldeps/issue-35164/main.rs b/tests/run-make/issue-35164/main.rs
index 1333d63224c..1333d63224c 100644
--- a/tests/run-make-fulldeps/issue-35164/main.rs
+++ b/tests/run-make/issue-35164/main.rs
diff --git a/tests/run-make-fulldeps/issue-35164/submodule/mod.rs b/tests/run-make/issue-35164/submodule/mod.rs
index a9045b242fb..a9045b242fb 100644
--- a/tests/run-make-fulldeps/issue-35164/submodule/mod.rs
+++ b/tests/run-make/issue-35164/submodule/mod.rs
diff --git a/tests/run-make/issue-36710/Makefile b/tests/run-make/issue-36710/Makefile
index c6b71f5fbd4..7b91107a234 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
@@ -6,7 +7,7 @@
 #                    (see dist-i586-gnu-i586-i686-musl Dockerfile)
 # ignore-sgx
 
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 all: foo
 	$(call RUN,foo)
diff --git a/tests/run-make-fulldeps/issue-37839/Makefile b/tests/run-make/issue-37839/Makefile
index de50bd71379..6bad27b7bdc 100644
--- a/tests/run-make-fulldeps/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-fulldeps/issue-37839/a.rs b/tests/run-make/issue-37839/a.rs
index b5dffac3ff6..b5dffac3ff6 100644
--- a/tests/run-make-fulldeps/issue-37839/a.rs
+++ b/tests/run-make/issue-37839/a.rs
diff --git a/tests/run-make-fulldeps/issue-37839/b.rs b/tests/run-make/issue-37839/b.rs
index 355d2b16527..355d2b16527 100644
--- a/tests/run-make-fulldeps/issue-37839/b.rs
+++ b/tests/run-make/issue-37839/b.rs
diff --git a/tests/run-make-fulldeps/issue-37839/c.rs b/tests/run-make/issue-37839/c.rs
index 4c7ce01b6a0..4c7ce01b6a0 100644
--- a/tests/run-make-fulldeps/issue-37839/c.rs
+++ b/tests/run-make/issue-37839/c.rs
diff --git a/tests/run-make-fulldeps/issue-37893/Makefile b/tests/run-make/issue-37893/Makefile
index 33a60830e5d..44e4a321a30 100644
--- a/tests/run-make-fulldeps/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-fulldeps/issue-37893/a.rs b/tests/run-make/issue-37893/a.rs
index b5dffac3ff6..b5dffac3ff6 100644
--- a/tests/run-make-fulldeps/issue-37893/a.rs
+++ b/tests/run-make/issue-37893/a.rs
diff --git a/tests/run-make-fulldeps/issue-37893/b.rs b/tests/run-make/issue-37893/b.rs
index 355d2b16527..355d2b16527 100644
--- a/tests/run-make-fulldeps/issue-37893/b.rs
+++ b/tests/run-make/issue-37893/b.rs
diff --git a/tests/run-make-fulldeps/issue-37893/c.rs b/tests/run-make/issue-37893/c.rs
index b9c2155728c..b9c2155728c 100644
--- a/tests/run-make-fulldeps/issue-37893/c.rs
+++ b/tests/run-make/issue-37893/c.rs
diff --git a/tests/run-make-fulldeps/issue-38237/Makefile b/tests/run-make/issue-38237/Makefile
index 75121d04012..80dddc5bd13 100644
--- a/tests/run-make-fulldeps/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-fulldeps/issue-38237/bar.rs b/tests/run-make/issue-38237/bar.rs
index 2b839f3a3b3..2b839f3a3b3 100644
--- a/tests/run-make-fulldeps/issue-38237/bar.rs
+++ b/tests/run-make/issue-38237/bar.rs
diff --git a/tests/run-make-fulldeps/issue-38237/baz.rs b/tests/run-make/issue-38237/baz.rs
index cd2425f9b69..cd2425f9b69 100644
--- a/tests/run-make-fulldeps/issue-38237/baz.rs
+++ b/tests/run-make/issue-38237/baz.rs
diff --git a/tests/run-make-fulldeps/issue-38237/foo.rs b/tests/run-make/issue-38237/foo.rs
index a106e4fde5c..a106e4fde5c 100644
--- a/tests/run-make-fulldeps/issue-38237/foo.rs
+++ b/tests/run-make/issue-38237/foo.rs
diff --git a/tests/run-make-fulldeps/issue-40535/Makefile b/tests/run-make/issue-40535/Makefile
index 155c8825214..155c8825214 100644
--- a/tests/run-make-fulldeps/issue-40535/Makefile
+++ b/tests/run-make/issue-40535/Makefile
diff --git a/tests/run-make-fulldeps/issue-40535/bar.rs b/tests/run-make/issue-40535/bar.rs
index b02b28f59d9..b02b28f59d9 100644
--- a/tests/run-make-fulldeps/issue-40535/bar.rs
+++ b/tests/run-make/issue-40535/bar.rs
diff --git a/tests/run-make-fulldeps/issue-40535/baz.rs b/tests/run-make/issue-40535/baz.rs
index 83be6e807e0..83be6e807e0 100644
--- a/tests/run-make-fulldeps/issue-40535/baz.rs
+++ b/tests/run-make/issue-40535/baz.rs
diff --git a/tests/run-make-fulldeps/issue-40535/foo.rs b/tests/run-make/issue-40535/foo.rs
index 27020266425..27020266425 100644
--- a/tests/run-make-fulldeps/issue-40535/foo.rs
+++ b/tests/run-make/issue-40535/foo.rs
diff --git a/tests/run-make-fulldeps/issue-46239/Makefile b/tests/run-make/issue-46239/Makefile
index a93ef321298..0006ced2515 100644
--- a/tests/run-make-fulldeps/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-fulldeps/issue-46239/main.rs b/tests/run-make/issue-46239/main.rs
index b7df5cf4d81..b7df5cf4d81 100644
--- a/tests/run-make-fulldeps/issue-46239/main.rs
+++ b/tests/run-make/issue-46239/main.rs
diff --git a/tests/run-make/issue-47384/Makefile b/tests/run-make/issue-47384/Makefile
index 0aadf6c88c9..afc77cb275a 100644
--- a/tests/run-make/issue-47384/Makefile
+++ b/tests/run-make/issue-47384/Makefile
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 # only-linux
 # ignore-cross-compile
diff --git a/tests/run-make-fulldeps/issue-47551/Makefile b/tests/run-make/issue-47551/Makefile
index 5a6ac725701..5a6ac725701 100644
--- a/tests/run-make-fulldeps/issue-47551/Makefile
+++ b/tests/run-make/issue-47551/Makefile
diff --git a/tests/run-make-fulldeps/issue-47551/eh_frame-terminator.rs b/tests/run-make/issue-47551/eh_frame-terminator.rs
index a2c7a31b7c3..a2c7a31b7c3 100644
--- a/tests/run-make-fulldeps/issue-47551/eh_frame-terminator.rs
+++ b/tests/run-make/issue-47551/eh_frame-terminator.rs
diff --git a/tests/run-make-fulldeps/issue-51671/Makefile b/tests/run-make/issue-51671/Makefile
index c9364536992..c9364536992 100644
--- a/tests/run-make-fulldeps/issue-51671/Makefile
+++ b/tests/run-make/issue-51671/Makefile
diff --git a/tests/run-make-fulldeps/issue-51671/app.rs b/tests/run-make/issue-51671/app.rs
index e9dc1e9744f..e9dc1e9744f 100644
--- a/tests/run-make-fulldeps/issue-51671/app.rs
+++ b/tests/run-make/issue-51671/app.rs
diff --git a/tests/run-make-fulldeps/issue-53964/Makefile b/tests/run-make/issue-53964/Makefile
index 6bd83021374..6bd83021374 100644
--- a/tests/run-make-fulldeps/issue-53964/Makefile
+++ b/tests/run-make/issue-53964/Makefile
diff --git a/tests/run-make-fulldeps/issue-53964/app.rs b/tests/run-make/issue-53964/app.rs
index 8127b9578bf..8127b9578bf 100644
--- a/tests/run-make-fulldeps/issue-53964/app.rs
+++ b/tests/run-make/issue-53964/app.rs
diff --git a/tests/run-make-fulldeps/issue-53964/panic.rs b/tests/run-make/issue-53964/panic.rs
index a8781205071..a8781205071 100644
--- a/tests/run-make-fulldeps/issue-53964/panic.rs
+++ b/tests/run-make/issue-53964/panic.rs
diff --git a/tests/run-make-fulldeps/issue-64153/Makefile b/tests/run-make/issue-64153/Makefile
index f42ea620fb9..f42ea620fb9 100644
--- a/tests/run-make-fulldeps/issue-64153/Makefile
+++ b/tests/run-make/issue-64153/Makefile
diff --git a/tests/run-make-fulldeps/issue-64153/downstream.rs b/tests/run-make/issue-64153/downstream.rs
index e03704665d4..e03704665d4 100644
--- a/tests/run-make-fulldeps/issue-64153/downstream.rs
+++ b/tests/run-make/issue-64153/downstream.rs
diff --git a/tests/run-make-fulldeps/issue-64153/upstream.rs b/tests/run-make/issue-64153/upstream.rs
index 861a00298ea..861a00298ea 100644
--- a/tests/run-make-fulldeps/issue-64153/upstream.rs
+++ b/tests/run-make/issue-64153/upstream.rs
diff --git a/tests/run-make-fulldeps/issue-68794-textrel-on-minimal-lib/Makefile b/tests/run-make/issue-68794-textrel-on-minimal-lib/Makefile
index 13983f4ffe0..6140b39c0e2 100644
--- a/tests/run-make-fulldeps/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-fulldeps/issue-68794-textrel-on-minimal-lib/bar.c b/tests/run-make/issue-68794-textrel-on-minimal-lib/bar.c
index bb4036b06e1..bb4036b06e1 100644
--- a/tests/run-make-fulldeps/issue-68794-textrel-on-minimal-lib/bar.c
+++ b/tests/run-make/issue-68794-textrel-on-minimal-lib/bar.c
diff --git a/tests/run-make-fulldeps/issue-68794-textrel-on-minimal-lib/foo.rs b/tests/run-make/issue-68794-textrel-on-minimal-lib/foo.rs
index a3e865b638e..a3e865b638e 100644
--- a/tests/run-make-fulldeps/issue-68794-textrel-on-minimal-lib/foo.rs
+++ b/tests/run-make/issue-68794-textrel-on-minimal-lib/foo.rs
diff --git a/tests/run-make-fulldeps/issue-69368/Makefile b/tests/run-make/issue-69368/Makefile
index 41770475db0..b1229d1b07f 100644
--- a/tests/run-make-fulldeps/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-fulldeps/issue-69368/a.rs b/tests/run-make/issue-69368/a.rs
index a54f429550e..a54f429550e 100644
--- a/tests/run-make-fulldeps/issue-69368/a.rs
+++ b/tests/run-make/issue-69368/a.rs
diff --git a/tests/run-make-fulldeps/issue-69368/b.rs b/tests/run-make/issue-69368/b.rs
index 4d6af026656..4d6af026656 100644
--- a/tests/run-make-fulldeps/issue-69368/b.rs
+++ b/tests/run-make/issue-69368/b.rs
diff --git a/tests/run-make-fulldeps/issue-69368/c.rs b/tests/run-make/issue-69368/c.rs
index 729c4249a05..729c4249a05 100644
--- a/tests/run-make-fulldeps/issue-69368/c.rs
+++ b/tests/run-make/issue-69368/c.rs
diff --git a/tests/run-make/issue-71519/Makefile b/tests/run-make/issue-71519/Makefile
index 57497f52053..0ee83328bb6 100644
--- a/tests/run-make/issue-71519/Makefile
+++ b/tests/run-make/issue-71519/Makefile
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 # ignore-msvc
 # needs-rust-lld
diff --git a/tests/run-make-fulldeps/issue-7349/Makefile b/tests/run-make/issue-7349/Makefile
index dc073b77fe1..dc073b77fe1 100644
--- a/tests/run-make-fulldeps/issue-7349/Makefile
+++ b/tests/run-make/issue-7349/Makefile
diff --git a/tests/run-make-fulldeps/issue-7349/foo.rs b/tests/run-make/issue-7349/foo.rs
index 246a1259580..246a1259580 100644
--- a/tests/run-make-fulldeps/issue-7349/foo.rs
+++ b/tests/run-make/issue-7349/foo.rs
diff --git a/tests/run-make-fulldeps/issue-83045/Makefile b/tests/run-make/issue-83045/Makefile
index fc180ccfe28..7053da00f6b 100644
--- a/tests/run-make-fulldeps/issue-83045/Makefile
+++ b/tests/run-make/issue-83045/Makefile
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 # This test case creates a situation where the crate loader would run
 # into an ICE when confronted with an invalid setup where it cannot
diff --git a/tests/run-make-fulldeps/issue-83045/a.rs b/tests/run-make/issue-83045/a.rs
index 66d9f758e9d..66d9f758e9d 100644
--- a/tests/run-make-fulldeps/issue-83045/a.rs
+++ b/tests/run-make/issue-83045/a.rs
diff --git a/tests/run-make-fulldeps/issue-83045/b.rs b/tests/run-make/issue-83045/b.rs
index f4876cfa457..f4876cfa457 100644
--- a/tests/run-make-fulldeps/issue-83045/b.rs
+++ b/tests/run-make/issue-83045/b.rs
diff --git a/tests/run-make-fulldeps/issue-83045/c.rs b/tests/run-make/issue-83045/c.rs
index e0c4525499e..e0c4525499e 100644
--- a/tests/run-make-fulldeps/issue-83045/c.rs
+++ b/tests/run-make/issue-83045/c.rs
diff --git a/tests/run-make/issue-83112-incr-test-moved-file/Makefile b/tests/run-make/issue-83112-incr-test-moved-file/Makefile
index 2f796e5b2fc..a00088cd9d6 100644
--- a/tests/run-make/issue-83112-incr-test-moved-file/Makefile
+++ b/tests/run-make/issue-83112-incr-test-moved-file/Makefile
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 # ignore-none no-std is not supported
 # ignore-nvptx64-nvidia-cuda FIXME: can't find crate for 'std'
diff --git a/tests/run-make-fulldeps/issue-84395-lto-embed-bitcode/Makefile b/tests/run-make/issue-84395-lto-embed-bitcode/Makefile
index 879ce174339..95c8d08a18b 100644
--- a/tests/run-make-fulldeps/issue-84395-lto-embed-bitcode/Makefile
+++ b/tests/run-make/issue-84395-lto-embed-bitcode/Makefile
@@ -3,7 +3,7 @@
 # This test makes sure the embed bitcode in elf created with
 # lto-embed-bitcode=optimized is valid llvm BC module.
 
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 all:
 	$(RUSTC) test.rs --target $(TARGET) -Clink-arg=-fuse-ld=lld -Clinker-plugin-lto -Clinker=$(CLANG) -Clink-arg=-Wl,--plugin-opt=-lto-embed-bitcode=optimized -Zemit-thin-lto=no
diff --git a/tests/run-make-fulldeps/issue-84395-lto-embed-bitcode/test.rs b/tests/run-make/issue-84395-lto-embed-bitcode/test.rs
index 47ad8c63411..47ad8c63411 100644
--- a/tests/run-make-fulldeps/issue-84395-lto-embed-bitcode/test.rs
+++ b/tests/run-make/issue-84395-lto-embed-bitcode/test.rs
diff --git a/tests/run-make/issue-85019-moved-src-dir/Makefile b/tests/run-make/issue-85019-moved-src-dir/Makefile
index 3606d4fdf57..dec289058f9 100644
--- a/tests/run-make/issue-85019-moved-src-dir/Makefile
+++ b/tests/run-make/issue-85019-moved-src-dir/Makefile
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 INCR=$(TMPDIR)/incr
 FIRST_SRC=$(TMPDIR)/first_src
diff --git a/tests/run-make/issue-85401-static-mir/Makefile b/tests/run-make/issue-85401-static-mir/Makefile
index 99590166bca..47a36b6e453 100644
--- a/tests/run-make/issue-85401-static-mir/Makefile
+++ b/tests/run-make/issue-85401-static-mir/Makefile
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 # Regression test for issue #85401
 # Verify that we do not ICE when trying to access MIR for statics,
diff --git a/tests/run-make/issue-85441/Makefile b/tests/run-make/issue-85441/Makefile
index f04b07d51fa..987d7f7d4a7 100644
--- a/tests/run-make/issue-85441/Makefile
+++ b/tests/run-make/issue-85441/Makefile
@@ -1,6 +1,6 @@
 # only-windows-msvc
 
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 # Tests that WS2_32.dll is not unnecessarily linked, see issue #85441
 
diff --git a/tests/run-make/issue-88756-default-output/Makefile b/tests/run-make/issue-88756-default-output/Makefile
index 275c35c2629..d1c3d0fe082 100644
--- a/tests/run-make/issue-88756-default-output/Makefile
+++ b/tests/run-make/issue-88756-default-output/Makefile
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 all:
 	$(BARE_RUSTDOC) 2>&1 | sed -E 's@/nightly/|/beta/|/stable/|/1\.[0-9]+\.[0-9]+/@/$$CHANNEL/@g' | diff - output-default.stdout
diff --git a/tests/run-make/issue-96498/Makefile b/tests/run-make/issue-96498/Makefile
index ce2b1b1ff7c..efdd328c671 100644
--- a/tests/run-make/issue-96498/Makefile
+++ b/tests/run-make/issue-96498/Makefile
@@ -1,7 +1,7 @@
 # only-windows
 # needs-rust-lld
 
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 # Ensure that LLD can link
 all:
diff --git a/tests/run-make-fulldeps/issue-97463-abi-param-passing/Makefile b/tests/run-make/issue-97463-abi-param-passing/Makefile
index db1b53e152e..7ce7aaeec57 100644
--- a/tests/run-make-fulldeps/issue-97463-abi-param-passing/Makefile
+++ b/tests/run-make/issue-97463-abi-param-passing/Makefile
@@ -1,4 +1,5 @@
--include ../tools.mk
+# ignore-cross-compile
+include ../tools.mk
 
 # ignore-msvc
 
diff --git a/tests/run-make-fulldeps/issue-97463-abi-param-passing/bad.c b/tests/run-make/issue-97463-abi-param-passing/bad.c
index 013314ab20d..013314ab20d 100644
--- a/tests/run-make-fulldeps/issue-97463-abi-param-passing/bad.c
+++ b/tests/run-make/issue-97463-abi-param-passing/bad.c
diff --git a/tests/run-make-fulldeps/issue-97463-abi-param-passing/param_passing.rs b/tests/run-make/issue-97463-abi-param-passing/param_passing.rs
index c11f3cc72bd..c11f3cc72bd 100644
--- a/tests/run-make-fulldeps/issue-97463-abi-param-passing/param_passing.rs
+++ b/tests/run-make/issue-97463-abi-param-passing/param_passing.rs
diff --git a/tests/run-make-fulldeps/issue64319/Makefile b/tests/run-make/issue64319/Makefile
index ee0d177abc9..56346cbcc15 100644
--- a/tests/run-make-fulldeps/issue64319/Makefile
+++ b/tests/run-make/issue64319/Makefile
@@ -1,4 +1,5 @@
-include ../../run-make-fulldeps/tools.mk
+# ignore-cross-compile
+include ../tools.mk
 
 # Different optimization levels imply different values for `-Zshare-generics`,
 # so try out a whole bunch of combinations to make sure everything is compatible
diff --git a/tests/run-make-fulldeps/issue64319/bar.rs b/tests/run-make/issue64319/bar.rs
index 3895c0b6cdb..3895c0b6cdb 100644
--- a/tests/run-make-fulldeps/issue64319/bar.rs
+++ b/tests/run-make/issue64319/bar.rs
diff --git a/tests/run-make-fulldeps/issue64319/foo.rs b/tests/run-make/issue64319/foo.rs
index c54a238e9ad..c54a238e9ad 100644
--- a/tests/run-make-fulldeps/issue64319/foo.rs
+++ b/tests/run-make/issue64319/foo.rs
diff --git a/tests/run-make/jobserver-error/Makefile b/tests/run-make/jobserver-error/Makefile
index 3b9104fc354..39946ae5edb 100644
--- a/tests/run-make/jobserver-error/Makefile
+++ b/tests/run-make/jobserver-error/Makefile
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 # only-linux
 
diff --git a/tests/run-make-fulldeps/libs-through-symlinks/Makefile b/tests/run-make/libs-through-symlinks/Makefile
index 45deaecb840..592eae663a4 100644
--- a/tests/run-make-fulldeps/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-fulldeps/libs-through-symlinks/bar.rs b/tests/run-make/libs-through-symlinks/bar.rs
index bb7b36c496e..bb7b36c496e 100644
--- a/tests/run-make-fulldeps/libs-through-symlinks/bar.rs
+++ b/tests/run-make/libs-through-symlinks/bar.rs
diff --git a/tests/run-make-fulldeps/libs-through-symlinks/foo.rs b/tests/run-make/libs-through-symlinks/foo.rs
index 8e3df2c6d4e..8e3df2c6d4e 100644
--- a/tests/run-make-fulldeps/libs-through-symlinks/foo.rs
+++ b/tests/run-make/libs-through-symlinks/foo.rs
diff --git a/tests/run-make-fulldeps/libtest-json/Makefile b/tests/run-make/libtest-json/Makefile
index 37b6cb9e2d4..417637cf072 100644
--- a/tests/run-make-fulldeps/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-fulldeps/libtest-json/f.rs b/tests/run-make/libtest-json/f.rs
index edfe25086ae..edfe25086ae 100644
--- a/tests/run-make-fulldeps/libtest-json/f.rs
+++ b/tests/run-make/libtest-json/f.rs
diff --git a/tests/run-make-fulldeps/libtest-json/output-default.json b/tests/run-make/libtest-json/output-default.json
index ad22b66eda6..ad22b66eda6 100644
--- a/tests/run-make-fulldeps/libtest-json/output-default.json
+++ b/tests/run-make/libtest-json/output-default.json
diff --git a/tests/run-make-fulldeps/libtest-json/output-stdout-success.json b/tests/run-make/libtest-json/output-stdout-success.json
index ec98172eb1c..ec98172eb1c 100644
--- a/tests/run-make-fulldeps/libtest-json/output-stdout-success.json
+++ b/tests/run-make/libtest-json/output-stdout-success.json
diff --git a/tests/run-make-fulldeps/libtest-json/validate_json.py b/tests/run-make/libtest-json/validate_json.py
index 657f732f2bf..657f732f2bf 100755
--- a/tests/run-make-fulldeps/libtest-json/validate_json.py
+++ b/tests/run-make/libtest-json/validate_json.py
diff --git a/tests/run-make/libtest-thread-limit/Makefile b/tests/run-make/libtest-thread-limit/Makefile
index d43a89e60ca..9496fa30159 100644
--- a/tests/run-make/libtest-thread-limit/Makefile
+++ b/tests/run-make/libtest-thread-limit/Makefile
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 # only-linux
 
diff --git a/tests/run-make-fulldeps/link-arg/Makefile b/tests/run-make/link-arg/Makefile
index 103527c3e14..103527c3e14 100644
--- a/tests/run-make-fulldeps/link-arg/Makefile
+++ b/tests/run-make/link-arg/Makefile
diff --git a/tests/run-make-fulldeps/link-arg/empty.rs b/tests/run-make/link-arg/empty.rs
index 45590d86ba6..45590d86ba6 100644
--- a/tests/run-make-fulldeps/link-arg/empty.rs
+++ b/tests/run-make/link-arg/empty.rs
diff --git a/tests/run-make-fulldeps/link-args-order/Makefile b/tests/run-make/link-args-order/Makefile
index c562cc1b396..c562cc1b396 100644
--- a/tests/run-make-fulldeps/link-args-order/Makefile
+++ b/tests/run-make/link-args-order/Makefile
diff --git a/tests/run-make-fulldeps/link-args-order/empty.rs b/tests/run-make/link-args-order/empty.rs
index f328e4d9d04..f328e4d9d04 100644
--- a/tests/run-make-fulldeps/link-args-order/empty.rs
+++ b/tests/run-make/link-args-order/empty.rs
diff --git a/tests/run-make-fulldeps/link-cfg/Makefile b/tests/run-make/link-cfg/Makefile
index 0b25ccded06..a4099701144 100644
--- a/tests/run-make-fulldeps/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-fulldeps/link-cfg/dep-with-staticlib.rs b/tests/run-make/link-cfg/dep-with-staticlib.rs
index 5ad66475d00..5ad66475d00 100644
--- a/tests/run-make-fulldeps/link-cfg/dep-with-staticlib.rs
+++ b/tests/run-make/link-cfg/dep-with-staticlib.rs
diff --git a/tests/run-make-fulldeps/link-cfg/dep.rs b/tests/run-make/link-cfg/dep.rs
index 40de77f05b3..40de77f05b3 100644
--- a/tests/run-make-fulldeps/link-cfg/dep.rs
+++ b/tests/run-make/link-cfg/dep.rs
diff --git a/tests/run-make-fulldeps/link-cfg/no-deps.rs b/tests/run-make/link-cfg/no-deps.rs
index ba5a8711a26..ba5a8711a26 100644
--- a/tests/run-make-fulldeps/link-cfg/no-deps.rs
+++ b/tests/run-make/link-cfg/no-deps.rs
diff --git a/tests/run-make-fulldeps/link-cfg/return1.c b/tests/run-make/link-cfg/return1.c
index 41c2809ade3..41c2809ade3 100644
--- a/tests/run-make-fulldeps/link-cfg/return1.c
+++ b/tests/run-make/link-cfg/return1.c
diff --git a/tests/run-make-fulldeps/link-cfg/return2.c b/tests/run-make/link-cfg/return2.c
index 622aeaa294c..622aeaa294c 100644
--- a/tests/run-make-fulldeps/link-cfg/return2.c
+++ b/tests/run-make/link-cfg/return2.c
diff --git a/tests/run-make-fulldeps/link-cfg/return3.c b/tests/run-make/link-cfg/return3.c
index f29dc60d5e8..f29dc60d5e8 100644
--- a/tests/run-make-fulldeps/link-cfg/return3.c
+++ b/tests/run-make/link-cfg/return3.c
diff --git a/tests/run-make-fulldeps/link-cfg/with-deps.rs b/tests/run-make/link-cfg/with-deps.rs
index 48b7828152e..48b7828152e 100644
--- a/tests/run-make-fulldeps/link-cfg/with-deps.rs
+++ b/tests/run-make/link-cfg/with-deps.rs
diff --git a/tests/run-make-fulldeps/link-cfg/with-staticlib-deps.rs b/tests/run-make/link-cfg/with-staticlib-deps.rs
index 23e5926a73c..23e5926a73c 100644
--- a/tests/run-make-fulldeps/link-cfg/with-staticlib-deps.rs
+++ b/tests/run-make/link-cfg/with-staticlib-deps.rs
diff --git a/tests/run-make-fulldeps/link-dedup/Makefile b/tests/run-make/link-dedup/Makefile
index eff18ab48ab..eff18ab48ab 100644
--- a/tests/run-make-fulldeps/link-dedup/Makefile
+++ b/tests/run-make/link-dedup/Makefile
diff --git a/tests/run-make-fulldeps/link-dedup/depa.rs b/tests/run-make/link-dedup/depa.rs
index 19178c5bd49..19178c5bd49 100644
--- a/tests/run-make-fulldeps/link-dedup/depa.rs
+++ b/tests/run-make/link-dedup/depa.rs
diff --git a/tests/run-make-fulldeps/link-dedup/depb.rs b/tests/run-make/link-dedup/depb.rs
index b1be21fe005..b1be21fe005 100644
--- a/tests/run-make-fulldeps/link-dedup/depb.rs
+++ b/tests/run-make/link-dedup/depb.rs
diff --git a/tests/run-make-fulldeps/link-dedup/depc.rs b/tests/run-make/link-dedup/depc.rs
index 8dcb3dee5a2..8dcb3dee5a2 100644
--- a/tests/run-make-fulldeps/link-dedup/depc.rs
+++ b/tests/run-make/link-dedup/depc.rs
diff --git a/tests/run-make-fulldeps/link-dedup/empty.rs b/tests/run-make/link-dedup/empty.rs
index e00ae18f4af..e00ae18f4af 100644
--- a/tests/run-make-fulldeps/link-dedup/empty.rs
+++ b/tests/run-make/link-dedup/empty.rs
diff --git a/tests/run-make-fulldeps/link-path-order/Makefile b/tests/run-make/link-path-order/Makefile
index ed7c299e61a..a3831a63ac7 100644
--- a/tests/run-make-fulldeps/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-fulldeps/link-path-order/correct.c b/tests/run-make/link-path-order/correct.c
index 3064af952f8..3064af952f8 100644
--- a/tests/run-make-fulldeps/link-path-order/correct.c
+++ b/tests/run-make/link-path-order/correct.c
diff --git a/tests/run-make-fulldeps/link-path-order/main.rs b/tests/run-make/link-path-order/main.rs
index 8024e343d19..8024e343d19 100644
--- a/tests/run-make-fulldeps/link-path-order/main.rs
+++ b/tests/run-make/link-path-order/main.rs
diff --git a/tests/run-make-fulldeps/link-path-order/wrong.c b/tests/run-make/link-path-order/wrong.c
index 64275b3ad6b..64275b3ad6b 100644
--- a/tests/run-make-fulldeps/link-path-order/wrong.c
+++ b/tests/run-make/link-path-order/wrong.c
diff --git a/tests/run-make-fulldeps/linkage-attr-on-static/Makefile b/tests/run-make/linkage-attr-on-static/Makefile
index 7cc54e40a3a..ef50a7ef9f1 100644
--- a/tests/run-make-fulldeps/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-fulldeps/linkage-attr-on-static/bar.rs b/tests/run-make/linkage-attr-on-static/bar.rs
index 68607cbb657..68607cbb657 100644
--- a/tests/run-make-fulldeps/linkage-attr-on-static/bar.rs
+++ b/tests/run-make/linkage-attr-on-static/bar.rs
diff --git a/tests/run-make-fulldeps/linkage-attr-on-static/foo.c b/tests/run-make/linkage-attr-on-static/foo.c
index 78a6934f57f..78a6934f57f 100644
--- a/tests/run-make-fulldeps/linkage-attr-on-static/foo.c
+++ b/tests/run-make/linkage-attr-on-static/foo.c
diff --git a/tests/run-make/llvm-outputs/Makefile b/tests/run-make/llvm-outputs/Makefile
index a3f25eba0b2..cccf1dd66fb 100644
--- a/tests/run-make/llvm-outputs/Makefile
+++ b/tests/run-make/llvm-outputs/Makefile
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 all:
 	echo 'fn main() {}' | $(BARE_RUSTC) - --out-dir=$(TMPDIR)/random_directory_that_does_not_exist_ir/ --emit=llvm-ir
diff --git a/tests/run-make-fulldeps/long-linker-command-lines-cmd-exe/Makefile b/tests/run-make/long-linker-command-lines-cmd-exe/Makefile
index a38f4fe5dc5..e43aab7f8e0 100644
--- a/tests/run-make-fulldeps/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-fulldeps/long-linker-command-lines-cmd-exe/foo.bat b/tests/run-make/long-linker-command-lines-cmd-exe/foo.bat
index a9350f12bbb..a9350f12bbb 100644
--- a/tests/run-make-fulldeps/long-linker-command-lines-cmd-exe/foo.bat
+++ b/tests/run-make/long-linker-command-lines-cmd-exe/foo.bat
diff --git a/tests/run-make-fulldeps/long-linker-command-lines-cmd-exe/foo.rs b/tests/run-make/long-linker-command-lines-cmd-exe/foo.rs
index 74d7b9b07f6..74d7b9b07f6 100644
--- a/tests/run-make-fulldeps/long-linker-command-lines-cmd-exe/foo.rs
+++ b/tests/run-make/long-linker-command-lines-cmd-exe/foo.rs
diff --git a/tests/run-make-fulldeps/long-linker-command-lines/Makefile b/tests/run-make/long-linker-command-lines/Makefile
index 00199ca970d..f864ea74f4a 100644
--- a/tests/run-make-fulldeps/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-fulldeps/long-linker-command-lines/foo.rs b/tests/run-make/long-linker-command-lines/foo.rs
index db238c0cf1a..db238c0cf1a 100644
--- a/tests/run-make-fulldeps/long-linker-command-lines/foo.rs
+++ b/tests/run-make/long-linker-command-lines/foo.rs
diff --git a/tests/run-make-fulldeps/longjmp-across-rust/Makefile b/tests/run-make/longjmp-across-rust/Makefile
index 848638d82dd..5fd2d4f855f 100644
--- a/tests/run-make-fulldeps/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-fulldeps/longjmp-across-rust/foo.c b/tests/run-make/longjmp-across-rust/foo.c
index bd71cc4d777..bd71cc4d777 100644
--- a/tests/run-make-fulldeps/longjmp-across-rust/foo.c
+++ b/tests/run-make/longjmp-across-rust/foo.c
diff --git a/tests/run-make-fulldeps/longjmp-across-rust/main.rs b/tests/run-make/longjmp-across-rust/main.rs
index cc1d5b126dd..cc1d5b126dd 100644
--- a/tests/run-make-fulldeps/longjmp-across-rust/main.rs
+++ b/tests/run-make/longjmp-across-rust/main.rs
diff --git a/tests/run-make-fulldeps/ls-metadata/Makefile b/tests/run-make/ls-metadata/Makefile
index e0f916a248e..123dd64e15c 100644
--- a/tests/run-make-fulldeps/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-fulldeps/ls-metadata/foo.rs b/tests/run-make/ls-metadata/foo.rs
index f328e4d9d04..f328e4d9d04 100644
--- a/tests/run-make-fulldeps/ls-metadata/foo.rs
+++ b/tests/run-make/ls-metadata/foo.rs
diff --git a/tests/run-make-fulldeps/lto-dylib-dep/Makefile b/tests/run-make/lto-dylib-dep/Makefile
index 41487b23c74..a9344597d08 100644
--- a/tests/run-make-fulldeps/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-fulldeps/lto-dylib-dep/a_dylib.rs b/tests/run-make/lto-dylib-dep/a_dylib.rs
index e63457e6eb9..e63457e6eb9 100644
--- a/tests/run-make-fulldeps/lto-dylib-dep/a_dylib.rs
+++ b/tests/run-make/lto-dylib-dep/a_dylib.rs
diff --git a/tests/run-make-fulldeps/lto-dylib-dep/main.rs b/tests/run-make/lto-dylib-dep/main.rs
index 4fb3c4730b2..4fb3c4730b2 100644
--- a/tests/run-make-fulldeps/lto-dylib-dep/main.rs
+++ b/tests/run-make/lto-dylib-dep/main.rs
diff --git a/tests/run-make-fulldeps/lto-empty/Makefile b/tests/run-make/lto-empty/Makefile
index b4345ba1883..1b795c4b738 100644
--- a/tests/run-make-fulldeps/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-fulldeps/lto-empty/lib.rs b/tests/run-make/lto-empty/lib.rs
index e3663c79078..e3663c79078 100644
--- a/tests/run-make-fulldeps/lto-empty/lib.rs
+++ b/tests/run-make/lto-empty/lib.rs
diff --git a/tests/run-make-fulldeps/lto-no-link-whole-rlib/Makefile b/tests/run-make/lto-no-link-whole-rlib/Makefile
index e576ee37cf7..3e82322e72d 100644
--- a/tests/run-make-fulldeps/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-fulldeps/lto-no-link-whole-rlib/bar.c b/tests/run-make/lto-no-link-whole-rlib/bar.c
index b2501193029..b2501193029 100644
--- a/tests/run-make-fulldeps/lto-no-link-whole-rlib/bar.c
+++ b/tests/run-make/lto-no-link-whole-rlib/bar.c
diff --git a/tests/run-make-fulldeps/lto-no-link-whole-rlib/foo.c b/tests/run-make/lto-no-link-whole-rlib/foo.c
index 75010458ece..75010458ece 100644
--- a/tests/run-make-fulldeps/lto-no-link-whole-rlib/foo.c
+++ b/tests/run-make/lto-no-link-whole-rlib/foo.c
diff --git a/tests/run-make-fulldeps/lto-no-link-whole-rlib/lib1.rs b/tests/run-make/lto-no-link-whole-rlib/lib1.rs
index f70bb338223..f70bb338223 100644
--- a/tests/run-make-fulldeps/lto-no-link-whole-rlib/lib1.rs
+++ b/tests/run-make/lto-no-link-whole-rlib/lib1.rs
diff --git a/tests/run-make-fulldeps/lto-no-link-whole-rlib/lib2.rs b/tests/run-make/lto-no-link-whole-rlib/lib2.rs
index 2dec2a2718e..2dec2a2718e 100644
--- a/tests/run-make-fulldeps/lto-no-link-whole-rlib/lib2.rs
+++ b/tests/run-make/lto-no-link-whole-rlib/lib2.rs
diff --git a/tests/run-make-fulldeps/lto-no-link-whole-rlib/main.rs b/tests/run-make/lto-no-link-whole-rlib/main.rs
index 0c658808e6e..0c658808e6e 100644
--- a/tests/run-make-fulldeps/lto-no-link-whole-rlib/main.rs
+++ b/tests/run-make/lto-no-link-whole-rlib/main.rs
diff --git a/tests/run-make-fulldeps/lto-readonly-lib/Makefile b/tests/run-make/lto-readonly-lib/Makefile
index a20ecea88ea..11d944e3e3d 100644
--- a/tests/run-make-fulldeps/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-fulldeps/lto-readonly-lib/lib.rs b/tests/run-make/lto-readonly-lib/lib.rs
index c1bfaa6cab5..c1bfaa6cab5 100644
--- a/tests/run-make-fulldeps/lto-readonly-lib/lib.rs
+++ b/tests/run-make/lto-readonly-lib/lib.rs
diff --git a/tests/run-make-fulldeps/lto-readonly-lib/main.rs b/tests/run-make/lto-readonly-lib/main.rs
index 69da798b3eb..69da798b3eb 100644
--- a/tests/run-make-fulldeps/lto-readonly-lib/main.rs
+++ b/tests/run-make/lto-readonly-lib/main.rs
diff --git a/tests/run-make-fulldeps/lto-smoke-c/Makefile b/tests/run-make/lto-smoke-c/Makefile
index 7c6ee3be849..f1ba3d95da2 100644
--- a/tests/run-make-fulldeps/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-fulldeps/lto-smoke-c/bar.c b/tests/run-make/lto-smoke-c/bar.c
index bb4036b06e1..bb4036b06e1 100644
--- a/tests/run-make-fulldeps/lto-smoke-c/bar.c
+++ b/tests/run-make/lto-smoke-c/bar.c
diff --git a/tests/run-make-fulldeps/lto-smoke-c/foo.rs b/tests/run-make/lto-smoke-c/foo.rs
index 2e59432cdb1..2e59432cdb1 100644
--- a/tests/run-make-fulldeps/lto-smoke-c/foo.rs
+++ b/tests/run-make/lto-smoke-c/foo.rs
diff --git a/tests/run-make-fulldeps/lto-smoke/Makefile b/tests/run-make/lto-smoke/Makefile
index 8bce708b44b..13a09fce734 100644
--- a/tests/run-make-fulldeps/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-fulldeps/lto-smoke/lib.rs b/tests/run-make/lto-smoke/lib.rs
index c1bfaa6cab5..c1bfaa6cab5 100644
--- a/tests/run-make-fulldeps/lto-smoke/lib.rs
+++ b/tests/run-make/lto-smoke/lib.rs
diff --git a/tests/run-make-fulldeps/lto-smoke/main.rs b/tests/run-make/lto-smoke/main.rs
index 69da798b3eb..69da798b3eb 100644
--- a/tests/run-make-fulldeps/lto-smoke/main.rs
+++ b/tests/run-make/lto-smoke/main.rs
diff --git a/tests/run-make/macos-deployment-target/Makefile b/tests/run-make/macos-deployment-target/Makefile
index 70fca043653..d0cf836bcdf 100644
--- a/tests/run-make/macos-deployment-target/Makefile
+++ b/tests/run-make/macos-deployment-target/Makefile
@@ -4,7 +4,7 @@
 # This is important since its a compatibility hazard. The linker will
 # generate load commands differently based on what minimum OS it can assume.
 
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 ifeq ($(strip $(shell uname -m)),arm64)
 	GREP_PATTERN = "minos 11.0"
diff --git a/tests/run-make/macos-fat-archive/Makefile b/tests/run-make/macos-fat-archive/Makefile
index cc99375db69..b6582c809e8 100644
--- a/tests/run-make/macos-fat-archive/Makefile
+++ b/tests/run-make/macos-fat-archive/Makefile
@@ -1,6 +1,6 @@
 # only-macos
 
--include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 "$(TMPDIR)"/libnative-library.a: native-library.c
 	$(CC) -arch arm64 -arch x86_64 native-library.c -c -o "$(TMPDIR)"/native-library.o
diff --git a/tests/run-make-fulldeps/manual-crate-name/Makefile b/tests/run-make/manual-crate-name/Makefile
index c00e20c7c57..c00e20c7c57 100644
--- a/tests/run-make-fulldeps/manual-crate-name/Makefile
+++ b/tests/run-make/manual-crate-name/Makefile
diff --git a/tests/run-make-fulldeps/manual-crate-name/bar.rs b/tests/run-make/manual-crate-name/bar.rs
index c1bfaa6cab5..c1bfaa6cab5 100644
--- a/tests/run-make-fulldeps/manual-crate-name/bar.rs
+++ b/tests/run-make/manual-crate-name/bar.rs
diff --git a/tests/run-make-fulldeps/manual-link/Makefile b/tests/run-make/manual-link/Makefile
index 401f6eb440a..8dbf0460fff 100644
--- a/tests/run-make-fulldeps/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-fulldeps/manual-link/bar.c b/tests/run-make/manual-link/bar.c
index e4259998678..e4259998678 100644
--- a/tests/run-make-fulldeps/manual-link/bar.c
+++ b/tests/run-make/manual-link/bar.c
diff --git a/tests/run-make-fulldeps/manual-link/foo.c b/tests/run-make/manual-link/foo.c
index e4259998678..e4259998678 100644
--- a/tests/run-make-fulldeps/manual-link/foo.c
+++ b/tests/run-make/manual-link/foo.c
diff --git a/tests/run-make-fulldeps/manual-link/foo.rs b/tests/run-make/manual-link/foo.rs
index c1f28236ffd..c1f28236ffd 100644
--- a/tests/run-make-fulldeps/manual-link/foo.rs
+++ b/tests/run-make/manual-link/foo.rs
diff --git a/tests/run-make-fulldeps/manual-link/main.rs b/tests/run-make/manual-link/main.rs
index fe35f1f8e2e..fe35f1f8e2e 100644
--- a/tests/run-make-fulldeps/manual-link/main.rs
+++ b/tests/run-make/manual-link/main.rs
diff --git a/tests/run-make-fulldeps/many-crates-but-no-match/Makefile b/tests/run-make/many-crates-but-no-match/Makefile
index ca0ab8e9e5f..ca0ab8e9e5f 100644
--- a/tests/run-make-fulldeps/many-crates-but-no-match/Makefile
+++ b/tests/run-make/many-crates-but-no-match/Makefile
diff --git a/tests/run-make-fulldeps/many-crates-but-no-match/crateA1.rs b/tests/run-make/many-crates-but-no-match/crateA1.rs
index 3fed5a38e2c..3fed5a38e2c 100644
--- a/tests/run-make-fulldeps/many-crates-but-no-match/crateA1.rs
+++ b/tests/run-make/many-crates-but-no-match/crateA1.rs
diff --git a/tests/run-make-fulldeps/many-crates-but-no-match/crateA2.rs b/tests/run-make/many-crates-but-no-match/crateA2.rs
index 8db07a015ff..8db07a015ff 100644
--- a/tests/run-make-fulldeps/many-crates-but-no-match/crateA2.rs
+++ b/tests/run-make/many-crates-but-no-match/crateA2.rs
diff --git a/tests/run-make-fulldeps/many-crates-but-no-match/crateA3.rs b/tests/run-make/many-crates-but-no-match/crateA3.rs
index a1e8e40a38c..a1e8e40a38c 100644
--- a/tests/run-make-fulldeps/many-crates-but-no-match/crateA3.rs
+++ b/tests/run-make/many-crates-but-no-match/crateA3.rs
diff --git a/tests/run-make-fulldeps/many-crates-but-no-match/crateB.rs b/tests/run-make/many-crates-but-no-match/crateB.rs
index 4ccd65d653e..4ccd65d653e 100644
--- a/tests/run-make-fulldeps/many-crates-but-no-match/crateB.rs
+++ b/tests/run-make/many-crates-but-no-match/crateB.rs
diff --git a/tests/run-make-fulldeps/many-crates-but-no-match/crateC.rs b/tests/run-make/many-crates-but-no-match/crateC.rs
index a8b817ec681..a8b817ec681 100644
--- a/tests/run-make-fulldeps/many-crates-but-no-match/crateC.rs
+++ b/tests/run-make/many-crates-but-no-match/crateC.rs
diff --git a/tests/run-make-fulldeps/metadata-flag-frobs-symbols/Makefile b/tests/run-make/metadata-flag-frobs-symbols/Makefile
index dc6b10f4e9d..53d7d065769 100644
--- a/tests/run-make-fulldeps/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-fulldeps/metadata-flag-frobs-symbols/bar.rs b/tests/run-make/metadata-flag-frobs-symbols/bar.rs
index 1e6957a3694..1e6957a3694 100644
--- a/tests/run-make-fulldeps/metadata-flag-frobs-symbols/bar.rs
+++ b/tests/run-make/metadata-flag-frobs-symbols/bar.rs
diff --git a/tests/run-make-fulldeps/metadata-flag-frobs-symbols/foo.rs b/tests/run-make/metadata-flag-frobs-symbols/foo.rs
index 696aed2fa1d..696aed2fa1d 100644
--- a/tests/run-make-fulldeps/metadata-flag-frobs-symbols/foo.rs
+++ b/tests/run-make/metadata-flag-frobs-symbols/foo.rs
diff --git a/tests/run-make-fulldeps/min-global-align/Makefile b/tests/run-make/min-global-align/Makefile
index 82f38749e00..82f38749e00 100644
--- a/tests/run-make-fulldeps/min-global-align/Makefile
+++ b/tests/run-make/min-global-align/Makefile
diff --git a/tests/run-make-fulldeps/min-global-align/min_global_align.rs b/tests/run-make/min-global-align/min_global_align.rs
index 135792e9372..135792e9372 100644
--- a/tests/run-make-fulldeps/min-global-align/min_global_align.rs
+++ b/tests/run-make/min-global-align/min_global_align.rs
diff --git a/tests/run-make-fulldeps/mingw-export-call-convention/Makefile b/tests/run-make/mingw-export-call-convention/Makefile
index 4a60059cc54..4a60059cc54 100644
--- a/tests/run-make-fulldeps/mingw-export-call-convention/Makefile
+++ b/tests/run-make/mingw-export-call-convention/Makefile
diff --git a/tests/run-make-fulldeps/mingw-export-call-convention/foo.rs b/tests/run-make/mingw-export-call-convention/foo.rs
index 1fec00311ef..1fec00311ef 100644
--- a/tests/run-make-fulldeps/mingw-export-call-convention/foo.rs
+++ b/tests/run-make/mingw-export-call-convention/foo.rs
diff --git a/tests/run-make-fulldeps/mismatching-target-triples/Makefile b/tests/run-make/mismatching-target-triples/Makefile
index 409388e0414..409388e0414 100644
--- a/tests/run-make-fulldeps/mismatching-target-triples/Makefile
+++ b/tests/run-make/mismatching-target-triples/Makefile
diff --git a/tests/run-make-fulldeps/mismatching-target-triples/bar.rs b/tests/run-make/mismatching-target-triples/bar.rs
index b2c2fc1c410..b2c2fc1c410 100644
--- a/tests/run-make-fulldeps/mismatching-target-triples/bar.rs
+++ b/tests/run-make/mismatching-target-triples/bar.rs
diff --git a/tests/run-make-fulldeps/mismatching-target-triples/foo.rs b/tests/run-make/mismatching-target-triples/foo.rs
index 6fa05491448..6fa05491448 100644
--- a/tests/run-make-fulldeps/mismatching-target-triples/foo.rs
+++ b/tests/run-make/mismatching-target-triples/foo.rs
diff --git a/tests/run-make-fulldeps/missing-crate-dependency/Makefile b/tests/run-make/missing-crate-dependency/Makefile
index 7c271ab8a90..7c271ab8a90 100644
--- a/tests/run-make-fulldeps/missing-crate-dependency/Makefile
+++ b/tests/run-make/missing-crate-dependency/Makefile
diff --git a/tests/run-make-fulldeps/missing-crate-dependency/crateA.rs b/tests/run-make/missing-crate-dependency/crateA.rs
index 31433cb60b8..31433cb60b8 100644
--- a/tests/run-make-fulldeps/missing-crate-dependency/crateA.rs
+++ b/tests/run-make/missing-crate-dependency/crateA.rs
diff --git a/tests/run-make-fulldeps/missing-crate-dependency/crateB.rs b/tests/run-make/missing-crate-dependency/crateB.rs
index 4ccd65d653e..4ccd65d653e 100644
--- a/tests/run-make-fulldeps/missing-crate-dependency/crateB.rs
+++ b/tests/run-make/missing-crate-dependency/crateB.rs
diff --git a/tests/run-make-fulldeps/missing-crate-dependency/crateC.rs b/tests/run-make/missing-crate-dependency/crateC.rs
index a8b817ec681..a8b817ec681 100644
--- a/tests/run-make-fulldeps/missing-crate-dependency/crateC.rs
+++ b/tests/run-make/missing-crate-dependency/crateC.rs
diff --git a/tests/run-make-fulldeps/mixing-deps/Makefile b/tests/run-make/mixing-deps/Makefile
index 956e704ee16..c2a5a2a0abb 100644
--- a/tests/run-make-fulldeps/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-fulldeps/mixing-deps/both.rs b/tests/run-make/mixing-deps/both.rs
index 6a58187633f..6a58187633f 100644
--- a/tests/run-make-fulldeps/mixing-deps/both.rs
+++ b/tests/run-make/mixing-deps/both.rs
diff --git a/tests/run-make-fulldeps/mixing-deps/dylib.rs b/tests/run-make/mixing-deps/dylib.rs
index 88976d5b663..88976d5b663 100644
--- a/tests/run-make-fulldeps/mixing-deps/dylib.rs
+++ b/tests/run-make/mixing-deps/dylib.rs
diff --git a/tests/run-make-fulldeps/mixing-deps/prog.rs b/tests/run-make/mixing-deps/prog.rs
index 188981dc1a3..188981dc1a3 100644
--- a/tests/run-make-fulldeps/mixing-deps/prog.rs
+++ b/tests/run-make/mixing-deps/prog.rs
diff --git a/tests/run-make-fulldeps/mixing-formats/Makefile b/tests/run-make/mixing-formats/Makefile
index b27e54257f9..d01978a1599 100644
--- a/tests/run-make-fulldeps/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-fulldeps/mixing-formats/bar1.rs b/tests/run-make/mixing-formats/bar1.rs
index 49af74e1b74..49af74e1b74 100644
--- a/tests/run-make-fulldeps/mixing-formats/bar1.rs
+++ b/tests/run-make/mixing-formats/bar1.rs
diff --git a/tests/run-make-fulldeps/mixing-formats/bar2.rs b/tests/run-make/mixing-formats/bar2.rs
index 49af74e1b74..49af74e1b74 100644
--- a/tests/run-make-fulldeps/mixing-formats/bar2.rs
+++ b/tests/run-make/mixing-formats/bar2.rs
diff --git a/tests/run-make-fulldeps/mixing-formats/baz.rs b/tests/run-make/mixing-formats/baz.rs
index 99a73159ea4..99a73159ea4 100644
--- a/tests/run-make-fulldeps/mixing-formats/baz.rs
+++ b/tests/run-make/mixing-formats/baz.rs
diff --git a/tests/run-make-fulldeps/mixing-formats/baz2.rs b/tests/run-make/mixing-formats/baz2.rs
index d0fab1e4cdf..d0fab1e4cdf 100644
--- a/tests/run-make-fulldeps/mixing-formats/baz2.rs
+++ b/tests/run-make/mixing-formats/baz2.rs
diff --git a/tests/run-make-fulldeps/mixing-formats/foo.rs b/tests/run-make/mixing-formats/foo.rs
index d11c69f812a..d11c69f812a 100644
--- a/tests/run-make-fulldeps/mixing-formats/foo.rs
+++ b/tests/run-make/mixing-formats/foo.rs
diff --git a/tests/run-make-fulldeps/mixing-libs/Makefile b/tests/run-make/mixing-libs/Makefile
index 39cc0708ca1..e8262b28401 100644
--- a/tests/run-make-fulldeps/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-fulldeps/mixing-libs/dylib.rs b/tests/run-make/mixing-libs/dylib.rs
index 6856887501c..6856887501c 100644
--- a/tests/run-make-fulldeps/mixing-libs/dylib.rs
+++ b/tests/run-make/mixing-libs/dylib.rs
diff --git a/tests/run-make-fulldeps/mixing-libs/prog.rs b/tests/run-make/mixing-libs/prog.rs
index 14ce5c951a7..14ce5c951a7 100644
--- a/tests/run-make-fulldeps/mixing-libs/prog.rs
+++ b/tests/run-make/mixing-libs/prog.rs
diff --git a/tests/run-make-fulldeps/mixing-libs/rlib.rs b/tests/run-make/mixing-libs/rlib.rs
index 96dcd16bb93..96dcd16bb93 100644
--- a/tests/run-make-fulldeps/mixing-libs/rlib.rs
+++ b/tests/run-make/mixing-libs/rlib.rs
diff --git a/tests/run-make-fulldeps/msvc-opt-minsize/Makefile b/tests/run-make/msvc-opt-minsize/Makefile
index a5f019f244e..32e6e28018f 100644
--- a/tests/run-make-fulldeps/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-fulldeps/msvc-opt-minsize/foo.rs b/tests/run-make/msvc-opt-minsize/foo.rs
index 3f5496c08ee..3f5496c08ee 100644
--- a/tests/run-make-fulldeps/msvc-opt-minsize/foo.rs
+++ b/tests/run-make/msvc-opt-minsize/foo.rs
diff --git a/tests/run-make-fulldeps/multiple-emits/Makefile b/tests/run-make/multiple-emits/Makefile
index d1f29764485..d1f29764485 100644
--- a/tests/run-make-fulldeps/multiple-emits/Makefile
+++ b/tests/run-make/multiple-emits/Makefile
diff --git a/tests/run-make-fulldeps/multiple-emits/foo.rs b/tests/run-make/multiple-emits/foo.rs
index f328e4d9d04..f328e4d9d04 100644
--- a/tests/run-make-fulldeps/multiple-emits/foo.rs
+++ b/tests/run-make/multiple-emits/foo.rs
diff --git a/tests/run-make/native-link-modifier-bundle/Makefile b/tests/run-make/native-link-modifier-bundle/Makefile
index e8a1121bfcd..527720922fe 100644
--- a/tests/run-make/native-link-modifier-bundle/Makefile
+++ b/tests/run-make/native-link-modifier-bundle/Makefile
@@ -1,7 +1,7 @@
 # ignore-cross-compile
 # ignore-windows-msvc
 
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 # We're using the llvm-nm instead of the system nm to ensure it is compatible
 # with the LLVM bitcode generated by rustc.
diff --git a/tests/run-make/native-link-modifier-verbatim-linker/Makefile b/tests/run-make/native-link-modifier-verbatim-linker/Makefile
index 666e4084ce2..256dc2d0664 100644
--- a/tests/run-make/native-link-modifier-verbatim-linker/Makefile
+++ b/tests/run-make/native-link-modifier-verbatim-linker/Makefile
@@ -1,7 +1,7 @@
 # ignore-cross-compile
 # ignore-macos
 
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 all:
 	# Verbatim allows specify precise name.
diff --git a/tests/run-make/native-link-modifier-verbatim-rustc/Makefile b/tests/run-make/native-link-modifier-verbatim-rustc/Makefile
index 6f01f37804a..dfd6ec50fc0 100644
--- a/tests/run-make/native-link-modifier-verbatim-rustc/Makefile
+++ b/tests/run-make/native-link-modifier-verbatim-rustc/Makefile
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 all:
 	# Verbatim allows specify precise name.
diff --git a/tests/run-make/native-link-modifier-whole-archive/Makefile b/tests/run-make/native-link-modifier-whole-archive/Makefile
index f26bd864ced..5eb7a416f91 100644
--- a/tests/run-make/native-link-modifier-whole-archive/Makefile
+++ b/tests/run-make/native-link-modifier-whole-archive/Makefile
@@ -8,7 +8,7 @@
 # that code would never make it into the final executable and we'd thus be missing some
 # of the output.
 
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 all: $(TMPDIR)/$(call BIN,directly_linked) \
      $(TMPDIR)/$(call BIN,directly_linked_test_plus_whole_archive) \
diff --git a/tests/run-make-fulldeps/no-builtins-lto/Makefile b/tests/run-make/no-builtins-lto/Makefile
index c8f05d9918b..c8f05d9918b 100644
--- a/tests/run-make-fulldeps/no-builtins-lto/Makefile
+++ b/tests/run-make/no-builtins-lto/Makefile
diff --git a/tests/run-make-fulldeps/no-builtins-lto/main.rs b/tests/run-make/no-builtins-lto/main.rs
index 890c999c8cc..890c999c8cc 100644
--- a/tests/run-make-fulldeps/no-builtins-lto/main.rs
+++ b/tests/run-make/no-builtins-lto/main.rs
diff --git a/tests/run-make-fulldeps/no-builtins-lto/no_builtins.rs b/tests/run-make/no-builtins-lto/no_builtins.rs
index 5d001031a57..5d001031a57 100644
--- a/tests/run-make-fulldeps/no-builtins-lto/no_builtins.rs
+++ b/tests/run-make/no-builtins-lto/no_builtins.rs
diff --git a/tests/run-make-fulldeps/no-duplicate-libs/Makefile b/tests/run-make/no-duplicate-libs/Makefile
index b05aff7826e..4be8c026294 100644
--- a/tests/run-make-fulldeps/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-fulldeps/no-duplicate-libs/bar.c b/tests/run-make/no-duplicate-libs/bar.c
index e369526572d..e369526572d 100644
--- a/tests/run-make-fulldeps/no-duplicate-libs/bar.c
+++ b/tests/run-make/no-duplicate-libs/bar.c
diff --git a/tests/run-make-fulldeps/no-duplicate-libs/foo.c b/tests/run-make/no-duplicate-libs/foo.c
index 85e6cd8c390..85e6cd8c390 100644
--- a/tests/run-make-fulldeps/no-duplicate-libs/foo.c
+++ b/tests/run-make/no-duplicate-libs/foo.c
diff --git a/tests/run-make-fulldeps/no-duplicate-libs/main.rs b/tests/run-make/no-duplicate-libs/main.rs
index b25ef35ada6..b25ef35ada6 100644
--- a/tests/run-make-fulldeps/no-duplicate-libs/main.rs
+++ b/tests/run-make/no-duplicate-libs/main.rs
diff --git a/tests/run-make/no-input-file/Makefile b/tests/run-make/no-input-file/Makefile
index 2f02159229d..a754573a524 100644
--- a/tests/run-make/no-input-file/Makefile
+++ b/tests/run-make/no-input-file/Makefile
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 all:
 	$(RUSTC) --print crate-name 2>&1 | diff - no-input-file.stderr
diff --git a/tests/run-make-fulldeps/no-intermediate-extras/Makefile b/tests/run-make/no-intermediate-extras/Makefile
index 4116aac1b8f..83b5cedcf2a 100644
--- a/tests/run-make-fulldeps/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-fulldeps/no-intermediate-extras/foo.rs b/tests/run-make/no-intermediate-extras/foo.rs
index d11c69f812a..d11c69f812a 100644
--- a/tests/run-make-fulldeps/no-intermediate-extras/foo.rs
+++ b/tests/run-make/no-intermediate-extras/foo.rs
diff --git a/tests/run-make-fulldeps/obey-crate-type-flag/Makefile b/tests/run-make/obey-crate-type-flag/Makefile
index effcfc94cc5..ecbb2e620ed 100644
--- a/tests/run-make-fulldeps/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-fulldeps/obey-crate-type-flag/test.rs b/tests/run-make/obey-crate-type-flag/test.rs
index 8a768f9de90..8a768f9de90 100644
--- a/tests/run-make-fulldeps/obey-crate-type-flag/test.rs
+++ b/tests/run-make/obey-crate-type-flag/test.rs
diff --git a/tests/run-make-fulldeps/output-filename-conflicts-with-directory/Makefile b/tests/run-make/output-filename-conflicts-with-directory/Makefile
index 45221356cd9..45221356cd9 100644
--- a/tests/run-make-fulldeps/output-filename-conflicts-with-directory/Makefile
+++ b/tests/run-make/output-filename-conflicts-with-directory/Makefile
diff --git a/tests/run-make-fulldeps/output-filename-conflicts-with-directory/foo.rs b/tests/run-make/output-filename-conflicts-with-directory/foo.rs
index f328e4d9d04..f328e4d9d04 100644
--- a/tests/run-make-fulldeps/output-filename-conflicts-with-directory/foo.rs
+++ b/tests/run-make/output-filename-conflicts-with-directory/foo.rs
diff --git a/tests/run-make-fulldeps/output-filename-overwrites-input/Makefile b/tests/run-make/output-filename-overwrites-input/Makefile
index 33069c06f5a..605b86b253e 100644
--- a/tests/run-make-fulldeps/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-fulldeps/output-filename-overwrites-input/bar.rs b/tests/run-make/output-filename-overwrites-input/bar.rs
index 83be6e807e0..83be6e807e0 100644
--- a/tests/run-make-fulldeps/output-filename-overwrites-input/bar.rs
+++ b/tests/run-make/output-filename-overwrites-input/bar.rs
diff --git a/tests/run-make-fulldeps/output-filename-overwrites-input/foo.rs b/tests/run-make/output-filename-overwrites-input/foo.rs
index f328e4d9d04..f328e4d9d04 100644
--- a/tests/run-make-fulldeps/output-filename-overwrites-input/foo.rs
+++ b/tests/run-make/output-filename-overwrites-input/foo.rs
diff --git a/tests/run-make-fulldeps/output-type-permutations/Makefile b/tests/run-make/output-type-permutations/Makefile
index 791606c643b..035033b9fdd 100644
--- a/tests/run-make-fulldeps/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-fulldeps/output-type-permutations/foo.rs b/tests/run-make/output-type-permutations/foo.rs
index f0a2cc6ad75..f0a2cc6ad75 100644
--- a/tests/run-make-fulldeps/output-type-permutations/foo.rs
+++ b/tests/run-make/output-type-permutations/foo.rs
diff --git a/tests/run-make-fulldeps/output-with-hyphens/Makefile b/tests/run-make/output-with-hyphens/Makefile
index 365fb6e591a..846c9a66a89 100644
--- a/tests/run-make-fulldeps/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-fulldeps/output-with-hyphens/foo-bar.rs b/tests/run-make/output-with-hyphens/foo-bar.rs
index f328e4d9d04..f328e4d9d04 100644
--- a/tests/run-make-fulldeps/output-with-hyphens/foo-bar.rs
+++ b/tests/run-make/output-with-hyphens/foo-bar.rs
diff --git a/tests/run-make-fulldeps/override-aliased-flags/Makefile b/tests/run-make/override-aliased-flags/Makefile
index 186b8c7c85e..db1ff1ff981 100644
--- a/tests/run-make-fulldeps/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-fulldeps/override-aliased-flags/main.rs b/tests/run-make/override-aliased-flags/main.rs
index f328e4d9d04..f328e4d9d04 100644
--- a/tests/run-make-fulldeps/override-aliased-flags/main.rs
+++ b/tests/run-make/override-aliased-flags/main.rs
diff --git a/tests/run-make/overwrite-input/Makefile b/tests/run-make/overwrite-input/Makefile
index 03b03eb147d..c62b5aab190 100644
--- a/tests/run-make/overwrite-input/Makefile
+++ b/tests/run-make/overwrite-input/Makefile
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 all:
 	$(RUSTC) main.rs -o main.rs 2> $(TMPDIR)/file.stderr || echo "failed successfully"
diff --git a/tests/run-make-fulldeps/panic-impl-transitive/Makefile b/tests/run-make/panic-impl-transitive/Makefile
index c3192efcb5a..9a271a22e10 100644
--- a/tests/run-make-fulldeps/panic-impl-transitive/Makefile
+++ b/tests/run-make/panic-impl-transitive/Makefile
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 # NOTE we use --emit=llvm-ir to avoid running the linker (linking will fail because there's no main
 # in this crate)
diff --git a/tests/run-make-fulldeps/panic-impl-transitive/panic-impl-consumer.rs b/tests/run-make/panic-impl-transitive/panic-impl-consumer.rs
index 82a98b12d04..82a98b12d04 100644
--- a/tests/run-make-fulldeps/panic-impl-transitive/panic-impl-consumer.rs
+++ b/tests/run-make/panic-impl-transitive/panic-impl-consumer.rs
diff --git a/tests/run-make-fulldeps/panic-impl-transitive/panic-impl-provider.rs b/tests/run-make/panic-impl-transitive/panic-impl-provider.rs
index f1b9873c83a..f1b9873c83a 100644
--- a/tests/run-make-fulldeps/panic-impl-transitive/panic-impl-provider.rs
+++ b/tests/run-make/panic-impl-transitive/panic-impl-provider.rs
diff --git a/tests/run-make/pass-linker-flags-from-dep/Makefile b/tests/run-make/pass-linker-flags-from-dep/Makefile
index b9426326aea..b57389bb7d4 100644
--- a/tests/run-make/pass-linker-flags-from-dep/Makefile
+++ b/tests/run-make/pass-linker-flags-from-dep/Makefile
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 all:
 	# Build deps
diff --git a/tests/run-make/pass-linker-flags/Makefile b/tests/run-make/pass-linker-flags/Makefile
index a3efb8df6ac..6ddbcbb1b08 100644
--- a/tests/run-make/pass-linker-flags/Makefile
+++ b/tests/run-make/pass-linker-flags/Makefile
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 all:
 	$(RUSTC) rs.rs -Z unstable-options -l static=l1 -l link-arg=a1 -l static=l2 -l link-arg=a2 -l dylib=d1 -l link-arg=a3 --print link-args | $(CGREP) -e 'l1.*a1.*l2.*a2.*d1.*a3'
diff --git a/tests/run-make-fulldeps/pass-non-c-like-enum-to-c/Makefile b/tests/run-make/pass-non-c-like-enum-to-c/Makefile
index 42d3c977f75..bd441d321bf 100644
--- a/tests/run-make-fulldeps/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-fulldeps/pass-non-c-like-enum-to-c/nonclike.rs b/tests/run-make/pass-non-c-like-enum-to-c/nonclike.rs
index 517286a868d..517286a868d 100644
--- a/tests/run-make-fulldeps/pass-non-c-like-enum-to-c/nonclike.rs
+++ b/tests/run-make/pass-non-c-like-enum-to-c/nonclike.rs
diff --git a/tests/run-make-fulldeps/pass-non-c-like-enum-to-c/test.c b/tests/run-make/pass-non-c-like-enum-to-c/test.c
index 99511b2530f..99511b2530f 100644
--- a/tests/run-make-fulldeps/pass-non-c-like-enum-to-c/test.c
+++ b/tests/run-make/pass-non-c-like-enum-to-c/test.c
diff --git a/tests/run-make-fulldeps/pgo-branch-weights/Makefile b/tests/run-make/pgo-branch-weights/Makefile
index c60206a1f34..c60206a1f34 100644
--- a/tests/run-make-fulldeps/pgo-branch-weights/Makefile
+++ b/tests/run-make/pgo-branch-weights/Makefile
diff --git a/tests/run-make-fulldeps/pgo-branch-weights/filecheck-patterns.txt b/tests/run-make/pgo-branch-weights/filecheck-patterns.txt
index 70d5a645c14..70d5a645c14 100644
--- a/tests/run-make-fulldeps/pgo-branch-weights/filecheck-patterns.txt
+++ b/tests/run-make/pgo-branch-weights/filecheck-patterns.txt
diff --git a/tests/run-make-fulldeps/pgo-branch-weights/interesting.rs b/tests/run-make/pgo-branch-weights/interesting.rs
index a26d6fd69d1..a26d6fd69d1 100644
--- a/tests/run-make-fulldeps/pgo-branch-weights/interesting.rs
+++ b/tests/run-make/pgo-branch-weights/interesting.rs
diff --git a/tests/run-make-fulldeps/pgo-branch-weights/main.rs b/tests/run-make/pgo-branch-weights/main.rs
index 619cf9c698c..619cf9c698c 100644
--- a/tests/run-make-fulldeps/pgo-branch-weights/main.rs
+++ b/tests/run-make/pgo-branch-weights/main.rs
diff --git a/tests/run-make-fulldeps/pgo-branch-weights/opaque.rs b/tests/run-make/pgo-branch-weights/opaque.rs
index 72f93c9feab..72f93c9feab 100644
--- a/tests/run-make-fulldeps/pgo-branch-weights/opaque.rs
+++ b/tests/run-make/pgo-branch-weights/opaque.rs
diff --git a/tests/run-make-fulldeps/pgo-gen-lto/Makefile b/tests/run-make/pgo-gen-lto/Makefile
index 3f2f6a838b5..3f2f6a838b5 100644
--- a/tests/run-make-fulldeps/pgo-gen-lto/Makefile
+++ b/tests/run-make/pgo-gen-lto/Makefile
diff --git a/tests/run-make-fulldeps/pgo-gen-lto/test.rs b/tests/run-make/pgo-gen-lto/test.rs
index f328e4d9d04..f328e4d9d04 100644
--- a/tests/run-make-fulldeps/pgo-gen-lto/test.rs
+++ b/tests/run-make/pgo-gen-lto/test.rs
diff --git a/tests/run-make-fulldeps/pgo-gen-no-imp-symbols/Makefile b/tests/run-make/pgo-gen-no-imp-symbols/Makefile
index 7f72b11b611..7f72b11b611 100644
--- a/tests/run-make-fulldeps/pgo-gen-no-imp-symbols/Makefile
+++ b/tests/run-make/pgo-gen-no-imp-symbols/Makefile
diff --git a/tests/run-make-fulldeps/pgo-gen-no-imp-symbols/test.rs b/tests/run-make/pgo-gen-no-imp-symbols/test.rs
index f328e4d9d04..f328e4d9d04 100644
--- a/tests/run-make-fulldeps/pgo-gen-no-imp-symbols/test.rs
+++ b/tests/run-make/pgo-gen-no-imp-symbols/test.rs
diff --git a/tests/run-make-fulldeps/pgo-gen/Makefile b/tests/run-make/pgo-gen/Makefile
index 4623a74957b..4623a74957b 100644
--- a/tests/run-make-fulldeps/pgo-gen/Makefile
+++ b/tests/run-make/pgo-gen/Makefile
diff --git a/tests/run-make-fulldeps/pgo-gen/test.rs b/tests/run-make/pgo-gen/test.rs
index f328e4d9d04..f328e4d9d04 100644
--- a/tests/run-make-fulldeps/pgo-gen/test.rs
+++ b/tests/run-make/pgo-gen/test.rs
diff --git a/tests/run-make-fulldeps/pgo-indirect-call-promotion/Makefile b/tests/run-make/pgo-indirect-call-promotion/Makefile
index 45302215cc6..45302215cc6 100644
--- a/tests/run-make-fulldeps/pgo-indirect-call-promotion/Makefile
+++ b/tests/run-make/pgo-indirect-call-promotion/Makefile
diff --git a/tests/run-make-fulldeps/pgo-indirect-call-promotion/filecheck-patterns.txt b/tests/run-make/pgo-indirect-call-promotion/filecheck-patterns.txt
index e19c78350e9..e19c78350e9 100644
--- a/tests/run-make-fulldeps/pgo-indirect-call-promotion/filecheck-patterns.txt
+++ b/tests/run-make/pgo-indirect-call-promotion/filecheck-patterns.txt
diff --git a/tests/run-make-fulldeps/pgo-indirect-call-promotion/interesting.rs b/tests/run-make/pgo-indirect-call-promotion/interesting.rs
index 4fd096d626d..4fd096d626d 100644
--- a/tests/run-make-fulldeps/pgo-indirect-call-promotion/interesting.rs
+++ b/tests/run-make/pgo-indirect-call-promotion/interesting.rs
diff --git a/tests/run-make-fulldeps/pgo-indirect-call-promotion/main.rs b/tests/run-make/pgo-indirect-call-promotion/main.rs
index 27181f30710..27181f30710 100644
--- a/tests/run-make-fulldeps/pgo-indirect-call-promotion/main.rs
+++ b/tests/run-make/pgo-indirect-call-promotion/main.rs
diff --git a/tests/run-make-fulldeps/pgo-indirect-call-promotion/opaque.rs b/tests/run-make/pgo-indirect-call-promotion/opaque.rs
index 9628d711c50..9628d711c50 100644
--- a/tests/run-make-fulldeps/pgo-indirect-call-promotion/opaque.rs
+++ b/tests/run-make/pgo-indirect-call-promotion/opaque.rs
diff --git a/tests/run-make-fulldeps/pgo-use/Makefile b/tests/run-make/pgo-use/Makefile
index 3bac9b77aa3..3bac9b77aa3 100644
--- a/tests/run-make-fulldeps/pgo-use/Makefile
+++ b/tests/run-make/pgo-use/Makefile
diff --git a/tests/run-make-fulldeps/pgo-use/filecheck-patterns.txt b/tests/run-make/pgo-use/filecheck-patterns.txt
index 6da34f88f2a..6da34f88f2a 100644
--- a/tests/run-make-fulldeps/pgo-use/filecheck-patterns.txt
+++ b/tests/run-make/pgo-use/filecheck-patterns.txt
diff --git a/tests/run-make-fulldeps/pgo-use/main.rs b/tests/run-make/pgo-use/main.rs
index eb9192c87e6..eb9192c87e6 100644
--- a/tests/run-make-fulldeps/pgo-use/main.rs
+++ b/tests/run-make/pgo-use/main.rs
diff --git a/tests/run-make-fulldeps/pointer-auth-link-with-c/Makefile b/tests/run-make/pointer-auth-link-with-c/Makefile
index 7acea03802c..7acea03802c 100644
--- a/tests/run-make-fulldeps/pointer-auth-link-with-c/Makefile
+++ b/tests/run-make/pointer-auth-link-with-c/Makefile
diff --git a/tests/run-make-fulldeps/pointer-auth-link-with-c/test.c b/tests/run-make/pointer-auth-link-with-c/test.c
index 9fe07f82f9e..9fe07f82f9e 100644
--- a/tests/run-make-fulldeps/pointer-auth-link-with-c/test.c
+++ b/tests/run-make/pointer-auth-link-with-c/test.c
diff --git a/tests/run-make-fulldeps/pointer-auth-link-with-c/test.rs b/tests/run-make/pointer-auth-link-with-c/test.rs
index 615ad0aeb3d..615ad0aeb3d 100644
--- a/tests/run-make-fulldeps/pointer-auth-link-with-c/test.rs
+++ b/tests/run-make/pointer-auth-link-with-c/test.rs
diff --git a/tests/run-make-fulldeps/prefer-dylib/Makefile b/tests/run-make/prefer-dylib/Makefile
index 3817ca195eb..cc26e70ae67 100644
--- a/tests/run-make-fulldeps/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-fulldeps/prefer-dylib/bar.rs b/tests/run-make/prefer-dylib/bar.rs
index c5c0bc606cd..c5c0bc606cd 100644
--- a/tests/run-make-fulldeps/prefer-dylib/bar.rs
+++ b/tests/run-make/prefer-dylib/bar.rs
diff --git a/tests/run-make-fulldeps/prefer-dylib/foo.rs b/tests/run-make/prefer-dylib/foo.rs
index 8d68535e3b6..8d68535e3b6 100644
--- a/tests/run-make-fulldeps/prefer-dylib/foo.rs
+++ b/tests/run-make/prefer-dylib/foo.rs
diff --git a/tests/run-make-fulldeps/prefer-rlib/Makefile b/tests/run-make/prefer-rlib/Makefile
index adc345d760d..2e86b9c1dd7 100644
--- a/tests/run-make-fulldeps/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-fulldeps/prefer-rlib/bar.rs b/tests/run-make/prefer-rlib/bar.rs
index c5c0bc606cd..c5c0bc606cd 100644
--- a/tests/run-make-fulldeps/prefer-rlib/bar.rs
+++ b/tests/run-make/prefer-rlib/bar.rs
diff --git a/tests/run-make-fulldeps/prefer-rlib/foo.rs b/tests/run-make/prefer-rlib/foo.rs
index 8d68535e3b6..8d68535e3b6 100644
--- a/tests/run-make-fulldeps/prefer-rlib/foo.rs
+++ b/tests/run-make/prefer-rlib/foo.rs
diff --git a/tests/run-make-fulldeps/pretty-print-to-file/Makefile b/tests/run-make/pretty-print-to-file/Makefile
index ca11b8c47f0..ca11b8c47f0 100644
--- a/tests/run-make-fulldeps/pretty-print-to-file/Makefile
+++ b/tests/run-make/pretty-print-to-file/Makefile
diff --git a/tests/run-make-fulldeps/pretty-print-to-file/input.pp b/tests/run-make/pretty-print-to-file/input.pp
index e3f03242a6e..e3f03242a6e 100644
--- a/tests/run-make-fulldeps/pretty-print-to-file/input.pp
+++ b/tests/run-make/pretty-print-to-file/input.pp
diff --git a/tests/run-make-fulldeps/pretty-print-to-file/input.rs b/tests/run-make/pretty-print-to-file/input.rs
index aa828155b20..aa828155b20 100644
--- a/tests/run-make-fulldeps/pretty-print-to-file/input.rs
+++ b/tests/run-make/pretty-print-to-file/input.rs
diff --git a/tests/run-make-fulldeps/print-calling-conventions/Makefile b/tests/run-make/print-calling-conventions/Makefile
index d3fd06392b0..27b87e61086 100644
--- a/tests/run-make-fulldeps/print-calling-conventions/Makefile
+++ b/tests/run-make/print-calling-conventions/Makefile
@@ -1,4 +1,4 @@
--include ../tools.mk
+include ../tools.mk
 
 all:
 	$(RUSTC) --print calling-conventions
diff --git a/tests/run-make-fulldeps/print-cfg/Makefile b/tests/run-make/print-cfg/Makefile
index 126f5768c90..126f5768c90 100644
--- a/tests/run-make-fulldeps/print-cfg/Makefile
+++ b/tests/run-make/print-cfg/Makefile
diff --git a/tests/run-make-fulldeps/print-target-list/Makefile b/tests/run-make/print-target-list/Makefile
index f23c40d4281..f23c40d4281 100644
--- a/tests/run-make-fulldeps/print-target-list/Makefile
+++ b/tests/run-make/print-target-list/Makefile
diff --git a/tests/run-make-fulldeps/profile/Makefile b/tests/run-make/profile/Makefile
index fffc051adbf..fffc051adbf 100644
--- a/tests/run-make-fulldeps/profile/Makefile
+++ b/tests/run-make/profile/Makefile
diff --git a/tests/run-make-fulldeps/profile/test.rs b/tests/run-make/profile/test.rs
index f328e4d9d04..f328e4d9d04 100644
--- a/tests/run-make-fulldeps/profile/test.rs
+++ b/tests/run-make/profile/test.rs
diff --git a/tests/run-make-fulldeps/prune-link-args/Makefile b/tests/run-make/prune-link-args/Makefile
index a359dc5aef1..c21ba6ace38 100644
--- a/tests/run-make-fulldeps/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-fulldeps/prune-link-args/empty.rs b/tests/run-make/prune-link-args/empty.rs
index 45590d86ba6..45590d86ba6 100644
--- a/tests/run-make-fulldeps/prune-link-args/empty.rs
+++ b/tests/run-make/prune-link-args/empty.rs
diff --git a/tests/run-make/raw-dylib-alt-calling-convention/Makefile b/tests/run-make/raw-dylib-alt-calling-convention/Makefile
index 03f8778d25d..1744c431f9c 100644
--- a/tests/run-make/raw-dylib-alt-calling-convention/Makefile
+++ b/tests/run-make/raw-dylib-alt-calling-convention/Makefile
@@ -3,7 +3,7 @@
 # only-x86
 # only-windows
 
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 all:
 	$(RUSTC) --crate-type lib --crate-name raw_dylib_alt_calling_convention_test lib.rs
diff --git a/tests/run-make/raw-dylib-c/Makefile b/tests/run-make/raw-dylib-c/Makefile
index f47ab24f4fb..06e7935c026 100644
--- a/tests/run-make/raw-dylib-c/Makefile
+++ b/tests/run-make/raw-dylib-c/Makefile
@@ -2,7 +2,7 @@
 
 # only-windows
 
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 all:
 	$(RUSTC) --crate-type lib --crate-name raw_dylib_test lib.rs
diff --git a/tests/run-make/raw-dylib-cross-compilation/Makefile b/tests/run-make/raw-dylib-cross-compilation/Makefile
index 2a714f3a11f..a8f97edd689 100644
--- a/tests/run-make/raw-dylib-cross-compilation/Makefile
+++ b/tests/run-make/raw-dylib-cross-compilation/Makefile
@@ -7,7 +7,7 @@
 # i686 dlltool.exe can't product x64 binaries.
 # ignore-i686-pc-windows-gnu
 
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 all:
 	# Build as x86 and make sure that we have x86 objects only.
diff --git a/tests/run-make/raw-dylib-import-name-type/Makefile b/tests/run-make/raw-dylib-import-name-type/Makefile
index fcc60e88e1a..67152329807 100644
--- a/tests/run-make/raw-dylib-import-name-type/Makefile
+++ b/tests/run-make/raw-dylib-import-name-type/Makefile
@@ -3,7 +3,7 @@
 # only-x86
 # only-windows
 
--include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 all:
 	$(RUSTC) --crate-type bin driver.rs -L "$(TMPDIR)"
diff --git a/tests/run-make/raw-dylib-inline-cross-dylib/Makefile b/tests/run-make/raw-dylib-inline-cross-dylib/Makefile
index 722a49b02cb..6d1d04bfd37 100644
--- a/tests/run-make/raw-dylib-inline-cross-dylib/Makefile
+++ b/tests/run-make/raw-dylib-inline-cross-dylib/Makefile
@@ -2,7 +2,7 @@
 
 # only-windows
 
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 # We'd be using the llvm-objdump instead of the system objdump to ensure compatibility
 # with the LLVM bitcode generated by rustc but on Windows  piping/IO redirection under MSYS2 is wonky with llvm-objdump.
diff --git a/tests/run-make/raw-dylib-link-ordinal/Makefile b/tests/run-make/raw-dylib-link-ordinal/Makefile
index b55a94dbc46..374a0b59de3 100644
--- a/tests/run-make/raw-dylib-link-ordinal/Makefile
+++ b/tests/run-make/raw-dylib-link-ordinal/Makefile
@@ -2,7 +2,7 @@
 
 # only-windows
 
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 all:
 	$(RUSTC) --crate-type lib --crate-name raw_dylib_test lib.rs
diff --git a/tests/run-make/raw-dylib-stdcall-ordinal/Makefile b/tests/run-make/raw-dylib-stdcall-ordinal/Makefile
index b9deb7729c2..178c15ab3de 100644
--- a/tests/run-make/raw-dylib-stdcall-ordinal/Makefile
+++ b/tests/run-make/raw-dylib-stdcall-ordinal/Makefile
@@ -3,7 +3,7 @@
 # only-x86
 # only-windows
 
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 all:
 	$(RUSTC) --crate-type lib --crate-name raw_dylib_test lib.rs
diff --git a/tests/run-make-fulldeps/redundant-libs/Makefile b/tests/run-make/redundant-libs/Makefile
index b2dff05d163..0a48b2b2801 100644
--- a/tests/run-make-fulldeps/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-fulldeps/redundant-libs/bar.c b/tests/run-make/redundant-libs/bar.c
index e4259998678..e4259998678 100644
--- a/tests/run-make-fulldeps/redundant-libs/bar.c
+++ b/tests/run-make/redundant-libs/bar.c
diff --git a/tests/run-make-fulldeps/redundant-libs/baz.c b/tests/run-make/redundant-libs/baz.c
index a4e2c2b717f..a4e2c2b717f 100644
--- a/tests/run-make-fulldeps/redundant-libs/baz.c
+++ b/tests/run-make/redundant-libs/baz.c
diff --git a/tests/run-make-fulldeps/redundant-libs/foo.c b/tests/run-make/redundant-libs/foo.c
index 339ee86c99e..339ee86c99e 100644
--- a/tests/run-make-fulldeps/redundant-libs/foo.c
+++ b/tests/run-make/redundant-libs/foo.c
diff --git a/tests/run-make-fulldeps/redundant-libs/main.rs b/tests/run-make/redundant-libs/main.rs
index 90d185ff51d..90d185ff51d 100644
--- a/tests/run-make-fulldeps/redundant-libs/main.rs
+++ b/tests/run-make/redundant-libs/main.rs
diff --git a/tests/run-make-fulldeps/relocation-model/Makefile b/tests/run-make/relocation-model/Makefile
index a31dbfd9167..8cc5205ed51 100644
--- a/tests/run-make-fulldeps/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-fulldeps/relocation-model/foo.rs b/tests/run-make/relocation-model/foo.rs
index da0f5d925d1..da0f5d925d1 100644
--- a/tests/run-make-fulldeps/relocation-model/foo.rs
+++ b/tests/run-make/relocation-model/foo.rs
diff --git a/tests/run-make-fulldeps/relro-levels/Makefile b/tests/run-make/relro-levels/Makefile
index 6176fc1a589..e0402f59f12 100644
--- a/tests/run-make-fulldeps/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-fulldeps/relro-levels/hello.rs b/tests/run-make/relro-levels/hello.rs
index e7a11a969c0..e7a11a969c0 100644
--- a/tests/run-make-fulldeps/relro-levels/hello.rs
+++ b/tests/run-make/relro-levels/hello.rs
diff --git a/tests/run-make/remap-path-prefix-dwarf/Makefile b/tests/run-make/remap-path-prefix-dwarf/Makefile
index fbaea7b68fe..c9ede1b6027 100644
--- a/tests/run-make/remap-path-prefix-dwarf/Makefile
+++ b/tests/run-make/remap-path-prefix-dwarf/Makefile
@@ -6,7 +6,7 @@
 SRC_DIR := $(abspath .)
 SRC_DIR_PARENT := $(abspath ..)
 
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 all: \
   abs_input_outside_working_dir \
diff --git a/tests/run-make-fulldeps/remap-path-prefix/Makefile b/tests/run-make/remap-path-prefix/Makefile
index 2a7378fdf9e..2a7378fdf9e 100644
--- a/tests/run-make-fulldeps/remap-path-prefix/Makefile
+++ b/tests/run-make/remap-path-prefix/Makefile
diff --git a/tests/run-make-fulldeps/remap-path-prefix/auxiliary/lib.rs b/tests/run-make/remap-path-prefix/auxiliary/lib.rs
index 019c786a902..019c786a902 100644
--- a/tests/run-make-fulldeps/remap-path-prefix/auxiliary/lib.rs
+++ b/tests/run-make/remap-path-prefix/auxiliary/lib.rs
diff --git a/tests/run-make/repr128-dwarf/Makefile b/tests/run-make/repr128-dwarf/Makefile
index 2b03c22c0d0..3f933042724 100644
--- a/tests/run-make/repr128-dwarf/Makefile
+++ b/tests/run-make/repr128-dwarf/Makefile
@@ -2,7 +2,7 @@
 # This test should be replaced with one in tests/debuginfo once GDB or LLDB support 128-bit
 # enums.
 
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 all:
 	$(RUSTC) -Cdebuginfo=2 lib.rs -o $(TMPDIR)/repr128.rlib
diff --git a/tests/run-make-fulldeps/reproducible-build-2/Makefile b/tests/run-make/reproducible-build-2/Makefile
index 1df5e102ce3..68fcac8b47f 100644
--- a/tests/run-make-fulldeps/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-fulldeps/reproducible-build-2/linker.rs b/tests/run-make/reproducible-build-2/linker.rs
index 998d1f32859..998d1f32859 100644
--- a/tests/run-make-fulldeps/reproducible-build-2/linker.rs
+++ b/tests/run-make/reproducible-build-2/linker.rs
diff --git a/tests/run-make-fulldeps/reproducible-build-2/reproducible-build-aux.rs b/tests/run-make/reproducible-build-2/reproducible-build-aux.rs
index 8105b3d2bda..8105b3d2bda 100644
--- a/tests/run-make-fulldeps/reproducible-build-2/reproducible-build-aux.rs
+++ b/tests/run-make/reproducible-build-2/reproducible-build-aux.rs
diff --git a/tests/run-make-fulldeps/reproducible-build-2/reproducible-build.rs b/tests/run-make/reproducible-build-2/reproducible-build.rs
index a6c04774c86..a6c04774c86 100644
--- a/tests/run-make-fulldeps/reproducible-build-2/reproducible-build.rs
+++ b/tests/run-make/reproducible-build-2/reproducible-build.rs
diff --git a/tests/run-make-fulldeps/reproducible-build/Makefile b/tests/run-make/reproducible-build/Makefile
index 642a480815b..f5d17a234c0 100644
--- a/tests/run-make-fulldeps/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-fulldeps/reproducible-build/linker.rs b/tests/run-make/reproducible-build/linker.rs
index 3dda6f190e4..3dda6f190e4 100644
--- a/tests/run-make-fulldeps/reproducible-build/linker.rs
+++ b/tests/run-make/reproducible-build/linker.rs
diff --git a/tests/run-make-fulldeps/reproducible-build/reproducible-build-aux.rs b/tests/run-make/reproducible-build/reproducible-build-aux.rs
index 8105b3d2bda..8105b3d2bda 100644
--- a/tests/run-make-fulldeps/reproducible-build/reproducible-build-aux.rs
+++ b/tests/run-make/reproducible-build/reproducible-build-aux.rs
diff --git a/tests/run-make-fulldeps/reproducible-build/reproducible-build.rs b/tests/run-make/reproducible-build/reproducible-build.rs
index a6c04774c86..a6c04774c86 100644
--- a/tests/run-make-fulldeps/reproducible-build/reproducible-build.rs
+++ b/tests/run-make/reproducible-build/reproducible-build.rs
diff --git a/tests/run-make-fulldeps/resolve-rename/Makefile b/tests/run-make/resolve-rename/Makefile
index 00f83a5d6b2..00f83a5d6b2 100644
--- a/tests/run-make-fulldeps/resolve-rename/Makefile
+++ b/tests/run-make/resolve-rename/Makefile
diff --git a/tests/run-make-fulldeps/resolve-rename/bar.rs b/tests/run-make/resolve-rename/bar.rs
index 4a09ce355e6..4a09ce355e6 100644
--- a/tests/run-make-fulldeps/resolve-rename/bar.rs
+++ b/tests/run-make/resolve-rename/bar.rs
diff --git a/tests/run-make-fulldeps/resolve-rename/baz.rs b/tests/run-make/resolve-rename/baz.rs
index 9176073ef97..9176073ef97 100644
--- a/tests/run-make-fulldeps/resolve-rename/baz.rs
+++ b/tests/run-make/resolve-rename/baz.rs
diff --git a/tests/run-make-fulldeps/resolve-rename/foo.rs b/tests/run-make/resolve-rename/foo.rs
index bd6820098ee..bd6820098ee 100644
--- a/tests/run-make-fulldeps/resolve-rename/foo.rs
+++ b/tests/run-make/resolve-rename/foo.rs
diff --git a/tests/run-make-fulldeps/return-non-c-like-enum-from-c/Makefile b/tests/run-make/return-non-c-like-enum-from-c/Makefile
index 42d3c977f75..bd441d321bf 100644
--- a/tests/run-make-fulldeps/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-fulldeps/return-non-c-like-enum-from-c/nonclike.rs b/tests/run-make/return-non-c-like-enum-from-c/nonclike.rs
index ea22a2a56e0..ea22a2a56e0 100644
--- a/tests/run-make-fulldeps/return-non-c-like-enum-from-c/nonclike.rs
+++ b/tests/run-make/return-non-c-like-enum-from-c/nonclike.rs
diff --git a/tests/run-make-fulldeps/return-non-c-like-enum-from-c/test.c b/tests/run-make/return-non-c-like-enum-from-c/test.c
index 3ad135bab4a..3ad135bab4a 100644
--- a/tests/run-make-fulldeps/return-non-c-like-enum-from-c/test.c
+++ b/tests/run-make/return-non-c-like-enum-from-c/test.c
diff --git a/tests/run-make-fulldeps/return-non-c-like-enum/Makefile b/tests/run-make/return-non-c-like-enum/Makefile
index 513311c8289..0c8d8bf3acc 100644
--- a/tests/run-make-fulldeps/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-fulldeps/return-non-c-like-enum/nonclike.rs b/tests/run-make/return-non-c-like-enum/nonclike.rs
index de529cf641a..de529cf641a 100644
--- a/tests/run-make-fulldeps/return-non-c-like-enum/nonclike.rs
+++ b/tests/run-make/return-non-c-like-enum/nonclike.rs
diff --git a/tests/run-make-fulldeps/return-non-c-like-enum/test.c b/tests/run-make/return-non-c-like-enum/test.c
index afadd3c10c5..afadd3c10c5 100644
--- a/tests/run-make-fulldeps/return-non-c-like-enum/test.c
+++ b/tests/run-make/return-non-c-like-enum/test.c
diff --git a/tests/run-make-fulldeps/rlib-chain/Makefile b/tests/run-make/rlib-chain/Makefile
index 236943a2a3b..7a1f887fa52 100644
--- a/tests/run-make-fulldeps/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-fulldeps/rlib-chain/m1.rs b/tests/run-make/rlib-chain/m1.rs
index 665b206ccf1..665b206ccf1 100644
--- a/tests/run-make-fulldeps/rlib-chain/m1.rs
+++ b/tests/run-make/rlib-chain/m1.rs
diff --git a/tests/run-make-fulldeps/rlib-chain/m2.rs b/tests/run-make/rlib-chain/m2.rs
index eba12fe1218..eba12fe1218 100644
--- a/tests/run-make-fulldeps/rlib-chain/m2.rs
+++ b/tests/run-make/rlib-chain/m2.rs
diff --git a/tests/run-make-fulldeps/rlib-chain/m3.rs b/tests/run-make/rlib-chain/m3.rs
index ade191db49c..ade191db49c 100644
--- a/tests/run-make-fulldeps/rlib-chain/m3.rs
+++ b/tests/run-make/rlib-chain/m3.rs
diff --git a/tests/run-make-fulldeps/rlib-chain/m4.rs b/tests/run-make/rlib-chain/m4.rs
index fa8ec6079de..fa8ec6079de 100644
--- a/tests/run-make-fulldeps/rlib-chain/m4.rs
+++ b/tests/run-make/rlib-chain/m4.rs
diff --git a/tests/run-make/rlib-format-packed-bundled-libs-2/Makefile b/tests/run-make/rlib-format-packed-bundled-libs-2/Makefile
index 37b8d809a27..d2a740b06b3 100644
--- a/tests/run-make/rlib-format-packed-bundled-libs-2/Makefile
+++ b/tests/run-make/rlib-format-packed-bundled-libs-2/Makefile
@@ -1,4 +1,4 @@
--include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 # ignore-cross-compile
 
diff --git a/tests/run-make/rlib-format-packed-bundled-libs-3/Makefile b/tests/run-make/rlib-format-packed-bundled-libs-3/Makefile
index 62dc1b5f606..1f2812cb087 100644
--- a/tests/run-make/rlib-format-packed-bundled-libs-3/Makefile
+++ b/tests/run-make/rlib-format-packed-bundled-libs-3/Makefile
@@ -1,4 +1,4 @@
--include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 # ignore-cross-compile
 # only-linux
diff --git a/tests/run-make/rlib-format-packed-bundled-libs/Makefile b/tests/run-make/rlib-format-packed-bundled-libs/Makefile
index 7fb6ce8d1e4..f454da67893 100644
--- a/tests/run-make/rlib-format-packed-bundled-libs/Makefile
+++ b/tests/run-make/rlib-format-packed-bundled-libs/Makefile
@@ -1,4 +1,4 @@
--include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 # ignore-cross-compile
 
diff --git a/tests/run-make/rustc-macro-dep-files/Makefile b/tests/run-make/rustc-macro-dep-files/Makefile
index 6ae659db2e9..76d713c4bb3 100644
--- a/tests/run-make/rustc-macro-dep-files/Makefile
+++ b/tests/run-make/rustc-macro-dep-files/Makefile
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 # FIXME(eddyb) provide `HOST_RUSTC` and `TARGET_RUSTC`
 # instead of hardcoding them everywhere they're needed.
diff --git a/tests/run-make-fulldeps/rustdoc-determinism/Makefile b/tests/run-make/rustdoc-determinism/Makefile
index a3ef1690671..a3ef1690671 100644
--- a/tests/run-make-fulldeps/rustdoc-determinism/Makefile
+++ b/tests/run-make/rustdoc-determinism/Makefile
diff --git a/tests/run-make-fulldeps/rustdoc-determinism/bar.rs b/tests/run-make/rustdoc-determinism/bar.rs
index ca05a6a9076..ca05a6a9076 100644
--- a/tests/run-make-fulldeps/rustdoc-determinism/bar.rs
+++ b/tests/run-make/rustdoc-determinism/bar.rs
diff --git a/tests/run-make-fulldeps/rustdoc-determinism/foo.rs b/tests/run-make/rustdoc-determinism/foo.rs
index 4a835673a59..4a835673a59 100644
--- a/tests/run-make-fulldeps/rustdoc-determinism/foo.rs
+++ b/tests/run-make/rustdoc-determinism/foo.rs
diff --git a/tests/run-make-fulldeps/rustdoc-error-lines/Makefile b/tests/run-make/rustdoc-error-lines/Makefile
index 2dc30f56b83..2dc30f56b83 100644
--- a/tests/run-make-fulldeps/rustdoc-error-lines/Makefile
+++ b/tests/run-make/rustdoc-error-lines/Makefile
diff --git a/tests/run-make-fulldeps/rustdoc-error-lines/input.rs b/tests/run-make/rustdoc-error-lines/input.rs
index b4db182e85f..b4db182e85f 100644
--- a/tests/run-make-fulldeps/rustdoc-error-lines/input.rs
+++ b/tests/run-make/rustdoc-error-lines/input.rs
diff --git a/tests/run-make-fulldeps/rustdoc-io-error/Makefile b/tests/run-make/rustdoc-io-error/Makefile
index 27f5ecf94ab..27f5ecf94ab 100644
--- a/tests/run-make-fulldeps/rustdoc-io-error/Makefile
+++ b/tests/run-make/rustdoc-io-error/Makefile
diff --git a/tests/run-make-fulldeps/rustdoc-io-error/foo.rs b/tests/run-make/rustdoc-io-error/foo.rs
index 4a835673a59..4a835673a59 100644
--- a/tests/run-make-fulldeps/rustdoc-io-error/foo.rs
+++ b/tests/run-make/rustdoc-io-error/foo.rs
diff --git a/tests/run-make-fulldeps/rustdoc-map-file/Makefile b/tests/run-make/rustdoc-map-file/Makefile
index 5cbf7747af6..5cbf7747af6 100644
--- a/tests/run-make-fulldeps/rustdoc-map-file/Makefile
+++ b/tests/run-make/rustdoc-map-file/Makefile
diff --git a/tests/run-make-fulldeps/rustdoc-map-file/expected.json b/tests/run-make/rustdoc-map-file/expected.json
index 6b1ccbeac30..6b1ccbeac30 100644
--- a/tests/run-make-fulldeps/rustdoc-map-file/expected.json
+++ b/tests/run-make/rustdoc-map-file/expected.json
diff --git a/tests/run-make-fulldeps/rustdoc-map-file/foo.rs b/tests/run-make/rustdoc-map-file/foo.rs
index e12b9d2292c..e12b9d2292c 100644
--- a/tests/run-make-fulldeps/rustdoc-map-file/foo.rs
+++ b/tests/run-make/rustdoc-map-file/foo.rs
diff --git a/tests/run-make-fulldeps/rustdoc-map-file/validate_json.py b/tests/run-make/rustdoc-map-file/validate_json.py
index 5c14c90b70d..5c14c90b70d 100755
--- a/tests/run-make-fulldeps/rustdoc-map-file/validate_json.py
+++ b/tests/run-make/rustdoc-map-file/validate_json.py
diff --git a/tests/run-make-fulldeps/rustdoc-output-path/Makefile b/tests/run-make/rustdoc-output-path/Makefile
index 8f5cda9e56e..8f5cda9e56e 100644
--- a/tests/run-make-fulldeps/rustdoc-output-path/Makefile
+++ b/tests/run-make/rustdoc-output-path/Makefile
diff --git a/tests/run-make-fulldeps/rustdoc-output-path/foo.rs b/tests/run-make/rustdoc-output-path/foo.rs
index 4a835673a59..4a835673a59 100644
--- a/tests/run-make-fulldeps/rustdoc-output-path/foo.rs
+++ b/tests/run-make/rustdoc-output-path/foo.rs
diff --git a/tests/run-make-fulldeps/rustdoc-scrape-examples-macros/Makefile b/tests/run-make/rustdoc-scrape-examples-macros/Makefile
index c857aa4b993..edc19d8cb5d 100644
--- a/tests/run-make-fulldeps/rustdoc-scrape-examples-macros/Makefile
+++ b/tests/run-make/rustdoc-scrape-examples-macros/Makefile
@@ -1,4 +1,5 @@
-include ../../run-make-fulldeps/tools.mk
+# ignore-cross-compile
+include ../../run-make/tools.mk
 
 OUTPUT_DIR := "$(TMPDIR)/rustdoc"
 DYLIB_NAME := $(shell echo | $(RUSTC) --crate-name foobar_macro --crate-type dylib --print file-names -)
diff --git a/tests/run-make-fulldeps/rustdoc-scrape-examples-macros/examples/ex.rs b/tests/run-make/rustdoc-scrape-examples-macros/examples/ex.rs
index 4d8c8b30e31..4d8c8b30e31 100644
--- a/tests/run-make-fulldeps/rustdoc-scrape-examples-macros/examples/ex.rs
+++ b/tests/run-make/rustdoc-scrape-examples-macros/examples/ex.rs
diff --git a/tests/run-make-fulldeps/rustdoc-scrape-examples-macros/src/lib.rs b/tests/run-make/rustdoc-scrape-examples-macros/src/lib.rs
index d8658a0f255..d8658a0f255 100644
--- a/tests/run-make-fulldeps/rustdoc-scrape-examples-macros/src/lib.rs
+++ b/tests/run-make/rustdoc-scrape-examples-macros/src/lib.rs
diff --git a/tests/run-make-fulldeps/rustdoc-scrape-examples-macros/src/proc.rs b/tests/run-make/rustdoc-scrape-examples-macros/src/proc.rs
index 46e518fdf6a..46e518fdf6a 100644
--- a/tests/run-make-fulldeps/rustdoc-scrape-examples-macros/src/proc.rs
+++ b/tests/run-make/rustdoc-scrape-examples-macros/src/proc.rs
diff --git a/tests/run-make/rustdoc-scrape-examples-multiple/scrape.mk b/tests/run-make/rustdoc-scrape-examples-multiple/scrape.mk
index 7a28d2145d5..57220bc6635 100644
--- a/tests/run-make/rustdoc-scrape-examples-multiple/scrape.mk
+++ b/tests/run-make/rustdoc-scrape-examples-multiple/scrape.mk
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 OUTPUT_DIR := "$(TMPDIR)/rustdoc"
 
diff --git a/tests/run-make-fulldeps/rustdoc-target-spec-json-path/Makefile b/tests/run-make/rustdoc-target-spec-json-path/Makefile
index 6d0bc4186f2..6d0bc4186f2 100644
--- a/tests/run-make-fulldeps/rustdoc-target-spec-json-path/Makefile
+++ b/tests/run-make/rustdoc-target-spec-json-path/Makefile
diff --git a/tests/run-make-fulldeps/rustdoc-target-spec-json-path/dummy_core.rs b/tests/run-make/rustdoc-target-spec-json-path/dummy_core.rs
index da27b7f3463..da27b7f3463 100644
--- a/tests/run-make-fulldeps/rustdoc-target-spec-json-path/dummy_core.rs
+++ b/tests/run-make/rustdoc-target-spec-json-path/dummy_core.rs
diff --git a/tests/run-make-fulldeps/rustdoc-target-spec-json-path/my_crate.rs b/tests/run-make/rustdoc-target-spec-json-path/my_crate.rs
index 12aa0822084..12aa0822084 100644
--- a/tests/run-make-fulldeps/rustdoc-target-spec-json-path/my_crate.rs
+++ b/tests/run-make/rustdoc-target-spec-json-path/my_crate.rs
diff --git a/tests/run-make-fulldeps/rustdoc-target-spec-json-path/target.json b/tests/run-make/rustdoc-target-spec-json-path/target.json
index 34357182c20..34357182c20 100644
--- a/tests/run-make-fulldeps/rustdoc-target-spec-json-path/target.json
+++ b/tests/run-make/rustdoc-target-spec-json-path/target.json
diff --git a/tests/run-make-fulldeps/rustdoc-themes/Makefile b/tests/run-make/rustdoc-themes/Makefile
index a6d9a43addf..a6d9a43addf 100644
--- a/tests/run-make-fulldeps/rustdoc-themes/Makefile
+++ b/tests/run-make/rustdoc-themes/Makefile
diff --git a/tests/run-make-fulldeps/rustdoc-themes/foo.rs b/tests/run-make/rustdoc-themes/foo.rs
index 995544aeff9..995544aeff9 100644
--- a/tests/run-make-fulldeps/rustdoc-themes/foo.rs
+++ b/tests/run-make/rustdoc-themes/foo.rs
diff --git a/tests/run-make/rustdoc-verify-output-files/Makefile b/tests/run-make/rustdoc-verify-output-files/Makefile
index 0666122e8ab..57ac7078d14 100644
--- a/tests/run-make/rustdoc-verify-output-files/Makefile
+++ b/tests/run-make/rustdoc-verify-output-files/Makefile
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 OUTPUT_DIR := "$(TMPDIR)/rustdoc"
 TMP_OUTPUT_DIR := "$(TMPDIR)/tmp-rustdoc"
diff --git a/tests/run-make/rustdoc-with-out-dir-option/Makefile b/tests/run-make/rustdoc-with-out-dir-option/Makefile
index b3c3f5230c1..f5d5060ed13 100644
--- a/tests/run-make/rustdoc-with-out-dir-option/Makefile
+++ b/tests/run-make/rustdoc-with-out-dir-option/Makefile
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 OUTPUT_DIR := "$(TMPDIR)/rustdoc"
 
diff --git a/tests/run-make/rustdoc-with-output-option/Makefile b/tests/run-make/rustdoc-with-output-option/Makefile
index 02093a35cfc..d0a8205a8ee 100644
--- a/tests/run-make/rustdoc-with-output-option/Makefile
+++ b/tests/run-make/rustdoc-with-output-option/Makefile
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 OUTPUT_DIR := "$(TMPDIR)/rustdoc"
 
diff --git a/tests/run-make/rustdoc-with-short-out-dir-option/Makefile b/tests/run-make/rustdoc-with-short-out-dir-option/Makefile
index dc5056a86dd..1b9327bce22 100644
--- a/tests/run-make/rustdoc-with-short-out-dir-option/Makefile
+++ b/tests/run-make/rustdoc-with-short-out-dir-option/Makefile
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 OUTPUT_DIR := "$(TMPDIR)/rustdoc"
 
diff --git a/tests/run-make-fulldeps/sanitizer-cdylib-link/Makefile b/tests/run-make/sanitizer-cdylib-link/Makefile
index 691585268bf..691585268bf 100644
--- a/tests/run-make-fulldeps/sanitizer-cdylib-link/Makefile
+++ b/tests/run-make/sanitizer-cdylib-link/Makefile
diff --git a/tests/run-make-fulldeps/sanitizer-cdylib-link/library.rs b/tests/run-make/sanitizer-cdylib-link/library.rs
index f2a52cb5ca1..f2a52cb5ca1 100644
--- a/tests/run-make-fulldeps/sanitizer-cdylib-link/library.rs
+++ b/tests/run-make/sanitizer-cdylib-link/library.rs
diff --git a/tests/run-make-fulldeps/sanitizer-cdylib-link/program.rs b/tests/run-make/sanitizer-cdylib-link/program.rs
index ef053aa2e7a..ef053aa2e7a 100644
--- a/tests/run-make-fulldeps/sanitizer-cdylib-link/program.rs
+++ b/tests/run-make/sanitizer-cdylib-link/program.rs
diff --git a/tests/run-make-fulldeps/sanitizer-dylib-link/Makefile b/tests/run-make/sanitizer-dylib-link/Makefile
index b0a91e5b197..b0a91e5b197 100644
--- a/tests/run-make-fulldeps/sanitizer-dylib-link/Makefile
+++ b/tests/run-make/sanitizer-dylib-link/Makefile
diff --git a/tests/run-make-fulldeps/sanitizer-dylib-link/library.rs b/tests/run-make/sanitizer-dylib-link/library.rs
index f2a52cb5ca1..f2a52cb5ca1 100644
--- a/tests/run-make-fulldeps/sanitizer-dylib-link/library.rs
+++ b/tests/run-make/sanitizer-dylib-link/library.rs
diff --git a/tests/run-make-fulldeps/sanitizer-dylib-link/program.rs b/tests/run-make/sanitizer-dylib-link/program.rs
index ef053aa2e7a..ef053aa2e7a 100644
--- a/tests/run-make-fulldeps/sanitizer-dylib-link/program.rs
+++ b/tests/run-make/sanitizer-dylib-link/program.rs
diff --git a/tests/run-make-fulldeps/sanitizer-staticlib-link/Makefile b/tests/run-make/sanitizer-staticlib-link/Makefile
index 7b1a286ed12..7b1a286ed12 100644
--- a/tests/run-make-fulldeps/sanitizer-staticlib-link/Makefile
+++ b/tests/run-make/sanitizer-staticlib-link/Makefile
diff --git a/tests/run-make-fulldeps/sanitizer-staticlib-link/library.rs b/tests/run-make/sanitizer-staticlib-link/library.rs
index f2a52cb5ca1..f2a52cb5ca1 100644
--- a/tests/run-make-fulldeps/sanitizer-staticlib-link/library.rs
+++ b/tests/run-make/sanitizer-staticlib-link/library.rs
diff --git a/tests/run-make-fulldeps/sanitizer-staticlib-link/program.c b/tests/run-make/sanitizer-staticlib-link/program.c
index 735e2b147fd..735e2b147fd 100644
--- a/tests/run-make-fulldeps/sanitizer-staticlib-link/program.c
+++ b/tests/run-make/sanitizer-staticlib-link/program.c
diff --git a/tests/run-make-fulldeps/sanitizer-staticlib-link/program.rs b/tests/run-make/sanitizer-staticlib-link/program.rs
index ec59bdb11c8..ec59bdb11c8 100644
--- a/tests/run-make-fulldeps/sanitizer-staticlib-link/program.rs
+++ b/tests/run-make/sanitizer-staticlib-link/program.rs
diff --git a/tests/run-make-fulldeps/separate-link-fail/Makefile b/tests/run-make/separate-link-fail/Makefile
index bfd18fbf972..bfd18fbf972 100644
--- a/tests/run-make-fulldeps/separate-link-fail/Makefile
+++ b/tests/run-make/separate-link-fail/Makefile
diff --git a/tests/run-make-fulldeps/separate-link/Makefile b/tests/run-make/separate-link/Makefile
index 3ccdb6275d1..d01158d9f5f 100644
--- a/tests/run-make-fulldeps/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-fulldeps/sepcomp-cci-copies/Makefile b/tests/run-make/sepcomp-cci-copies/Makefile
index df289d0b0b1..df289d0b0b1 100644
--- a/tests/run-make-fulldeps/sepcomp-cci-copies/Makefile
+++ b/tests/run-make/sepcomp-cci-copies/Makefile
diff --git a/tests/run-make-fulldeps/sepcomp-cci-copies/cci_lib.rs b/tests/run-make/sepcomp-cci-copies/cci_lib.rs
index 869d4a6cd3e..869d4a6cd3e 100644
--- a/tests/run-make-fulldeps/sepcomp-cci-copies/cci_lib.rs
+++ b/tests/run-make/sepcomp-cci-copies/cci_lib.rs
diff --git a/tests/run-make-fulldeps/sepcomp-cci-copies/foo.rs b/tests/run-make/sepcomp-cci-copies/foo.rs
index ba251fcb0ac..ba251fcb0ac 100644
--- a/tests/run-make-fulldeps/sepcomp-cci-copies/foo.rs
+++ b/tests/run-make/sepcomp-cci-copies/foo.rs
diff --git a/tests/run-make-fulldeps/sepcomp-inlining/Makefile b/tests/run-make/sepcomp-inlining/Makefile
index 327aeb75e5e..327aeb75e5e 100644
--- a/tests/run-make-fulldeps/sepcomp-inlining/Makefile
+++ b/tests/run-make/sepcomp-inlining/Makefile
diff --git a/tests/run-make-fulldeps/sepcomp-inlining/foo.rs b/tests/run-make/sepcomp-inlining/foo.rs
index 2fe5f9cb726..2fe5f9cb726 100644
--- a/tests/run-make-fulldeps/sepcomp-inlining/foo.rs
+++ b/tests/run-make/sepcomp-inlining/foo.rs
diff --git a/tests/run-make-fulldeps/sepcomp-separate/Makefile b/tests/run-make/sepcomp-separate/Makefile
index 62cf54a88fb..62cf54a88fb 100644
--- a/tests/run-make-fulldeps/sepcomp-separate/Makefile
+++ b/tests/run-make/sepcomp-separate/Makefile
diff --git a/tests/run-make-fulldeps/sepcomp-separate/foo.rs b/tests/run-make/sepcomp-separate/foo.rs
index 169bafa9b3a..169bafa9b3a 100644
--- a/tests/run-make-fulldeps/sepcomp-separate/foo.rs
+++ b/tests/run-make/sepcomp-separate/foo.rs
diff --git a/tests/run-make-fulldeps/share-generics-dylib/Makefile b/tests/run-make/share-generics-dylib/Makefile
index 065fb574c3c..9d97eca80d3 100644
--- a/tests/run-make-fulldeps/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
@@ -9,7 +10,7 @@
 #
 # This is regression test for https://github.com/rust-lang/rust/issues/67276.
 
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 COMMON_ARGS=-Cprefer-dynamic -Zshare-generics=yes -Ccodegen-units=1 -Csymbol-mangling-version=v0
 
diff --git a/tests/run-make-fulldeps/share-generics-dylib/instance_provider_a.rs b/tests/run-make/share-generics-dylib/instance_provider_a.rs
index b4e125ac052..b4e125ac052 100644
--- a/tests/run-make-fulldeps/share-generics-dylib/instance_provider_a.rs
+++ b/tests/run-make/share-generics-dylib/instance_provider_a.rs
diff --git a/tests/run-make-fulldeps/share-generics-dylib/instance_provider_b.rs b/tests/run-make/share-generics-dylib/instance_provider_b.rs
index f613db873e6..f613db873e6 100644
--- a/tests/run-make-fulldeps/share-generics-dylib/instance_provider_b.rs
+++ b/tests/run-make/share-generics-dylib/instance_provider_b.rs
diff --git a/tests/run-make-fulldeps/share-generics-dylib/instance_user_a_rlib.rs b/tests/run-make/share-generics-dylib/instance_user_a_rlib.rs
index c8e6ab95cf9..c8e6ab95cf9 100644
--- a/tests/run-make-fulldeps/share-generics-dylib/instance_user_a_rlib.rs
+++ b/tests/run-make/share-generics-dylib/instance_user_a_rlib.rs
diff --git a/tests/run-make-fulldeps/share-generics-dylib/instance_user_b_rlib.rs b/tests/run-make/share-generics-dylib/instance_user_b_rlib.rs
index 7c34af6d0dc..7c34af6d0dc 100644
--- a/tests/run-make-fulldeps/share-generics-dylib/instance_user_b_rlib.rs
+++ b/tests/run-make/share-generics-dylib/instance_user_b_rlib.rs
diff --git a/tests/run-make-fulldeps/share-generics-dylib/instance_user_dylib.rs b/tests/run-make/share-generics-dylib/instance_user_dylib.rs
index 7c8368eec65..7c8368eec65 100644
--- a/tests/run-make-fulldeps/share-generics-dylib/instance_user_dylib.rs
+++ b/tests/run-make/share-generics-dylib/instance_user_dylib.rs
diff --git a/tests/run-make-fulldeps/share-generics-dylib/linked_leaf.rs b/tests/run-make/share-generics-dylib/linked_leaf.rs
index e510dad691c..e510dad691c 100644
--- a/tests/run-make-fulldeps/share-generics-dylib/linked_leaf.rs
+++ b/tests/run-make/share-generics-dylib/linked_leaf.rs
diff --git a/tests/run-make-fulldeps/simd-ffi/Makefile b/tests/run-make/simd-ffi/Makefile
index 29735347041..29735347041 100644
--- a/tests/run-make-fulldeps/simd-ffi/Makefile
+++ b/tests/run-make/simd-ffi/Makefile
diff --git a/tests/run-make-fulldeps/simd-ffi/simd.rs b/tests/run-make/simd-ffi/simd.rs
index d11cfd77c5b..d11cfd77c5b 100644
--- a/tests/run-make-fulldeps/simd-ffi/simd.rs
+++ b/tests/run-make/simd-ffi/simd.rs
diff --git a/tests/run-make-fulldeps/simple-dylib/Makefile b/tests/run-make/simple-dylib/Makefile
index 5dda5d66d1c..f3e1c1da88c 100644
--- a/tests/run-make-fulldeps/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-fulldeps/simple-dylib/bar.rs b/tests/run-make/simple-dylib/bar.rs
index c5c0bc606cd..c5c0bc606cd 100644
--- a/tests/run-make-fulldeps/simple-dylib/bar.rs
+++ b/tests/run-make/simple-dylib/bar.rs
diff --git a/tests/run-make-fulldeps/simple-dylib/foo.rs b/tests/run-make/simple-dylib/foo.rs
index 8d68535e3b6..8d68535e3b6 100644
--- a/tests/run-make-fulldeps/simple-dylib/foo.rs
+++ b/tests/run-make/simple-dylib/foo.rs
diff --git a/tests/run-make-fulldeps/simple-rlib/Makefile b/tests/run-make/simple-rlib/Makefile
index d912b8a7bab..28df61a1547 100644
--- a/tests/run-make-fulldeps/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-fulldeps/simple-rlib/bar.rs b/tests/run-make/simple-rlib/bar.rs
index c5c0bc606cd..c5c0bc606cd 100644
--- a/tests/run-make-fulldeps/simple-rlib/bar.rs
+++ b/tests/run-make/simple-rlib/bar.rs
diff --git a/tests/run-make-fulldeps/simple-rlib/foo.rs b/tests/run-make/simple-rlib/foo.rs
index 8d68535e3b6..8d68535e3b6 100644
--- a/tests/run-make-fulldeps/simple-rlib/foo.rs
+++ b/tests/run-make/simple-rlib/foo.rs
diff --git a/tests/run-make-fulldeps/split-debuginfo/Makefile b/tests/run-make/split-debuginfo/Makefile
index 44cda0d3d11..71e014c1f71 100644
--- a/tests/run-make-fulldeps/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-fulldeps/split-debuginfo/bar.rs b/tests/run-make/split-debuginfo/bar.rs
index 07dd0715252..07dd0715252 100644
--- a/tests/run-make-fulldeps/split-debuginfo/bar.rs
+++ b/tests/run-make/split-debuginfo/bar.rs
diff --git a/tests/run-make-fulldeps/split-debuginfo/baz.rs b/tests/run-make/split-debuginfo/baz.rs
index 8b1a393741c..8b1a393741c 100644
--- a/tests/run-make-fulldeps/split-debuginfo/baz.rs
+++ b/tests/run-make/split-debuginfo/baz.rs
diff --git a/tests/run-make-fulldeps/split-debuginfo/foo.rs b/tests/run-make/split-debuginfo/foo.rs
index b058e540862..b058e540862 100644
--- a/tests/run-make-fulldeps/split-debuginfo/foo.rs
+++ b/tests/run-make/split-debuginfo/foo.rs
diff --git a/tests/run-make-fulldeps/split-debuginfo/main.rs b/tests/run-make/split-debuginfo/main.rs
index 21fa16e40a4..21fa16e40a4 100644
--- a/tests/run-make-fulldeps/split-debuginfo/main.rs
+++ b/tests/run-make/split-debuginfo/main.rs
diff --git a/tests/run-make-fulldeps/stable-symbol-names/Makefile b/tests/run-make/stable-symbol-names/Makefile
index bbfb8e38881..bbfb8e38881 100644
--- a/tests/run-make-fulldeps/stable-symbol-names/Makefile
+++ b/tests/run-make/stable-symbol-names/Makefile
diff --git a/tests/run-make-fulldeps/stable-symbol-names/stable-symbol-names1.rs b/tests/run-make/stable-symbol-names/stable-symbol-names1.rs
index b85a428278c..b85a428278c 100644
--- a/tests/run-make-fulldeps/stable-symbol-names/stable-symbol-names1.rs
+++ b/tests/run-make/stable-symbol-names/stable-symbol-names1.rs
diff --git a/tests/run-make-fulldeps/stable-symbol-names/stable-symbol-names2.rs b/tests/run-make/stable-symbol-names/stable-symbol-names2.rs
index 33df9d6c689..33df9d6c689 100644
--- a/tests/run-make-fulldeps/stable-symbol-names/stable-symbol-names2.rs
+++ b/tests/run-make/stable-symbol-names/stable-symbol-names2.rs
diff --git a/tests/run-make-fulldeps/static-dylib-by-default/Makefile b/tests/run-make/static-dylib-by-default/Makefile
index eedd0b32092..cdaab42d06c 100644
--- a/tests/run-make-fulldeps/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-fulldeps/static-dylib-by-default/bar.rs b/tests/run-make/static-dylib-by-default/bar.rs
index 14421165e2d..14421165e2d 100644
--- a/tests/run-make-fulldeps/static-dylib-by-default/bar.rs
+++ b/tests/run-make/static-dylib-by-default/bar.rs
diff --git a/tests/run-make-fulldeps/static-dylib-by-default/foo.rs b/tests/run-make/static-dylib-by-default/foo.rs
index 7ebec872055..7ebec872055 100644
--- a/tests/run-make-fulldeps/static-dylib-by-default/foo.rs
+++ b/tests/run-make/static-dylib-by-default/foo.rs
diff --git a/tests/run-make-fulldeps/static-dylib-by-default/main.c b/tests/run-make/static-dylib-by-default/main.c
index 5f7f2c27cd3..5f7f2c27cd3 100644
--- a/tests/run-make-fulldeps/static-dylib-by-default/main.c
+++ b/tests/run-make/static-dylib-by-default/main.c
diff --git a/tests/run-make-fulldeps/static-extern-type/Makefile b/tests/run-make/static-extern-type/Makefile
index e9aa95e63a0..77897154322 100644
--- a/tests/run-make-fulldeps/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-fulldeps/static-extern-type/define-foo.c b/tests/run-make/static-extern-type/define-foo.c
index 39be5acfa11..39be5acfa11 100644
--- a/tests/run-make-fulldeps/static-extern-type/define-foo.c
+++ b/tests/run-make/static-extern-type/define-foo.c
diff --git a/tests/run-make-fulldeps/static-extern-type/use-foo.rs b/tests/run-make/static-extern-type/use-foo.rs
index 932b5b5944b..932b5b5944b 100644
--- a/tests/run-make-fulldeps/static-extern-type/use-foo.rs
+++ b/tests/run-make/static-extern-type/use-foo.rs
diff --git a/tests/run-make/static-pie/Makefile b/tests/run-make/static-pie/Makefile
index f4e6adf1b18..19c041d9428 100644
--- a/tests/run-make/static-pie/Makefile
+++ b/tests/run-make/static-pie/Makefile
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 # only-x86_64
 # only-linux
diff --git a/tests/run-make-fulldeps/static-unwinding/Makefile b/tests/run-make/static-unwinding/Makefile
index 9c755d4ab18..dec94fb16f4 100644
--- a/tests/run-make-fulldeps/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-fulldeps/static-unwinding/lib.rs b/tests/run-make/static-unwinding/lib.rs
index 3fb1117a110..3fb1117a110 100644
--- a/tests/run-make-fulldeps/static-unwinding/lib.rs
+++ b/tests/run-make/static-unwinding/lib.rs
diff --git a/tests/run-make-fulldeps/static-unwinding/main.rs b/tests/run-make/static-unwinding/main.rs
index 0c66ea1aa07..0c66ea1aa07 100644
--- a/tests/run-make-fulldeps/static-unwinding/main.rs
+++ b/tests/run-make/static-unwinding/main.rs
diff --git a/tests/run-make-fulldeps/staticlib-blank-lib/Makefile b/tests/run-make/staticlib-blank-lib/Makefile
index fcbf87758fb..fcbf87758fb 100644
--- a/tests/run-make-fulldeps/staticlib-blank-lib/Makefile
+++ b/tests/run-make/staticlib-blank-lib/Makefile
diff --git a/tests/run-make-fulldeps/staticlib-blank-lib/foo.rs b/tests/run-make/staticlib-blank-lib/foo.rs
index bf48d069da9..bf48d069da9 100644
--- a/tests/run-make-fulldeps/staticlib-blank-lib/foo.rs
+++ b/tests/run-make/staticlib-blank-lib/foo.rs
diff --git a/tests/run-make-fulldeps/std-core-cycle/Makefile b/tests/run-make/std-core-cycle/Makefile
index 4f252863767..5ed6be905df 100644
--- a/tests/run-make-fulldeps/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-fulldeps/std-core-cycle/bar.rs b/tests/run-make/std-core-cycle/bar.rs
index 9f5e7c29bdd..9f5e7c29bdd 100644
--- a/tests/run-make-fulldeps/std-core-cycle/bar.rs
+++ b/tests/run-make/std-core-cycle/bar.rs
diff --git a/tests/run-make-fulldeps/std-core-cycle/foo.rs b/tests/run-make/std-core-cycle/foo.rs
index 6aa6e1ac3c5..6aa6e1ac3c5 100644
--- a/tests/run-make-fulldeps/std-core-cycle/foo.rs
+++ b/tests/run-make/std-core-cycle/foo.rs
diff --git a/tests/run-make-fulldeps/stdin-non-utf8/Makefile b/tests/run-make/stdin-non-utf8/Makefile
index 709d4cf1408..709d4cf1408 100644
--- a/tests/run-make-fulldeps/stdin-non-utf8/Makefile
+++ b/tests/run-make/stdin-non-utf8/Makefile
diff --git a/tests/run-make-fulldeps/stdin-non-utf8/non-utf8 b/tests/run-make/stdin-non-utf8/non-utf8
index bc87051a852..bc87051a852 100644
--- a/tests/run-make-fulldeps/stdin-non-utf8/non-utf8
+++ b/tests/run-make/stdin-non-utf8/non-utf8
diff --git a/tests/run-make-fulldeps/suspicious-library/Makefile b/tests/run-make/suspicious-library/Makefile
index 2af9e85c228..3b5ab3c53a5 100644
--- a/tests/run-make-fulldeps/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-fulldeps/suspicious-library/bar.rs b/tests/run-make/suspicious-library/bar.rs
index 550c94cd0c6..550c94cd0c6 100644
--- a/tests/run-make-fulldeps/suspicious-library/bar.rs
+++ b/tests/run-make/suspicious-library/bar.rs
diff --git a/tests/run-make-fulldeps/suspicious-library/foo.rs b/tests/run-make/suspicious-library/foo.rs
index a382d8f2c7f..a382d8f2c7f 100644
--- a/tests/run-make-fulldeps/suspicious-library/foo.rs
+++ b/tests/run-make/suspicious-library/foo.rs
diff --git a/tests/run-make-fulldeps/symbol-visibility/Makefile b/tests/run-make/symbol-visibility/Makefile
index 17052ef4e63..9159af214ca 100644
--- a/tests/run-make-fulldeps/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-fulldeps/symbol-visibility/a_cdylib.rs b/tests/run-make/symbol-visibility/a_cdylib.rs
index d4fbff85bfe..d4fbff85bfe 100644
--- a/tests/run-make-fulldeps/symbol-visibility/a_cdylib.rs
+++ b/tests/run-make/symbol-visibility/a_cdylib.rs
diff --git a/tests/run-make-fulldeps/symbol-visibility/a_proc_macro.rs b/tests/run-make/symbol-visibility/a_proc_macro.rs
index 9fd1a8a6717..9fd1a8a6717 100644
--- a/tests/run-make-fulldeps/symbol-visibility/a_proc_macro.rs
+++ b/tests/run-make/symbol-visibility/a_proc_macro.rs
diff --git a/tests/run-make-fulldeps/symbol-visibility/a_rust_dylib.rs b/tests/run-make/symbol-visibility/a_rust_dylib.rs
index a47df0ab7ee..a47df0ab7ee 100644
--- a/tests/run-make-fulldeps/symbol-visibility/a_rust_dylib.rs
+++ b/tests/run-make/symbol-visibility/a_rust_dylib.rs
diff --git a/tests/run-make-fulldeps/symbol-visibility/an_executable.rs b/tests/run-make/symbol-visibility/an_executable.rs
index 3f5e125ad19..3f5e125ad19 100644
--- a/tests/run-make-fulldeps/symbol-visibility/an_executable.rs
+++ b/tests/run-make/symbol-visibility/an_executable.rs
diff --git a/tests/run-make-fulldeps/symbol-visibility/an_rlib.rs b/tests/run-make/symbol-visibility/an_rlib.rs
index 3696422b11e..3696422b11e 100644
--- a/tests/run-make-fulldeps/symbol-visibility/an_rlib.rs
+++ b/tests/run-make/symbol-visibility/an_rlib.rs
diff --git a/tests/run-make-fulldeps/symbols-include-type-name/Makefile b/tests/run-make/symbols-include-type-name/Makefile
index ac26a852e36..ac26a852e36 100644
--- a/tests/run-make-fulldeps/symbols-include-type-name/Makefile
+++ b/tests/run-make/symbols-include-type-name/Makefile
diff --git a/tests/run-make-fulldeps/symbols-include-type-name/lib.rs b/tests/run-make/symbols-include-type-name/lib.rs
index 37d44591767..37d44591767 100644
--- a/tests/run-make-fulldeps/symbols-include-type-name/lib.rs
+++ b/tests/run-make/symbols-include-type-name/lib.rs
diff --git a/tests/run-make-fulldeps/symlinked-extern/Makefile b/tests/run-make/symlinked-extern/Makefile
index 058f43e857a..28c764b84e8 100644
--- a/tests/run-make-fulldeps/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-fulldeps/symlinked-extern/bar.rs b/tests/run-make/symlinked-extern/bar.rs
index cd9c959d5e6..cd9c959d5e6 100644
--- a/tests/run-make-fulldeps/symlinked-extern/bar.rs
+++ b/tests/run-make/symlinked-extern/bar.rs
diff --git a/tests/run-make-fulldeps/symlinked-extern/baz.rs b/tests/run-make/symlinked-extern/baz.rs
index cd433a3ac7a..cd433a3ac7a 100644
--- a/tests/run-make-fulldeps/symlinked-extern/baz.rs
+++ b/tests/run-make/symlinked-extern/baz.rs
diff --git a/tests/run-make-fulldeps/symlinked-extern/foo.rs b/tests/run-make/symlinked-extern/foo.rs
index c00700b8cf8..c00700b8cf8 100644
--- a/tests/run-make-fulldeps/symlinked-extern/foo.rs
+++ b/tests/run-make/symlinked-extern/foo.rs
diff --git a/tests/run-make-fulldeps/symlinked-libraries/Makefile b/tests/run-make/symlinked-libraries/Makefile
index 576bf7e54be..fb0b6127e6f 100644
--- a/tests/run-make-fulldeps/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-fulldeps/symlinked-libraries/bar.rs b/tests/run-make/symlinked-libraries/bar.rs
index fde0d746634..fde0d746634 100644
--- a/tests/run-make-fulldeps/symlinked-libraries/bar.rs
+++ b/tests/run-make/symlinked-libraries/bar.rs
diff --git a/tests/run-make-fulldeps/symlinked-libraries/foo.rs b/tests/run-make/symlinked-libraries/foo.rs
index cde9e291b45..cde9e291b45 100644
--- a/tests/run-make-fulldeps/symlinked-libraries/foo.rs
+++ b/tests/run-make/symlinked-libraries/foo.rs
diff --git a/tests/run-make-fulldeps/symlinked-rlib/Makefile b/tests/run-make/symlinked-rlib/Makefile
index 49d3f220a35..a8565f683c3 100644
--- a/tests/run-make-fulldeps/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-fulldeps/symlinked-rlib/bar.rs b/tests/run-make/symlinked-rlib/bar.rs
index fde0d746634..fde0d746634 100644
--- a/tests/run-make-fulldeps/symlinked-rlib/bar.rs
+++ b/tests/run-make/symlinked-rlib/bar.rs
diff --git a/tests/run-make-fulldeps/symlinked-rlib/foo.rs b/tests/run-make/symlinked-rlib/foo.rs
index c5c0bc606cd..c5c0bc606cd 100644
--- a/tests/run-make-fulldeps/symlinked-rlib/foo.rs
+++ b/tests/run-make/symlinked-rlib/foo.rs
diff --git a/tests/run-make-fulldeps/sysroot-crates-are-unstable/Makefile b/tests/run-make/sysroot-crates-are-unstable/Makefile
index 1e267fb9576..1e267fb9576 100644
--- a/tests/run-make-fulldeps/sysroot-crates-are-unstable/Makefile
+++ b/tests/run-make/sysroot-crates-are-unstable/Makefile
diff --git a/tests/run-make-fulldeps/sysroot-crates-are-unstable/test.py b/tests/run-make/sysroot-crates-are-unstable/test.py
index cb77eb34fef..cab4faa4e64 100644
--- a/tests/run-make-fulldeps/sysroot-crates-are-unstable/test.py
+++ b/tests/run-make/sysroot-crates-are-unstable/test.py
@@ -43,6 +43,7 @@ def check_lib(lib):
         return True
     print('verifying if {} is an unstable crate'.format(lib['name']))
     stdout, stderr = exec_command([os.environ['RUSTC'], '-', '--crate-type', 'rlib',
+                                   '--target', os.environ['TARGET'],
                                    '--extern', '{}={}'.format(lib['name'], lib['path'])],
                                   to_input=('extern crate {};'.format(lib['name'])).encode('utf-8'))
     if not 'use of unstable library feature' in '{}{}'.format(stdout, stderr):
diff --git a/tests/run-make-fulldeps/target-cpu-native/Makefile b/tests/run-make/target-cpu-native/Makefile
index eb3ca1e13aa..eb3ca1e13aa 100644
--- a/tests/run-make-fulldeps/target-cpu-native/Makefile
+++ b/tests/run-make/target-cpu-native/Makefile
diff --git a/tests/run-make-fulldeps/target-cpu-native/foo.rs b/tests/run-make/target-cpu-native/foo.rs
index f79c691f085..f79c691f085 100644
--- a/tests/run-make-fulldeps/target-cpu-native/foo.rs
+++ b/tests/run-make/target-cpu-native/foo.rs
diff --git a/tests/run-make-fulldeps/target-specs/Makefile b/tests/run-make/target-specs/Makefile
index a33f5368e3c..a33f5368e3c 100644
--- a/tests/run-make-fulldeps/target-specs/Makefile
+++ b/tests/run-make/target-specs/Makefile
diff --git a/tests/run-make-fulldeps/target-specs/definitely-not-builtin-target.json b/tests/run-make/target-specs/definitely-not-builtin-target.json
index b36fa993d97..b36fa993d97 100644
--- a/tests/run-make-fulldeps/target-specs/definitely-not-builtin-target.json
+++ b/tests/run-make/target-specs/definitely-not-builtin-target.json
diff --git a/tests/run-make-fulldeps/target-specs/foo.rs b/tests/run-make/target-specs/foo.rs
index 22939e87912..22939e87912 100644
--- a/tests/run-make-fulldeps/target-specs/foo.rs
+++ b/tests/run-make/target-specs/foo.rs
diff --git a/tests/run-make-fulldeps/target-specs/mismatching-data-layout.json b/tests/run-make/target-specs/mismatching-data-layout.json
index d12caaad14a..d12caaad14a 100644
--- a/tests/run-make-fulldeps/target-specs/mismatching-data-layout.json
+++ b/tests/run-make/target-specs/mismatching-data-layout.json
diff --git a/tests/run-make-fulldeps/target-specs/my-awesome-platform.json b/tests/run-make/target-specs/my-awesome-platform.json
index 00de3de05f0..00de3de05f0 100644
--- a/tests/run-make-fulldeps/target-specs/my-awesome-platform.json
+++ b/tests/run-make/target-specs/my-awesome-platform.json
diff --git a/tests/run-make-fulldeps/target-specs/my-incomplete-platform.json b/tests/run-make/target-specs/my-incomplete-platform.json
index ceaa25cdf2f..ceaa25cdf2f 100644
--- a/tests/run-make-fulldeps/target-specs/my-incomplete-platform.json
+++ b/tests/run-make/target-specs/my-incomplete-platform.json
diff --git a/tests/run-make-fulldeps/target-specs/my-invalid-platform.json b/tests/run-make/target-specs/my-invalid-platform.json
index 3feac45b7d6..3feac45b7d6 100644
--- a/tests/run-make-fulldeps/target-specs/my-invalid-platform.json
+++ b/tests/run-make/target-specs/my-invalid-platform.json
diff --git a/tests/run-make-fulldeps/target-specs/my-x86_64-unknown-linux-gnu-platform.json b/tests/run-make/target-specs/my-x86_64-unknown-linux-gnu-platform.json
index 6d5e964ed4f..6d5e964ed4f 100644
--- a/tests/run-make-fulldeps/target-specs/my-x86_64-unknown-linux-gnu-platform.json
+++ b/tests/run-make/target-specs/my-x86_64-unknown-linux-gnu-platform.json
diff --git a/tests/run-make-fulldeps/target-without-atomic-cas/Makefile b/tests/run-make/target-without-atomic-cas/Makefile
index 451f03d66cd..451f03d66cd 100644
--- a/tests/run-make-fulldeps/target-without-atomic-cas/Makefile
+++ b/tests/run-make/target-without-atomic-cas/Makefile
diff --git a/tests/run-make/test-benches/Makefile b/tests/run-make/test-benches/Makefile
index 8fc122515d0..0253a52637f 100644
--- a/tests/run-make/test-benches/Makefile
+++ b/tests/run-make/test-benches/Makefile
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 # ignore-cross-compile
 
diff --git a/tests/run-make-fulldeps/test-harness/Makefile b/tests/run-make/test-harness/Makefile
index 1fe059b07d2..ee8c9294f91 100644
--- a/tests/run-make-fulldeps/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-fulldeps/test-harness/test-ignore-cfg.rs b/tests/run-make/test-harness/test-ignore-cfg.rs
index 31ef131f2ad..31ef131f2ad 100644
--- a/tests/run-make-fulldeps/test-harness/test-ignore-cfg.rs
+++ b/tests/run-make/test-harness/test-ignore-cfg.rs
diff --git a/tests/run-make/thumb-none-cortex-m/Makefile b/tests/run-make/thumb-none-cortex-m/Makefile
index 3065141c08a..e941fc4a78e 100644
--- a/tests/run-make/thumb-none-cortex-m/Makefile
+++ b/tests/run-make/thumb-none-cortex-m/Makefile
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 # How to run this
 # $ ./x.py clean
diff --git a/tests/run-make/thumb-none-qemu/Makefile b/tests/run-make/thumb-none-qemu/Makefile
index a1c2ba12cd0..eea6ca34992 100644
--- a/tests/run-make/thumb-none-qemu/Makefile
+++ b/tests/run-make/thumb-none-qemu/Makefile
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 # only-thumb
 
diff --git a/tests/run-make-fulldeps/tools.mk b/tests/run-make/tools.mk
index ea06b620c4c..ea06b620c4c 100644
--- a/tests/run-make-fulldeps/tools.mk
+++ b/tests/run-make/tools.mk
diff --git a/tests/run-make/track-path-dep-info/Makefile b/tests/run-make/track-path-dep-info/Makefile
index ee853943f8b..0d6c9b1d2f0 100644
--- a/tests/run-make/track-path-dep-info/Makefile
+++ b/tests/run-make/track-path-dep-info/Makefile
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 # FIXME(eddyb) provide `HOST_RUSTC` and `TARGET_RUSTC`
 # instead of hardcoding them everywhere they're needed.
diff --git a/tests/run-make/track-pgo-dep-info/Makefile b/tests/run-make/track-pgo-dep-info/Makefile
index 60b59c04aa9..6c7f67d0f0a 100644
--- a/tests/run-make/track-pgo-dep-info/Makefile
+++ b/tests/run-make/track-pgo-dep-info/Makefile
@@ -1,7 +1,7 @@
 # needs-profiler-support
 # ignore-windows-gnu
 
--include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 # FIXME(eddyb) provide `HOST_RUSTC` and `TARGET_RUSTC`
 # instead of hardcoding them everywhere they're needed.
diff --git a/tests/run-make/translation/Makefile b/tests/run-make/translation/Makefile
index 397fc542909..0acf64e5da7 100644
--- a/tests/run-make/translation/Makefile
+++ b/tests/run-make/translation/Makefile
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 # This test uses `ln -s` rather than copying to save testing time, but its
 # usage doesn't work on Windows.
diff --git a/tests/run-make-fulldeps/type-mismatch-same-crate-name/Makefile b/tests/run-make/type-mismatch-same-crate-name/Makefile
index a2a2a41c7a5..a2a2a41c7a5 100644
--- a/tests/run-make-fulldeps/type-mismatch-same-crate-name/Makefile
+++ b/tests/run-make/type-mismatch-same-crate-name/Makefile
diff --git a/tests/run-make-fulldeps/type-mismatch-same-crate-name/crateA.rs b/tests/run-make/type-mismatch-same-crate-name/crateA.rs
index 4871c8c2e9c..4871c8c2e9c 100644
--- a/tests/run-make-fulldeps/type-mismatch-same-crate-name/crateA.rs
+++ b/tests/run-make/type-mismatch-same-crate-name/crateA.rs
diff --git a/tests/run-make-fulldeps/type-mismatch-same-crate-name/crateB.rs b/tests/run-make/type-mismatch-same-crate-name/crateB.rs
index 24fcc7cadc1..24fcc7cadc1 100644
--- a/tests/run-make-fulldeps/type-mismatch-same-crate-name/crateB.rs
+++ b/tests/run-make/type-mismatch-same-crate-name/crateB.rs
diff --git a/tests/run-make-fulldeps/type-mismatch-same-crate-name/crateC.rs b/tests/run-make/type-mismatch-same-crate-name/crateC.rs
index 71b38a9f8ca..71b38a9f8ca 100644
--- a/tests/run-make-fulldeps/type-mismatch-same-crate-name/crateC.rs
+++ b/tests/run-make/type-mismatch-same-crate-name/crateC.rs
diff --git a/tests/run-make/unstable-flag-required/Makefile b/tests/run-make/unstable-flag-required/Makefile
index d3a734fae77..17dd15b079c 100644
--- a/tests/run-make/unstable-flag-required/Makefile
+++ b/tests/run-make/unstable-flag-required/Makefile
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 all:
 	$(RUSTDOC) --output-format=json x.html 2>&1 | diff - output-format-json.stderr
diff --git a/tests/run-make-fulldeps/use-extern-for-plugins/Makefile b/tests/run-make/use-extern-for-plugins/Makefile
index 6ae53afad20..6ae53afad20 100644
--- a/tests/run-make-fulldeps/use-extern-for-plugins/Makefile
+++ b/tests/run-make/use-extern-for-plugins/Makefile
diff --git a/tests/run-make-fulldeps/use-extern-for-plugins/bar.rs b/tests/run-make/use-extern-for-plugins/bar.rs
index 704d2120362..704d2120362 100644
--- a/tests/run-make-fulldeps/use-extern-for-plugins/bar.rs
+++ b/tests/run-make/use-extern-for-plugins/bar.rs
diff --git a/tests/run-make-fulldeps/use-extern-for-plugins/baz.rs b/tests/run-make/use-extern-for-plugins/baz.rs
index 49a96a0c80b..49a96a0c80b 100644
--- a/tests/run-make-fulldeps/use-extern-for-plugins/baz.rs
+++ b/tests/run-make/use-extern-for-plugins/baz.rs
diff --git a/tests/run-make-fulldeps/use-extern-for-plugins/foo.rs b/tests/run-make/use-extern-for-plugins/foo.rs
index dffdc079887..dffdc079887 100644
--- a/tests/run-make-fulldeps/use-extern-for-plugins/foo.rs
+++ b/tests/run-make/use-extern-for-plugins/foo.rs
diff --git a/tests/run-make-fulldeps/use-suggestions-rust-2018/Makefile b/tests/run-make/use-suggestions-rust-2018/Makefile
index 37cd6283c0a..37cd6283c0a 100644
--- a/tests/run-make-fulldeps/use-suggestions-rust-2018/Makefile
+++ b/tests/run-make/use-suggestions-rust-2018/Makefile
diff --git a/tests/run-make-fulldeps/use-suggestions-rust-2018/ep-nested-lib.rs b/tests/run-make/use-suggestions-rust-2018/ep-nested-lib.rs
index 62a0a9d8f1b..62a0a9d8f1b 100644
--- a/tests/run-make-fulldeps/use-suggestions-rust-2018/ep-nested-lib.rs
+++ b/tests/run-make/use-suggestions-rust-2018/ep-nested-lib.rs
diff --git a/tests/run-make-fulldeps/use-suggestions-rust-2018/use-suggestions.rs b/tests/run-make/use-suggestions-rust-2018/use-suggestions.rs
index d262d6f9877..d262d6f9877 100644
--- a/tests/run-make-fulldeps/use-suggestions-rust-2018/use-suggestions.rs
+++ b/tests/run-make/use-suggestions-rust-2018/use-suggestions.rs
diff --git a/tests/run-make-fulldeps/used-cdylib-macos/Makefile b/tests/run-make/used-cdylib-macos/Makefile
index 38a4c31c7b3..38a4c31c7b3 100644
--- a/tests/run-make-fulldeps/used-cdylib-macos/Makefile
+++ b/tests/run-make/used-cdylib-macos/Makefile
diff --git a/tests/run-make-fulldeps/used-cdylib-macos/dylib_used.rs b/tests/run-make/used-cdylib-macos/dylib_used.rs
index 85f0ff92fe7..85f0ff92fe7 100644
--- a/tests/run-make-fulldeps/used-cdylib-macos/dylib_used.rs
+++ b/tests/run-make/used-cdylib-macos/dylib_used.rs
diff --git a/tests/run-make-fulldeps/used/Makefile b/tests/run-make/used/Makefile
index e80eb9e4020..e80eb9e4020 100644
--- a/tests/run-make-fulldeps/used/Makefile
+++ b/tests/run-make/used/Makefile
diff --git a/tests/run-make-fulldeps/used/used.rs b/tests/run-make/used/used.rs
index dca0a5e1167..dca0a5e1167 100644
--- a/tests/run-make-fulldeps/used/used.rs
+++ b/tests/run-make/used/used.rs
diff --git a/tests/run-make/valid-print-requests/Makefile b/tests/run-make/valid-print-requests/Makefile
index c325e536e7c..99430e98d1c 100644
--- a/tests/run-make/valid-print-requests/Makefile
+++ b/tests/run-make/valid-print-requests/Makefile
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 all:
 	$(RUSTC) --print uwu 2>&1 | diff - valid-print-requests.stderr
diff --git a/tests/run-make-fulldeps/version/Makefile b/tests/run-make/version/Makefile
index 3a130545d69..3a130545d69 100644
--- a/tests/run-make-fulldeps/version/Makefile
+++ b/tests/run-make/version/Makefile
diff --git a/tests/run-make-fulldeps/volatile-intrinsics/Makefile b/tests/run-make/volatile-intrinsics/Makefile
index 2a78c7b9cfe..5672a045873 100644
--- a/tests/run-make-fulldeps/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-fulldeps/volatile-intrinsics/main.rs b/tests/run-make/volatile-intrinsics/main.rs
index 4295d95f3f3..4295d95f3f3 100644
--- a/tests/run-make-fulldeps/volatile-intrinsics/main.rs
+++ b/tests/run-make/volatile-intrinsics/main.rs
diff --git a/tests/run-make/wasm-abi/Makefile b/tests/run-make/wasm-abi/Makefile
index e713ca1876d..ed95464efef 100644
--- a/tests/run-make/wasm-abi/Makefile
+++ b/tests/run-make/wasm-abi/Makefile
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 # only-wasm32-bare
 
diff --git a/tests/run-make/wasm-custom-section/Makefile b/tests/run-make/wasm-custom-section/Makefile
index 92b0802e30a..2f7d38c2736 100644
--- a/tests/run-make/wasm-custom-section/Makefile
+++ b/tests/run-make/wasm-custom-section/Makefile
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 # only-wasm32-bare
 
diff --git a/tests/run-make/wasm-custom-sections-opt/Makefile b/tests/run-make/wasm-custom-sections-opt/Makefile
index e5b45d96310..a0d4378131b 100644
--- a/tests/run-make/wasm-custom-sections-opt/Makefile
+++ b/tests/run-make/wasm-custom-sections-opt/Makefile
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 # only-wasm32-bare
 
diff --git a/tests/run-make/wasm-export-all-symbols/Makefile b/tests/run-make/wasm-export-all-symbols/Makefile
index 834f4d258db..86713bc80b8 100644
--- a/tests/run-make/wasm-export-all-symbols/Makefile
+++ b/tests/run-make/wasm-export-all-symbols/Makefile
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 # only-wasm32-bare
 
diff --git a/tests/run-make/wasm-import-module/Makefile b/tests/run-make/wasm-import-module/Makefile
index 18cef16aac3..a0b4d920b3d 100644
--- a/tests/run-make/wasm-import-module/Makefile
+++ b/tests/run-make/wasm-import-module/Makefile
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
  # only-wasm32-bare
 
diff --git a/tests/run-make/wasm-panic-small/Makefile b/tests/run-make/wasm-panic-small/Makefile
index 2af9f71357e..16f54521855 100644
--- a/tests/run-make/wasm-panic-small/Makefile
+++ b/tests/run-make/wasm-panic-small/Makefile
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 # only-wasm32-bare
 
diff --git a/tests/run-make/wasm-spurious-import/Makefile b/tests/run-make/wasm-spurious-import/Makefile
index 6f50e6e554e..ff9dfeac6d0 100644
--- a/tests/run-make/wasm-spurious-import/Makefile
+++ b/tests/run-make/wasm-spurious-import/Makefile
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 # only-wasm32-bare
 
diff --git a/tests/run-make/wasm-stringify-ints-small/Makefile b/tests/run-make/wasm-stringify-ints-small/Makefile
index 2fa2c954d4a..f959dbd426b 100644
--- a/tests/run-make/wasm-stringify-ints-small/Makefile
+++ b/tests/run-make/wasm-stringify-ints-small/Makefile
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 ifeq ($(TARGET),wasm32-unknown-unknown)
 all:
diff --git a/tests/run-make/wasm-symbols-different-module/Makefile b/tests/run-make/wasm-symbols-different-module/Makefile
index 9e657222dea..0f86914c7b1 100644
--- a/tests/run-make/wasm-symbols-different-module/Makefile
+++ b/tests/run-make/wasm-symbols-different-module/Makefile
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 # only-wasm32-bare
 
diff --git a/tests/run-make/wasm-symbols-not-exported/Makefile b/tests/run-make/wasm-symbols-not-exported/Makefile
index 60b0dee001f..024ad779748 100644
--- a/tests/run-make/wasm-symbols-not-exported/Makefile
+++ b/tests/run-make/wasm-symbols-not-exported/Makefile
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 # only-wasm32-bare
 
diff --git a/tests/run-make/wasm-symbols-not-imported/Makefile b/tests/run-make/wasm-symbols-not-imported/Makefile
index dc7618c19a7..38440a8b025 100644
--- a/tests/run-make/wasm-symbols-not-imported/Makefile
+++ b/tests/run-make/wasm-symbols-not-imported/Makefile
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 # only-wasm32-bare
 
diff --git a/tests/run-make-fulldeps/weird-output-filenames/Makefile b/tests/run-make/weird-output-filenames/Makefile
index d3a34e3b46e..d3a34e3b46e 100644
--- a/tests/run-make-fulldeps/weird-output-filenames/Makefile
+++ b/tests/run-make/weird-output-filenames/Makefile
diff --git a/tests/run-make-fulldeps/weird-output-filenames/foo.rs b/tests/run-make/weird-output-filenames/foo.rs
index f328e4d9d04..f328e4d9d04 100644
--- a/tests/run-make-fulldeps/weird-output-filenames/foo.rs
+++ b/tests/run-make/weird-output-filenames/foo.rs
diff --git a/tests/run-make-fulldeps/windows-binary-no-external-deps/Makefile b/tests/run-make/windows-binary-no-external-deps/Makefile
index 8960020fed5..8960020fed5 100644
--- a/tests/run-make-fulldeps/windows-binary-no-external-deps/Makefile
+++ b/tests/run-make/windows-binary-no-external-deps/Makefile
diff --git a/tests/run-make-fulldeps/windows-binary-no-external-deps/hello.rs b/tests/run-make/windows-binary-no-external-deps/hello.rs
index 47ad8c63411..47ad8c63411 100644
--- a/tests/run-make-fulldeps/windows-binary-no-external-deps/hello.rs
+++ b/tests/run-make/windows-binary-no-external-deps/hello.rs
diff --git a/tests/run-make-fulldeps/windows-spawn/Makefile b/tests/run-make/windows-spawn/Makefile
index b6cdb169bab..b6cdb169bab 100644
--- a/tests/run-make-fulldeps/windows-spawn/Makefile
+++ b/tests/run-make/windows-spawn/Makefile
diff --git a/tests/run-make-fulldeps/windows-spawn/hello.rs b/tests/run-make/windows-spawn/hello.rs
index 47ad8c63411..47ad8c63411 100644
--- a/tests/run-make-fulldeps/windows-spawn/hello.rs
+++ b/tests/run-make/windows-spawn/hello.rs
diff --git a/tests/run-make-fulldeps/windows-spawn/spawn.rs b/tests/run-make/windows-spawn/spawn.rs
index c34da3d5fde..c34da3d5fde 100644
--- a/tests/run-make-fulldeps/windows-spawn/spawn.rs
+++ b/tests/run-make/windows-spawn/spawn.rs
diff --git a/tests/run-make-fulldeps/windows-subsystem/Makefile b/tests/run-make/windows-subsystem/Makefile
index 78c4e2ac1e8..e3cf9181de4 100644
--- a/tests/run-make-fulldeps/windows-subsystem/Makefile
+++ b/tests/run-make/windows-subsystem/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:
diff --git a/tests/run-make-fulldeps/windows-subsystem/console.rs b/tests/run-make/windows-subsystem/console.rs
index 61a92eb6a9d..61a92eb6a9d 100644
--- a/tests/run-make-fulldeps/windows-subsystem/console.rs
+++ b/tests/run-make/windows-subsystem/console.rs
diff --git a/tests/run-make-fulldeps/windows-subsystem/windows.rs b/tests/run-make/windows-subsystem/windows.rs
index 1138248f07d..1138248f07d 100644
--- a/tests/run-make-fulldeps/windows-subsystem/windows.rs
+++ b/tests/run-make/windows-subsystem/windows.rs
diff --git a/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/Makefile b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/Makefile
index 84dcd239351..3c88ec34f43 100644
--- a/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/Makefile
+++ b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/Makefile
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 #only-x86_64-fortanix-unknown-sgx
 
diff --git a/tests/rustdoc-gui/go-to-collapsed-elem.goml b/tests/rustdoc-gui/go-to-collapsed-elem.goml
new file mode 100644
index 00000000000..279048e37c1
--- /dev/null
+++ b/tests/rustdoc-gui/go-to-collapsed-elem.goml
@@ -0,0 +1,21 @@
+// This test ensures that when clicking on a link which leads to an item inside a collapsed element,
+// the collapsed element will be expanded.
+goto: "file://" + |DOC_PATH| + "/test_docs/struct.Foo.html"
+// We check that the implementors block is expanded.
+assert-property: ("#implementations-list .implementors-toggle", {"open": "true"})
+// We now collapse the implementors block.
+property: ("#implementations-list .implementors-toggle", {"open": "false"})
+// And now we click on the link to the method to ensure it'll expand the implementors block.
+click: "//*[@class='sidebar']//a[@href='#method.must_use']"
+assert-property: ("#implementations-list .implementors-toggle", {"open": "true"})
+
+// Now we do the same through search result.
+// First we reload the page without the anchor in the URL.
+goto: "file://" + |DOC_PATH| + "/test_docs/struct.Foo.html"
+// Then we collapse the section again...
+property: ("#implementations-list .implementors-toggle", {"open": "false"})
+// Then we run the search.
+write: (".search-input", "foo::must_use")
+wait-for: "//*[@id='search']//a[@href='../test_docs/struct.Foo.html#method.must_use']"
+click: "//*[@id='search']//a[@href='../test_docs/struct.Foo.html#method.must_use']"
+assert-property: ("#implementations-list .implementors-toggle", {"open": "true"})
diff --git a/tests/rustdoc-json/impls/local_for_local_primitive.rs b/tests/rustdoc-json/impls/local_for_local_primitive.rs
index 38e7e2658df..8383dcc0482 100644
--- a/tests/rustdoc-json/impls/local_for_local_primitive.rs
+++ b/tests/rustdoc-json/impls/local_for_local_primitive.rs
@@ -1,5 +1,5 @@
 #![feature(no_core)]
-#![feature(rustdoc_internals)]
+#![feature(rustc_attrs)]
 #![no_core]
 
 // @set Local = "$.index[*][?(@.name=='Local')].id"
@@ -16,6 +16,6 @@ impl Local for bool {}
 
 // FIXME(#101695): Test bool's `impls` include "Local for bool"
 // @has "$.index[*][?(@.name=='bool')]"
-#[doc(primitive = "bool")]
+#[rustc_doc_primitive = "bool"]
 /// Boolean docs
 mod prim_bool {}
diff --git a/tests/rustdoc-json/primitives/local_primitive.rs b/tests/rustdoc-json/primitives/local_primitive.rs
index f27e6a2adec..0cf479faf29 100644
--- a/tests/rustdoc-json/primitives/local_primitive.rs
+++ b/tests/rustdoc-json/primitives/local_primitive.rs
@@ -8,7 +8,7 @@
 
 //! Link to [i32][prim@i32] [i64][prim@i64]
 
-#[doc(primitive = "i32")]
+#[rustc_doc_primitive = "i32"]
 mod prim_i32 {}
 
 // @set local_i32 = "$.index[*][?(@.name=='i32')].id"
diff --git a/tests/rustdoc-json/primitives/primitive_impls.rs b/tests/rustdoc-json/primitives/primitive_impls.rs
index 1fc9374065f..85d179ee45f 100644
--- a/tests/rustdoc-json/primitives/primitive_impls.rs
+++ b/tests/rustdoc-json/primitives/primitive_impls.rs
@@ -25,7 +25,7 @@ pub trait Trait {}
 impl Trait for i32 {}
 
 /// i32
-#[doc(primitive = "i32")]
+#[rustc_doc_primitive = "i32"]
 mod prim_i32 {}
 
 // @set i32 = "$.index[*][?(@.docs=='i32')].id"
diff --git a/tests/rustdoc-json/primitives/primitive_overloading.rs b/tests/rustdoc-json/primitives/primitive_overloading.rs
index 56b35cd14c0..81e0acdc6e9 100644
--- a/tests/rustdoc-json/primitives/primitive_overloading.rs
+++ b/tests/rustdoc-json/primitives/primitive_overloading.rs
@@ -2,7 +2,7 @@
 
 // Regression test for <https://github.com/rust-lang/rust/issues/98006>.
 
-#![feature(rustdoc_internals)]
+#![feature(rustc_attrs)]
 #![feature(no_core)]
 
 #![no_core]
@@ -10,7 +10,7 @@
 // @has "$.index[*][?(@.name=='usize')]"
 // @has "$.index[*][?(@.name=='prim')]"
 
-#[doc(primitive = "usize")]
+#[rustc_doc_primitive = "usize"]
 /// This is the built-in type `usize`.
 mod prim {
 }
diff --git a/tests/rustdoc-json/primitives/use_primitive.rs b/tests/rustdoc-json/primitives/use_primitive.rs
index e2292737462..5180a804f07 100644
--- a/tests/rustdoc-json/primitives/use_primitive.rs
+++ b/tests/rustdoc-json/primitives/use_primitive.rs
@@ -1,8 +1,8 @@
 // edition:2018
 
-#![feature(rustdoc_internals)]
+#![feature(rustc_attrs)]
 
-#[doc(primitive = "usize")]
+#[rustc_doc_primitive = "usize"]
 mod usize {}
 
 // @set local_crate_id = "$.index[*][?(@.name=='use_primitive')].crate_id"
diff --git a/tests/rustdoc-ui/coverage/exotic.rs b/tests/rustdoc-ui/coverage/exotic.rs
index 72b70d6980b..f45405fbf5d 100644
--- a/tests/rustdoc-ui/coverage/exotic.rs
+++ b/tests/rustdoc-ui/coverage/exotic.rs
@@ -2,12 +2,13 @@
 // check-pass
 
 #![feature(rustdoc_internals)]
+#![feature(rustc_attrs)]
 
 //! the features only used in std also have entries in the table, so make sure those get pulled out
 //! properly as well
 
 /// woo, check it out, we can write our own primitive docs lol
-#[doc(primitive="unit")]
+#[rustc_doc_primitive = "unit"]
 mod prim_unit {}
 
 /// keywords? sure, pile them on
diff --git a/tests/rustdoc-ui/intra-doc/ambiguity.rs b/tests/rustdoc-ui/intra-doc/ambiguity.rs
index 1f3dc722eff..0290b858204 100644
--- a/tests/rustdoc-ui/intra-doc/ambiguity.rs
+++ b/tests/rustdoc-ui/intra-doc/ambiguity.rs
@@ -35,6 +35,6 @@ pub mod foo {
 /// Ambiguous non-implied shortcut link [`foo::bar`]. //~ERROR `foo::bar`
 pub struct Docs {}
 
-/// [true] //~ ERROR `true` is both a module and a builtin type
+/// [true] //~ ERROR `true` is both a module and a primitive type
 /// [primitive@true]
 pub mod r#true {}
diff --git a/tests/rustdoc-ui/intra-doc/ambiguity.stderr b/tests/rustdoc-ui/intra-doc/ambiguity.stderr
index 7974796e47b..47853e0b589 100644
--- a/tests/rustdoc-ui/intra-doc/ambiguity.stderr
+++ b/tests/rustdoc-ui/intra-doc/ambiguity.stderr
@@ -1,4 +1,4 @@
-error: `true` is both a module and a builtin type
+error: `true` is both a module and a primitive type
   --> $DIR/ambiguity.rs:38:6
    |
 LL | /// [true]
@@ -13,89 +13,89 @@ help: to link to the module, prefix with `mod@`
    |
 LL | /// [mod@true]
    |      ++++
-help: to link to the builtin type, prefix with `prim@`
+help: to link to the primitive type, prefix with `prim@`
    |
 LL | /// [prim@true]
    |      +++++
 
-error: `ambiguous` is both a struct and a function
+error: `ambiguous` is both a function and a struct
   --> $DIR/ambiguity.rs:27:7
    |
 LL | /// [`ambiguous`] is ambiguous.
    |       ^^^^^^^^^ ambiguous link
    |
-help: to link to the struct, prefix with `struct@`
-   |
-LL | /// [`struct@ambiguous`] is ambiguous.
-   |       +++++++
 help: to link to the function, add parentheses
    |
 LL | /// [`ambiguous()`] is ambiguous.
    |                ++
+help: to link to the struct, prefix with `struct@`
+   |
+LL | /// [`struct@ambiguous`] is ambiguous.
+   |       +++++++
 
-error: `ambiguous` is both a struct and a function
+error: `ambiguous` is both a function and a struct
   --> $DIR/ambiguity.rs:29:6
    |
 LL | /// [ambiguous] is ambiguous.
    |      ^^^^^^^^^ ambiguous link
    |
-help: to link to the struct, prefix with `struct@`
-   |
-LL | /// [struct@ambiguous] is ambiguous.
-   |      +++++++
 help: to link to the function, add parentheses
    |
 LL | /// [ambiguous()] is ambiguous.
    |               ++
+help: to link to the struct, prefix with `struct@`
+   |
+LL | /// [struct@ambiguous] is ambiguous.
+   |      +++++++
 
-error: `multi_conflict` is a struct, a function, and a macro
+error: `multi_conflict` is a function, a struct, and a macro
   --> $DIR/ambiguity.rs:31:7
    |
 LL | /// [`multi_conflict`] is a three-way conflict.
    |       ^^^^^^^^^^^^^^ ambiguous link
    |
-help: to link to the struct, prefix with `struct@`
-   |
-LL | /// [`struct@multi_conflict`] is a three-way conflict.
-   |       +++++++
 help: to link to the function, add parentheses
    |
 LL | /// [`multi_conflict()`] is a three-way conflict.
    |                     ++
+help: to link to the struct, prefix with `struct@`
+   |
+LL | /// [`struct@multi_conflict`] is a three-way conflict.
+   |       +++++++
 help: to link to the macro, add an exclamation mark
    |
 LL | /// [`multi_conflict!`] is a three-way conflict.
    |                     +
 
-error: `type_and_value` is both a module and a constant
+error: `type_and_value` is both a constant and a module
   --> $DIR/ambiguity.rs:33:16
    |
 LL | /// Ambiguous [type_and_value].
    |                ^^^^^^^^^^^^^^ ambiguous link
    |
-help: to link to the module, prefix with `mod@`
-   |
-LL | /// Ambiguous [mod@type_and_value].
-   |                ++++
 help: to link to the constant, prefix with `const@`
    |
 LL | /// Ambiguous [const@type_and_value].
    |                ++++++
+help: to link to the module, prefix with `mod@`
+   |
+LL | /// Ambiguous [mod@type_and_value].
+   |                ++++
 
-error: `foo::bar` is both an enum and a function
+error: `foo::bar` is both a function and an enum
   --> $DIR/ambiguity.rs:35:43
    |
 LL | /// Ambiguous non-implied shortcut link [`foo::bar`].
    |                                           ^^^^^^^^ ambiguous link
    |
-help: to link to the enum, prefix with `enum@`
-   |
-LL | /// Ambiguous non-implied shortcut link [`enum@foo::bar`].
-   |                                           +++++
 help: to link to the function, add parentheses
    |
 LL | /// Ambiguous non-implied shortcut link [`foo::bar()`].
    |                                                   ++
+help: to link to the enum, prefix with `enum@`
+   |
+LL | /// Ambiguous non-implied shortcut link [`enum@foo::bar`].
+   |                                           +++++
 
 error: aborting due to 6 previous errors
 
diff --git a/tests/rustdoc-ui/intra-doc/errors.rs b/tests/rustdoc-ui/intra-doc/errors.rs
index 95dd2b98e03..f37f49c24cc 100644
--- a/tests/rustdoc-ui/intra-doc/errors.rs
+++ b/tests/rustdoc-ui/intra-doc/errors.rs
@@ -54,11 +54,11 @@
 
 /// [u8::not_found]
 //~^ ERROR unresolved link
-//~| NOTE the builtin type `u8` has no associated item named `not_found`
+//~| NOTE the primitive type `u8` has no associated item named `not_found`
 
 /// [std::primitive::u8::not_found]
 //~^ ERROR unresolved link
-//~| NOTE the builtin type `u8` has no associated item named `not_found`
+//~| NOTE the primitive type `u8` has no associated item named `not_found`
 
 /// [type@Vec::into_iter]
 //~^ ERROR unresolved link
diff --git a/tests/rustdoc-ui/intra-doc/errors.stderr b/tests/rustdoc-ui/intra-doc/errors.stderr
index 1b2416d7da7..a982bba0095 100644
--- a/tests/rustdoc-ui/intra-doc/errors.stderr
+++ b/tests/rustdoc-ui/intra-doc/errors.stderr
@@ -80,13 +80,13 @@ error: unresolved link to `u8::not_found`
   --> $DIR/errors.rs:55:6
    |
 LL | /// [u8::not_found]
-   |      ^^^^^^^^^^^^^ the builtin type `u8` has no associated item named `not_found`
+   |      ^^^^^^^^^^^^^ the primitive type `u8` has no associated item named `not_found`
 
 error: unresolved link to `std::primitive::u8::not_found`
   --> $DIR/errors.rs:59:6
    |
 LL | /// [std::primitive::u8::not_found]
-   |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the builtin type `u8` has no associated item named `not_found`
+   |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the primitive type `u8` has no associated item named `not_found`
 
 error: unresolved link to `Vec::into_iter`
   --> $DIR/errors.rs:63:6
diff --git a/tests/rustdoc-ui/intra-doc/issue-108653-associated-items-10.rs b/tests/rustdoc-ui/intra-doc/issue-108653-associated-items-10.rs
new file mode 100644
index 00000000000..464c5f0d543
--- /dev/null
+++ b/tests/rustdoc-ui/intra-doc/issue-108653-associated-items-10.rs
@@ -0,0 +1,22 @@
+// This test ensures that this warning doesn't show up:
+// warning: `PartialEq` is both a trait and a derive macro
+//  --> tests/rustdoc-ui/intra-doc/issue-108653-associated-items-10.rs:1:7
+//   |
+// 1 | //! [`PartialEq`]
+//   |       ^^^^^^^^^ ambiguous link
+//   |
+//   = note: `#[warn(rustdoc::broken_intra_doc_links)]` on by default
+// help: to link to the trait, prefix with `trait@`
+//   |
+// 1 | //! [`trait@PartialEq`]
+//   |       ++++++
+// help: to link to the derive macro, prefix with `derive@`
+//   |
+// 1 | //! [`derive@PartialEq`]
+//   |       +++++++
+
+// check-pass
+
+#![deny(rustdoc::broken_intra_doc_links)]
+
+//! [`PartialEq`]
diff --git a/tests/rustdoc-ui/intra-doc/issue-108653-associated-items-2.rs b/tests/rustdoc-ui/intra-doc/issue-108653-associated-items-2.rs
new file mode 100644
index 00000000000..cbe60f746b6
--- /dev/null
+++ b/tests/rustdoc-ui/intra-doc/issue-108653-associated-items-2.rs
@@ -0,0 +1,17 @@
+// This is ensuring that the UI output for associated items is as expected.
+
+#![deny(rustdoc::broken_intra_doc_links)]
+
+/// [`Trait::IDENT`]
+//~^ ERROR both an associated constant and an associated type
+pub trait Trait {
+    type IDENT;
+    const IDENT: usize;
+}
+
+/// [`Trait2::IDENT`]
+//~^ ERROR both an associated function and an associated type
+pub trait Trait2 {
+    type IDENT;
+    fn IDENT() {}
+}
diff --git a/tests/rustdoc-ui/intra-doc/issue-108653-associated-items-2.stderr b/tests/rustdoc-ui/intra-doc/issue-108653-associated-items-2.stderr
new file mode 100644
index 00000000000..952392548da
--- /dev/null
+++ b/tests/rustdoc-ui/intra-doc/issue-108653-associated-items-2.stderr
@@ -0,0 +1,37 @@
+error: `Trait::IDENT` is both an associated constant and an associated type
+  --> $DIR/issue-108653-associated-items-2.rs:5:7
+   |
+LL | /// [`Trait::IDENT`]
+   |       ^^^^^^^^^^^^ ambiguous link
+   |
+note: the lint level is defined here
+  --> $DIR/issue-108653-associated-items-2.rs:3:9
+   |
+LL | #![deny(rustdoc::broken_intra_doc_links)]
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+help: to link to the associated constant, prefix with `const@`
+   |
+LL | /// [`const@Trait::IDENT`]
+   |       ++++++
+help: to link to the associated type, prefix with `type@`
+   |
+LL | /// [`type@Trait::IDENT`]
+   |       +++++
+
+error: `Trait2::IDENT` is both an associated function and an associated type
+  --> $DIR/issue-108653-associated-items-2.rs:12:7
+   |
+LL | /// [`Trait2::IDENT`]
+   |       ^^^^^^^^^^^^^ ambiguous link
+   |
+help: to link to the associated function, add parentheses
+   |
+LL | /// [`Trait2::IDENT()`]
+   |                    ++
+help: to link to the associated type, prefix with `type@`
+   |
+LL | /// [`type@Trait2::IDENT`]
+   |       +++++
+
+error: aborting due to 2 previous errors
+
diff --git a/tests/rustdoc-ui/intra-doc/issue-108653-associated-items-3.rs b/tests/rustdoc-ui/intra-doc/issue-108653-associated-items-3.rs
new file mode 100644
index 00000000000..7ffd0a40e7c
--- /dev/null
+++ b/tests/rustdoc-ui/intra-doc/issue-108653-associated-items-3.rs
@@ -0,0 +1,16 @@
+// This is ensuring that the UI output for associated items works when it's being documented
+// from another item.
+
+#![deny(rustdoc::broken_intra_doc_links)]
+#![allow(nonstandard_style)]
+
+pub trait Trait {
+    type Trait;
+    const Trait: usize;
+}
+
+/// [`Trait`]
+//~^ ERROR both a constant and a trait
+/// [`Trait::Trait`]
+//~^ ERROR both an associated constant and an associated type
+pub const Trait: usize = 0;
diff --git a/tests/rustdoc-ui/intra-doc/issue-108653-associated-items-3.stderr b/tests/rustdoc-ui/intra-doc/issue-108653-associated-items-3.stderr
new file mode 100644
index 00000000000..6401dacb57a
--- /dev/null
+++ b/tests/rustdoc-ui/intra-doc/issue-108653-associated-items-3.stderr
@@ -0,0 +1,37 @@
+error: `Trait` is both a constant and a trait
+  --> $DIR/issue-108653-associated-items-3.rs:12:7
+   |
+LL | /// [`Trait`]
+   |       ^^^^^ ambiguous link
+   |
+note: the lint level is defined here
+  --> $DIR/issue-108653-associated-items-3.rs:4:9
+   |
+LL | #![deny(rustdoc::broken_intra_doc_links)]
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+help: to link to the constant, prefix with `const@`
+   |
+LL | /// [`const@Trait`]
+   |       ++++++
+help: to link to the trait, prefix with `trait@`
+   |
+LL | /// [`trait@Trait`]
+   |       ++++++
+
+error: `Trait::Trait` is both an associated constant and an associated type
+  --> $DIR/issue-108653-associated-items-3.rs:14:7
+   |
+LL | /// [`Trait::Trait`]
+   |       ^^^^^^^^^^^^ ambiguous link
+   |
+help: to link to the associated constant, prefix with `const@`
+   |
+LL | /// [`const@Trait::Trait`]
+   |       ++++++
+help: to link to the associated type, prefix with `type@`
+   |
+LL | /// [`type@Trait::Trait`]
+   |       +++++
+
+error: aborting due to 2 previous errors
+
diff --git a/tests/rustdoc-ui/intra-doc/issue-108653-associated-items-4.rs b/tests/rustdoc-ui/intra-doc/issue-108653-associated-items-4.rs
new file mode 100644
index 00000000000..537d61364bb
--- /dev/null
+++ b/tests/rustdoc-ui/intra-doc/issue-108653-associated-items-4.rs
@@ -0,0 +1,21 @@
+// This is ensuring that the UI output for associated items works when it's being documented
+// from another item.
+
+#![deny(rustdoc::broken_intra_doc_links)]
+#![allow(nonstandard_style)]
+
+pub trait Trait {
+    type Trait;
+}
+
+/// [`Struct::Trait`]
+//~^ ERROR both an associated constant and an associated type
+pub struct Struct;
+
+impl Trait for Struct {
+    type Trait = Struct;
+}
+
+impl Struct {
+    pub const Trait: usize = 0;
+}
diff --git a/tests/rustdoc-ui/intra-doc/issue-108653-associated-items-4.stderr b/tests/rustdoc-ui/intra-doc/issue-108653-associated-items-4.stderr
new file mode 100644
index 00000000000..a8dc91204c0
--- /dev/null
+++ b/tests/rustdoc-ui/intra-doc/issue-108653-associated-items-4.stderr
@@ -0,0 +1,22 @@
+error: `Struct::Trait` is both an associated constant and an associated type
+  --> $DIR/issue-108653-associated-items-4.rs:11:7
+   |
+LL | /// [`Struct::Trait`]
+   |       ^^^^^^^^^^^^^ ambiguous link
+   |
+note: the lint level is defined here
+  --> $DIR/issue-108653-associated-items-4.rs:4:9
+   |
+LL | #![deny(rustdoc::broken_intra_doc_links)]
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+help: to link to the associated constant, prefix with `const@`
+   |
+LL | /// [`const@Struct::Trait`]
+   |       ++++++
+help: to link to the associated type, prefix with `type@`
+   |
+LL | /// [`type@Struct::Trait`]
+   |       +++++
+
+error: aborting due to previous error
+
diff --git a/tests/rustdoc-ui/intra-doc/issue-108653-associated-items-5.rs b/tests/rustdoc-ui/intra-doc/issue-108653-associated-items-5.rs
new file mode 100644
index 00000000000..bc28bc54421
--- /dev/null
+++ b/tests/rustdoc-ui/intra-doc/issue-108653-associated-items-5.rs
@@ -0,0 +1,8 @@
+#![deny(rustdoc::broken_intra_doc_links)]
+#![allow(nonstandard_style)]
+
+/// [`u32::MAX`]
+//~^ ERROR both an associated constant and a trait
+pub mod u32 {
+    pub trait MAX {}
+}
diff --git a/tests/rustdoc-ui/intra-doc/issue-108653-associated-items-5.stderr b/tests/rustdoc-ui/intra-doc/issue-108653-associated-items-5.stderr
new file mode 100644
index 00000000000..7430044ac3f
--- /dev/null
+++ b/tests/rustdoc-ui/intra-doc/issue-108653-associated-items-5.stderr
@@ -0,0 +1,22 @@
+error: `u32::MAX` is both an associated constant and a trait
+  --> $DIR/issue-108653-associated-items-5.rs:4:7
+   |
+LL | /// [`u32::MAX`]
+   |       ^^^^^^^^ ambiguous link
+   |
+note: the lint level is defined here
+  --> $DIR/issue-108653-associated-items-5.rs:1:9
+   |
+LL | #![deny(rustdoc::broken_intra_doc_links)]
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+help: to link to the associated constant, prefix with `const@`
+   |
+LL | /// [`const@u32::MAX`]
+   |       ++++++
+help: to link to the trait, prefix with `trait@`
+   |
+LL | /// [`trait@u32::MAX`]
+   |       ++++++
+
+error: aborting due to previous error
+
diff --git a/tests/rustdoc-ui/intra-doc/issue-108653-associated-items-6.rs b/tests/rustdoc-ui/intra-doc/issue-108653-associated-items-6.rs
new file mode 100644
index 00000000000..8fde74d0ddb
--- /dev/null
+++ b/tests/rustdoc-ui/intra-doc/issue-108653-associated-items-6.rs
@@ -0,0 +1,8 @@
+#![deny(rustdoc::broken_intra_doc_links)]
+#![allow(nonstandard_style)]
+
+/// [`u32::MAX`]
+//~^ ERROR both an associated constant and a primitive type
+pub mod u32 {
+    pub use std::primitive::u32 as MAX;
+}
diff --git a/tests/rustdoc-ui/intra-doc/issue-108653-associated-items-6.stderr b/tests/rustdoc-ui/intra-doc/issue-108653-associated-items-6.stderr
new file mode 100644
index 00000000000..fe2d8cafa30
--- /dev/null
+++ b/tests/rustdoc-ui/intra-doc/issue-108653-associated-items-6.stderr
@@ -0,0 +1,22 @@
+error: `u32::MAX` is both an associated constant and a primitive type
+  --> $DIR/issue-108653-associated-items-6.rs:4:7
+   |
+LL | /// [`u32::MAX`]
+   |       ^^^^^^^^ ambiguous link
+   |
+note: the lint level is defined here
+  --> $DIR/issue-108653-associated-items-6.rs:1:9
+   |
+LL | #![deny(rustdoc::broken_intra_doc_links)]
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+help: to link to the associated constant, prefix with `const@`
+   |
+LL | /// [`const@u32::MAX`]
+   |       ++++++
+help: to link to the primitive type, prefix with `prim@`
+   |
+LL | /// [`prim@u32::MAX`]
+   |       +++++
+
+error: aborting due to previous error
+
diff --git a/tests/rustdoc-ui/intra-doc/issue-108653-associated-items-7.rs b/tests/rustdoc-ui/intra-doc/issue-108653-associated-items-7.rs
new file mode 100644
index 00000000000..6e99f4365a7
--- /dev/null
+++ b/tests/rustdoc-ui/intra-doc/issue-108653-associated-items-7.rs
@@ -0,0 +1,12 @@
+#![deny(rustdoc::broken_intra_doc_links)]
+#![allow(nonstandard_style)]
+
+pub trait Trait {
+    type MAX;
+}
+
+/// [`u32::MAX`]
+//~^ ERROR both an associated constant and an associated type
+impl Trait for u32 {
+    type MAX = u32;
+}
diff --git a/tests/rustdoc-ui/intra-doc/issue-108653-associated-items-7.stderr b/tests/rustdoc-ui/intra-doc/issue-108653-associated-items-7.stderr
new file mode 100644
index 00000000000..1d302ff42e8
--- /dev/null
+++ b/tests/rustdoc-ui/intra-doc/issue-108653-associated-items-7.stderr
@@ -0,0 +1,22 @@
+error: `u32::MAX` is both an associated constant and an associated type
+  --> $DIR/issue-108653-associated-items-7.rs:8:7
+   |
+LL | /// [`u32::MAX`]
+   |       ^^^^^^^^ ambiguous link
+   |
+note: the lint level is defined here
+  --> $DIR/issue-108653-associated-items-7.rs:1:9
+   |
+LL | #![deny(rustdoc::broken_intra_doc_links)]
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+help: to link to the associated constant, prefix with `const@`
+   |
+LL | /// [`const@u32::MAX`]
+   |       ++++++
+help: to link to the associated type, prefix with `type@`
+   |
+LL | /// [`type@u32::MAX`]
+   |       +++++
+
+error: aborting due to previous error
+
diff --git a/tests/rustdoc-ui/intra-doc/issue-108653-associated-items-8.rs b/tests/rustdoc-ui/intra-doc/issue-108653-associated-items-8.rs
new file mode 100644
index 00000000000..2f8ee1566bd
--- /dev/null
+++ b/tests/rustdoc-ui/intra-doc/issue-108653-associated-items-8.rs
@@ -0,0 +1,12 @@
+#![deny(rustdoc::broken_intra_doc_links)]
+#![allow(nonstandard_style)]
+
+/// [`u32::MAX`]
+//~^ ERROR both an associated constant and an associated type
+pub trait T {
+    type MAX;
+}
+
+impl T for u32 {
+    type MAX = ();
+}
diff --git a/tests/rustdoc-ui/intra-doc/issue-108653-associated-items-8.stderr b/tests/rustdoc-ui/intra-doc/issue-108653-associated-items-8.stderr
new file mode 100644
index 00000000000..efed0e2ce0f
--- /dev/null
+++ b/tests/rustdoc-ui/intra-doc/issue-108653-associated-items-8.stderr
@@ -0,0 +1,22 @@
+error: `u32::MAX` is both an associated constant and an associated type
+  --> $DIR/issue-108653-associated-items-8.rs:4:7
+   |
+LL | /// [`u32::MAX`]
+   |       ^^^^^^^^ ambiguous link
+   |
+note: the lint level is defined here
+  --> $DIR/issue-108653-associated-items-8.rs:1:9
+   |
+LL | #![deny(rustdoc::broken_intra_doc_links)]
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+help: to link to the associated constant, prefix with `const@`
+   |
+LL | /// [`const@u32::MAX`]
+   |       ++++++
+help: to link to the associated type, prefix with `type@`
+   |
+LL | /// [`type@u32::MAX`]
+   |       +++++
+
+error: aborting due to previous error
+
diff --git a/tests/rustdoc-ui/intra-doc/issue-108653-associated-items-9.rs b/tests/rustdoc-ui/intra-doc/issue-108653-associated-items-9.rs
new file mode 100644
index 00000000000..3357ccf2460
--- /dev/null
+++ b/tests/rustdoc-ui/intra-doc/issue-108653-associated-items-9.rs
@@ -0,0 +1,11 @@
+// check-pass
+
+#![deny(warnings)]
+
+//! [usize::Item]
+
+pub trait Foo { type Item; }
+pub trait Bar { type Item; }
+
+impl Foo for usize { type Item = u32; }
+impl Bar for usize { type Item = i32; }
diff --git a/tests/rustdoc-ui/intra-doc/issue-108653-associated-items.rs b/tests/rustdoc-ui/intra-doc/issue-108653-associated-items.rs
new file mode 100644
index 00000000000..0a393e26d6a
--- /dev/null
+++ b/tests/rustdoc-ui/intra-doc/issue-108653-associated-items.rs
@@ -0,0 +1,35 @@
+// This is ensuring that the UI output for associated items is as expected.
+
+#![deny(rustdoc::broken_intra_doc_links)]
+
+pub enum Enum {
+    IDENT,
+}
+
+/// [`Self::IDENT`]
+//~^ ERROR both an associated function and an associated type
+pub trait Trait {
+    type IDENT;
+    fn IDENT();
+}
+
+/// [`Self::IDENT`]
+//~^ ERROR both an associated function and a variant
+impl Trait for Enum {
+    type IDENT = usize;
+    fn IDENT() {}
+}
+
+/// [`Self::IDENT2`]
+//~^ ERROR both an associated constant and an associated type
+pub trait Trait2 {
+    type IDENT2;
+    const IDENT2: usize;
+}
+
+/// [`Self::IDENT2`]
+//~^ ERROR both an associated constant and an associated type
+impl Trait2 for Enum {
+    type IDENT2 = usize;
+    const IDENT2: usize = 0;
+}
diff --git a/tests/rustdoc-ui/intra-doc/issue-108653-associated-items.stderr b/tests/rustdoc-ui/intra-doc/issue-108653-associated-items.stderr
new file mode 100644
index 00000000000..084aefc97c8
--- /dev/null
+++ b/tests/rustdoc-ui/intra-doc/issue-108653-associated-items.stderr
@@ -0,0 +1,67 @@
+error: `Self::IDENT` is both an associated function and an associated type
+  --> $DIR/issue-108653-associated-items.rs:9:7
+   |
+LL | /// [`Self::IDENT`]
+   |       ^^^^^^^^^^^ ambiguous link
+   |
+note: the lint level is defined here
+  --> $DIR/issue-108653-associated-items.rs:3:9
+   |
+LL | #![deny(rustdoc::broken_intra_doc_links)]
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+help: to link to the associated function, add parentheses
+   |
+LL | /// [`Self::IDENT()`]
+   |                  ++
+help: to link to the associated type, prefix with `type@`
+   |
+LL | /// [`type@Self::IDENT`]
+   |       +++++
+
+error: `Self::IDENT2` is both an associated constant and an associated type
+  --> $DIR/issue-108653-associated-items.rs:23:7
+   |
+LL | /// [`Self::IDENT2`]
+   |       ^^^^^^^^^^^^ ambiguous link
+   |
+help: to link to the associated constant, prefix with `const@`
+   |
+LL | /// [`const@Self::IDENT2`]
+   |       ++++++
+help: to link to the associated type, prefix with `type@`
+   |
+LL | /// [`type@Self::IDENT2`]
+   |       +++++
+
+error: `Self::IDENT2` is both an associated constant and an associated type
+  --> $DIR/issue-108653-associated-items.rs:30:7
+   |
+LL | /// [`Self::IDENT2`]
+   |       ^^^^^^^^^^^^ ambiguous link
+   |
+help: to link to the associated constant, prefix with `const@`
+   |
+LL | /// [`const@Self::IDENT2`]
+   |       ++++++
+help: to link to the associated type, prefix with `type@`
+   |
+LL | /// [`type@Self::IDENT2`]
+   |       +++++
+
+error: `Self::IDENT` is both an associated function and a variant
+  --> $DIR/issue-108653-associated-items.rs:16:7
+   |
+LL | /// [`Self::IDENT`]
+   |       ^^^^^^^^^^^ ambiguous link
+   |
+help: to link to the associated function, add parentheses
+   |
+LL | /// [`Self::IDENT()`]
+   |                  ++
+help: to link to the variant, prefix with `type@`
+   |
+LL | /// [`type@Self::IDENT`]
+   |       +++++
+
+error: aborting due to 4 previous errors
+
diff --git a/tests/rustdoc-ui/intra-doc/non-path-primitives.stderr b/tests/rustdoc-ui/intra-doc/non-path-primitives.stderr
index 8ec894d101b..6e08a923963 100644
--- a/tests/rustdoc-ui/intra-doc/non-path-primitives.stderr
+++ b/tests/rustdoc-ui/intra-doc/non-path-primitives.stderr
@@ -39,25 +39,25 @@ error: unresolved link to `unit::eq`
   --> $DIR/non-path-primitives.rs:28:6
    |
 LL | //! [unit::eq]
-   |      ^^^^^^^^ the builtin type `unit` has no associated item named `eq`
+   |      ^^^^^^^^ the primitive type `unit` has no associated item named `eq`
 
 error: unresolved link to `tuple::eq`
   --> $DIR/non-path-primitives.rs:29:6
    |
 LL | //! [tuple::eq]
-   |      ^^^^^^^^^ the builtin type `tuple` has no associated item named `eq`
+   |      ^^^^^^^^^ the primitive type `tuple` has no associated item named `eq`
 
 error: unresolved link to `fn::eq`
   --> $DIR/non-path-primitives.rs:30:6
    |
 LL | //! [fn::eq]
-   |      ^^^^^^ the builtin type `fn` has no associated item named `eq`
+   |      ^^^^^^ the primitive type `fn` has no associated item named `eq`
 
 error: unresolved link to `reference::deref`
   --> $DIR/non-path-primitives.rs:34:6
    |
 LL | //! [reference::deref]
-   |      ^^^^^^^^^^^^^^^^ the builtin type `reference` has no associated item named `deref`
+   |      ^^^^^^^^^^^^^^^^ the primitive type `reference` has no associated item named `deref`
 
 error: aborting due to 8 previous errors
 
diff --git a/tests/rustdoc-ui/intra-doc/prim-conflict.rs b/tests/rustdoc-ui/intra-doc/prim-conflict.rs
index 2c1a8b5357a..e87ce095cd4 100644
--- a/tests/rustdoc-ui/intra-doc/prim-conflict.rs
+++ b/tests/rustdoc-ui/intra-doc/prim-conflict.rs
@@ -2,16 +2,16 @@
 //~^ NOTE lint level is defined
 
 /// [char]
-//~^ ERROR both a module and a builtin type
+//~^ ERROR both a module and a primitive type
 //~| NOTE ambiguous link
 //~| HELP to link to the module
-//~| HELP to link to the builtin type
+//~| HELP to link to the primitive type
 
 /// [type@char]
-//~^ ERROR both a module and a builtin type
+//~^ ERROR both a module and a primitive type
 //~| NOTE ambiguous link
 //~| HELP to link to the module
-//~| HELP to link to the builtin type
+//~| HELP to link to the primitive type
 
 /// [mod@char] // ok
 /// [prim@char] // ok
@@ -26,5 +26,5 @@ pub mod inner {
     //! [struct@char]
     //~^ ERROR incompatible link
     //~| HELP prefix with `prim@`
-    //~| NOTE resolved to a builtin type
+    //~| NOTE resolved to a primitive type
 }
diff --git a/tests/rustdoc-ui/intra-doc/prim-conflict.stderr b/tests/rustdoc-ui/intra-doc/prim-conflict.stderr
index 6ef3b7eab3b..03ce8f15f0a 100644
--- a/tests/rustdoc-ui/intra-doc/prim-conflict.stderr
+++ b/tests/rustdoc-ui/intra-doc/prim-conflict.stderr
@@ -1,4 +1,4 @@
-error: `char` is both a module and a builtin type
+error: `char` is both a module and a primitive type
   --> $DIR/prim-conflict.rs:4:6
    |
 LL | /// [char]
@@ -13,12 +13,12 @@ help: to link to the module, prefix with `mod@`
    |
 LL | /// [mod@char]
    |      ++++
-help: to link to the builtin type, prefix with `prim@`
+help: to link to the primitive type, prefix with `prim@`
    |
 LL | /// [prim@char]
    |      +++++
 
-error: `char` is both a module and a builtin type
+error: `char` is both a module and a primitive type
   --> $DIR/prim-conflict.rs:10:6
    |
 LL | /// [type@char]
@@ -28,7 +28,7 @@ help: to link to the module, prefix with `mod@`
    |
 LL | /// [mod@char]
    |      ~~~~
-help: to link to the builtin type, prefix with `prim@`
+help: to link to the primitive type, prefix with `prim@`
    |
 LL | /// [prim@char]
    |      ~~~~~
@@ -48,9 +48,9 @@ error: incompatible link kind for `char`
   --> $DIR/prim-conflict.rs:26:10
    |
 LL |     //! [struct@char]
-   |          ^^^^^^^^^^^ this link resolved to a builtin type, which is not a struct
+   |          ^^^^^^^^^^^ this link resolved to a primitive type, which is not a struct
    |
-help: to link to the builtin type, prefix with `prim@`
+help: to link to the primitive type, prefix with `prim@`
    |
 LL |     //! [prim@char]
    |          ~~~~~
diff --git a/tests/rustdoc/auto-impl-primitive.rs b/tests/rustdoc/auto-impl-primitive.rs
index 172333d445d..a6db93dbc33 100644
--- a/tests/rustdoc/auto-impl-primitive.rs
+++ b/tests/rustdoc/auto-impl-primitive.rs
@@ -1,10 +1,10 @@
-#![feature(rustdoc_internals)]
+#![feature(rustc_attrs)]
 
 #![crate_name = "foo"]
 
 pub use std::fs::File;
 
 // @has 'foo/primitive.i16.html' '//h2[@id="synthetic-implementations"]' 'Auto Trait Implementation'
-#[doc(primitive = "i16")]
+#[rustc_doc_primitive = "i16"]
 /// I love poneys!
 mod prim {}
diff --git a/tests/rustdoc/auxiliary/issue-15318.rs b/tests/rustdoc/auxiliary/issue-15318.rs
index 695fa58ef1d..a2f426c6352 100644
--- a/tests/rustdoc/auxiliary/issue-15318.rs
+++ b/tests/rustdoc/auxiliary/issue-15318.rs
@@ -2,6 +2,7 @@
 // compile-flags: -Cmetadata=aux
 #![crate_type = "rlib"]
 #![doc(html_root_url = "http://example.com/")]
+#![feature(rustc_attrs)]
 #![feature(lang_items)]
 #![no_std]
 
@@ -12,5 +13,5 @@ fn foo() {}
 fn bar(_: &core::panic::PanicInfo) -> ! { loop {} }
 
 /// dox
-#[doc(primitive = "pointer")]
+#[rustc_doc_primitive = "pointer"]
 pub mod ptr {}
diff --git a/tests/rustdoc/auxiliary/primitive-doc.rs b/tests/rustdoc/auxiliary/primitive-doc.rs
index e8da852a57e..d1785e42391 100644
--- a/tests/rustdoc/auxiliary/primitive-doc.rs
+++ b/tests/rustdoc/auxiliary/primitive-doc.rs
@@ -1,9 +1,10 @@
 // compile-flags: --crate-type lib --edition 2018
 
+#![feature(rustc_attrs)]
 #![feature(no_core)]
 #![no_core]
 
-#[doc(primitive = "usize")]
+#[rustc_doc_primitive = "usize"]
 /// This is the built-in type `usize`.
 mod usize {
 }
diff --git a/tests/rustdoc/check-source-code-urls-to-def.rs b/tests/rustdoc/check-source-code-urls-to-def.rs
index 5959f9c7c59..41b9d41fa44 100644
--- a/tests/rustdoc/check-source-code-urls-to-def.rs
+++ b/tests/rustdoc/check-source-code-urls-to-def.rs
@@ -2,7 +2,7 @@
 // aux-build:source_code.rs
 // build-aux-docs
 
-#![feature(rustdoc_internals)]
+#![feature(rustc_attrs)]
 
 #![crate_name = "foo"]
 
@@ -65,5 +65,5 @@ pub fn foo4() {
 }
 
 // @has - '//pre[@class="rust"]//a[@href="../../foo/primitive.bool.html"]' 'bool'
-#[doc(primitive = "bool")]
+#[rustc_doc_primitive = "bool"]
 mod whatever {}
diff --git a/tests/rustdoc/intra-doc/auxiliary/my-core.rs b/tests/rustdoc/intra-doc/auxiliary/my-core.rs
index e22feb03ae6..c050929db96 100644
--- a/tests/rustdoc/intra-doc/auxiliary/my-core.rs
+++ b/tests/rustdoc/intra-doc/auxiliary/my-core.rs
@@ -3,7 +3,7 @@
 #![rustc_coherence_is_core]
 #![crate_type="rlib"]
 
-#[doc(primitive = "char")]
+#[rustc_doc_primitive = "char"]
 /// Some char docs
 mod char {}
 
diff --git a/tests/rustdoc/intra-doc/no-doc-primitive.rs b/tests/rustdoc/intra-doc/no-doc-primitive.rs
index e5eba1d8d48..711ac09ba9a 100644
--- a/tests/rustdoc/intra-doc/no-doc-primitive.rs
+++ b/tests/rustdoc/intra-doc/no-doc-primitive.rs
@@ -1,4 +1,4 @@
-// Crate tree without a `doc(primitive)` module for primitive type linked to by a doc link.
+// Crate tree without a `rustc_doc_primitive` module for primitive type linked to by a doc link.
 
 #![deny(rustdoc::broken_intra_doc_links)]
 #![feature(no_core, lang_items, rustc_attrs)]
diff --git a/tests/rustdoc/intra-doc/prim-methods-local.rs b/tests/rustdoc/intra-doc/prim-methods-local.rs
index 79d8df04515..6de4ec1802f 100644
--- a/tests/rustdoc/intra-doc/prim-methods-local.rs
+++ b/tests/rustdoc/intra-doc/prim-methods-local.rs
@@ -10,7 +10,7 @@
 
 //! A [prim@`char`] and its [`char::len_utf8`].
 
-#[doc(primitive = "char")]
+#[rustc_doc_primitive = "char"]
 mod char {}
 
 impl char {
diff --git a/tests/rustdoc/intra-doc/prim-self.rs b/tests/rustdoc/intra-doc/prim-self.rs
index c7ce71b15f3..d13858a53cf 100644
--- a/tests/rustdoc/intra-doc/prim-self.rs
+++ b/tests/rustdoc/intra-doc/prim-self.rs
@@ -25,7 +25,7 @@ impl usize {
     pub type ME = usize;
 }
 
-#[doc(primitive = "usize")]
+#[rustc_doc_primitive = "usize"]
 /// This has some docs.
 mod usize {}
 
diff --git a/tests/rustdoc/issue-15318-3.rs b/tests/rustdoc/issue-15318-3.rs
index 2fadc26b006..2dab8f94883 100644
--- a/tests/rustdoc/issue-15318-3.rs
+++ b/tests/rustdoc/issue-15318-3.rs
@@ -1,7 +1,7 @@
-#![feature(rustdoc_internals)]
+#![feature(rustc_attrs)]
 
 // @has issue_15318_3/primitive.pointer.html
 
 /// dox
-#[doc(primitive = "pointer")]
+#[rustc_doc_primitive = "pointer"]
 pub mod ptr {}
diff --git a/tests/rustdoc/issue-23511.rs b/tests/rustdoc/issue-23511.rs
index 7576ebb0305..21d02842431 100644
--- a/tests/rustdoc/issue-23511.rs
+++ b/tests/rustdoc/issue-23511.rs
@@ -3,7 +3,7 @@
 #![no_std]
 
 pub mod str {
-    #![doc(primitive = "str")]
+    #![rustc_doc_primitive = "str"]
 
     impl str {
         // @hasraw search-index.js foo
diff --git a/tests/rustdoc/notable-trait/doc-notable_trait-mut_t_is_not_an_iterator.rs b/tests/rustdoc/notable-trait/doc-notable_trait-mut_t_is_not_an_iterator.rs
index bfce46cf444..5af5f7616b5 100644
--- a/tests/rustdoc/notable-trait/doc-notable_trait-mut_t_is_not_an_iterator.rs
+++ b/tests/rustdoc/notable-trait/doc-notable_trait-mut_t_is_not_an_iterator.rs
@@ -6,10 +6,10 @@
 //!
 //! [#80737]: https://github.com/rust-lang/rust/issues/80737
 
-#![feature(rustdoc_internals)]
+#![feature(rustc_attrs)]
 #![no_std]
 
-#[doc(primitive = "reference")]
+#[rustc_doc_primitive = "reference"]
 /// Some useless docs, wouhou!
 ///
 /// We need to put this in here, because notable traits
diff --git a/tests/rustdoc/notable-trait/doc-notable_trait-mut_t_is_not_ref_t.rs b/tests/rustdoc/notable-trait/doc-notable_trait-mut_t_is_not_ref_t.rs
index b359dcea0ff..6c980aaa2b1 100644
--- a/tests/rustdoc/notable-trait/doc-notable_trait-mut_t_is_not_ref_t.rs
+++ b/tests/rustdoc/notable-trait/doc-notable_trait-mut_t_is_not_ref_t.rs
@@ -5,9 +5,9 @@
 //!
 //! [#78160]: https://github.com/rust-lang/rust/issues/78160
 
-#![feature(rustdoc_internals)]
+#![feature(rustc_attrs)]
 
-#[doc(primitive = "reference")]
+#[rustc_doc_primitive = "reference"]
 /// Some useless docs, wouhou!
 ///
 /// We need to put this in here, because notable traits
diff --git a/tests/rustdoc/primitive-reference.rs b/tests/rustdoc/primitive-reference.rs
index 10efbefd2b1..6f034224df5 100644
--- a/tests/rustdoc/primitive-reference.rs
+++ b/tests/rustdoc/primitive-reference.rs
@@ -1,6 +1,6 @@
 #![crate_name = "foo"]
 
-#![feature(rustdoc_internals)]
+#![feature(rustc_attrs)]
 
 // @has foo/index.html
 // @has - '//h2[@id="primitives"]' 'Primitive Types'
@@ -16,7 +16,7 @@
 // @count - '//*[@class="impl"]' 1
 // @has - '//*[@id="impl-Foo%3C%26A%3E-for-%26B"]/*[@class="code-header"]' \
 //        'impl<A, B> Foo<&A> for &B'
-#[doc(primitive = "reference")]
+#[rustc_doc_primitive = "reference"]
 /// this is a test!
 mod reference {}
 
diff --git a/tests/rustdoc/primitive-slice-auto-trait.rs b/tests/rustdoc/primitive-slice-auto-trait.rs
index 77922414676..ba15a73ca1d 100644
--- a/tests/rustdoc/primitive-slice-auto-trait.rs
+++ b/tests/rustdoc/primitive-slice-auto-trait.rs
@@ -1,7 +1,7 @@
 // compile-flags: --crate-type lib --edition 2018
 
 #![crate_name = "foo"]
-#![feature(rustdoc_internals)]
+#![feature(rustc_attrs)]
 
 // @has foo/primitive.slice.html '//a[@class="primitive"]' 'slice'
 // @has - '//h1' 'Primitive Type slice'
@@ -9,6 +9,6 @@
 // @has - '//h2[@id="synthetic-implementations"]' 'Auto Trait Implementations'
 // @has - '//div[@id="synthetic-implementations-list"]//h3' 'impl<T> Send for [T]where T: Send'
 // @has - '//div[@id="synthetic-implementations-list"]//h3' 'impl<T> Sync for [T]where T: Sync'
-#[doc(primitive = "slice")]
+#[rustc_doc_primitive = "slice"]
 /// this is a test!
 mod slice_prim {}
diff --git a/tests/rustdoc/primitive-tuple-auto-trait.rs b/tests/rustdoc/primitive-tuple-auto-trait.rs
index 4344d24f986..2b407b586a3 100644
--- a/tests/rustdoc/primitive-tuple-auto-trait.rs
+++ b/tests/rustdoc/primitive-tuple-auto-trait.rs
@@ -1,7 +1,7 @@
 // compile-flags: --crate-type lib --edition 2018
 
 #![crate_name = "foo"]
-#![feature(rustdoc_internals)]
+#![feature(rustc_attrs)]
 
 // @has foo/primitive.tuple.html '//a[@class="primitive"]' 'tuple'
 // @has - '//h1' 'Primitive Type tuple'
@@ -9,7 +9,7 @@
 // @has - '//h2[@id="synthetic-implementations"]' 'Auto Trait Implementations'
 // @has - '//div[@id="synthetic-implementations-list"]//h3' 'Send'
 // @has - '//div[@id="synthetic-implementations-list"]//h3' 'Sync'
-#[doc(primitive = "tuple")]
+#[rustc_doc_primitive = "tuple"]
 /// this is a test!
 ///
 // Hardcoded anchor to header written in library/core/src/primitive_docs.rs
diff --git a/tests/rustdoc/primitive-unit-auto-trait.rs b/tests/rustdoc/primitive-unit-auto-trait.rs
index 61850e2462d..5a56f1fd83b 100644
--- a/tests/rustdoc/primitive-unit-auto-trait.rs
+++ b/tests/rustdoc/primitive-unit-auto-trait.rs
@@ -1,7 +1,7 @@
 // compile-flags: --crate-type lib --edition 2018
 
 #![crate_name = "foo"]
-#![feature(rustdoc_internals)]
+#![feature(rustc_attrs)]
 
 // @has foo/primitive.unit.html '//a[@class="primitive"]' 'unit'
 // @has - '//h1' 'Primitive Type unit'
@@ -9,6 +9,6 @@
 // @has - '//h2[@id="synthetic-implementations"]' 'Auto Trait Implementations'
 // @has - '//div[@id="synthetic-implementations-list"]//h3' 'impl Send for ()'
 // @has - '//div[@id="synthetic-implementations-list"]//h3' 'impl Sync for ()'
-#[doc(primitive = "unit")]
+#[rustc_doc_primitive = "unit"]
 /// this is a test!
 mod unit_prim {}
diff --git a/tests/rustdoc/primitive/primitive-generic-impl.rs b/tests/rustdoc/primitive/primitive-generic-impl.rs
index 7b336b39810..2da8ae6ff38 100644
--- a/tests/rustdoc/primitive/primitive-generic-impl.rs
+++ b/tests/rustdoc/primitive/primitive-generic-impl.rs
@@ -1,8 +1,8 @@
-#![feature(rustdoc_internals)]
+#![feature(rustc_attrs)]
 #![crate_name = "foo"]
 
 // @has foo/primitive.i32.html '//*[@id="impl-ToString-for-i32"]//h3[@class="code-header"]' 'impl<T> ToString for T'
 
-#[doc(primitive = "i32")]
+#[rustc_doc_primitive = "i32"]
 /// Some useless docs, wouhou!
 mod i32 {}
diff --git a/tests/rustdoc/primitive/primitive.rs b/tests/rustdoc/primitive/primitive.rs
index 516c7c0c6fe..32af2636c18 100644
--- a/tests/rustdoc/primitive/primitive.rs
+++ b/tests/rustdoc/primitive/primitive.rs
@@ -1,6 +1,6 @@
 #![crate_name = "foo"]
 
-#![feature(rustdoc_internals)]
+#![feature(rustc_attrs)]
 
 // @has foo/index.html '//h2[@id="primitives"]' 'Primitive Types'
 // @has foo/index.html '//a[@href="primitive.i32.html"]' 'i32'
@@ -11,11 +11,11 @@
 // @has foo/primitive.i32.html '//section[@id="main-content"]//div[@class="docblock"]//p' 'this is a test!'
 // @has foo/index.html '//a/@href' '../foo/index.html'
 // @!has foo/index.html '//span' '🔒'
-#[doc(primitive = "i32")]
+#[rustc_doc_primitive = "i32"]
 /// this is a test!
 mod i32{}
 
 // @has foo/primitive.bool.html '//section[@id="main-content"]//div[@class="docblock"]//p' 'hello'
-#[doc(primitive = "bool")]
+#[rustc_doc_primitive = "bool"]
 /// hello
 mod bool {}
diff --git a/tests/rustdoc/sidebar-all-page.rs b/tests/rustdoc/sidebar-all-page.rs
index e74b981de64..45a6ba8ed2e 100644
--- a/tests/rustdoc/sidebar-all-page.rs
+++ b/tests/rustdoc/sidebar-all-page.rs
@@ -1,6 +1,6 @@
 #![crate_name = "foo"]
 
-#![feature(rustdoc_internals)]
+#![feature(rustc_attrs)]
 
 // @has 'foo/all.html'
 // @has - '//*[@class="sidebar-elems"]//li' 'Structs'
@@ -31,5 +31,5 @@ macro_rules! foo {
 pub type Type = u8;
 pub const FOO: u8 = 0;
 pub static BAR: u8 = 0;
-#[doc(primitive = "u8")]
+#[rustc_doc_primitive = "u8"]
 mod u8 {}
diff --git a/tests/rustdoc/tab_title.rs b/tests/rustdoc/tab_title.rs
index 0cc4f147e1c..8d781b40e46 100644
--- a/tests/rustdoc/tab_title.rs
+++ b/tests/rustdoc/tab_title.rs
@@ -1,4 +1,5 @@
 #![crate_name = "foo"]
+#![feature(rustc_attrs)]
 #![feature(rustdoc_internals)]
 
 // tests for the html <title> element
@@ -39,6 +40,6 @@ mod continue_keyword {}
 
 // @has foo/primitive.u8.html '//head/title' 'u8 - Rust'
 // @!has - '//head/title' 'foo'
-#[doc(primitive = "u8")]
+#[rustc_doc_primitive = "u8"]
 /// `u8` docs
 mod u8 {}
diff --git a/tests/rustdoc/titles.rs b/tests/rustdoc/titles.rs
index 69e8b856b0a..e1feb1cd64f 100644
--- a/tests/rustdoc/titles.rs
+++ b/tests/rustdoc/titles.rs
@@ -1,5 +1,5 @@
 #![crate_name = "foo"]
-#![feature(rustdoc_internals)]
+#![feature(rustc_attrs)]
 
 // @matches 'foo/index.html' '//h1' 'Crate foo'
 // @matches 'foo/index.html' '//h2[@class="location"]' 'Crate foo'
@@ -41,7 +41,7 @@ macro_rules! foo_macro {
 }
 
 // @matches 'foo/primitive.bool.html' '//h1' 'Primitive Type bool'
-#[doc(primitive = "bool")]
+#[rustc_doc_primitive = "bool"]
 mod bool {}
 
 // @matches 'foo/static.FOO_STATIC.html' '//h1' 'Static foo::FOO_STATIC'
diff --git a/tests/ui-fulldeps/fluent-messages/test.rs b/tests/ui-fulldeps/fluent-messages/test.rs
index 1ee7227a8e9..6ba13387b04 100644
--- a/tests/ui-fulldeps/fluent-messages/test.rs
+++ b/tests/ui-fulldeps/fluent-messages/test.rs
@@ -1,4 +1,4 @@
-// normalize-stderr-test "note.*" -> "note: os-specific message"
+// normalize-stderr-test "could not open Fluent resource:.*" -> "could not open Fluent resource: os-specific message"
 
 #![feature(rustc_private)]
 #![crate_type = "lib"]
diff --git a/tests/ui-fulldeps/fluent-messages/test.stderr b/tests/ui-fulldeps/fluent-messages/test.stderr
index 8a6a4a91cc2..2affe621c11 100644
--- a/tests/ui-fulldeps/fluent-messages/test.stderr
+++ b/tests/ui-fulldeps/fluent-messages/test.stderr
@@ -1,18 +1,14 @@
-error: could not open Fluent resource
+error: could not open Fluent resource: os-specific message
   --> $DIR/test.rs:24:24
    |
 LL |     fluent_messages! { "/definitely_does_not_exist.ftl" }
    |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = note: os-specific message
 
-error: could not open Fluent resource
+error: could not open Fluent resource: os-specific message
   --> $DIR/test.rs:31:24
    |
 LL |     fluent_messages! { "../definitely_does_not_exist.ftl" }
    |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = note: os-specific message
 
 error: could not parse Fluent resource
   --> $DIR/test.rs:38:24
@@ -89,7 +85,7 @@ error: invalid escape `\n` in Fluent resource
 LL |     fluent_messages! { "./invalid-escape.ftl" }
    |                        ^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: os-specific message
+   = note: Fluent does not interpret these escape sequences (<https://projectfluent.org/fluent/guide/special.html>)
 
 error: invalid escape `\"` in Fluent resource
   --> $DIR/test.rs:99:24
@@ -97,7 +93,7 @@ error: invalid escape `\"` in Fluent resource
 LL |     fluent_messages! { "./invalid-escape.ftl" }
    |                        ^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: os-specific message
+   = note: Fluent does not interpret these escape sequences (<https://projectfluent.org/fluent/guide/special.html>)
 
 error: invalid escape `\'` in Fluent resource
   --> $DIR/test.rs:99:24
@@ -105,7 +101,7 @@ error: invalid escape `\'` in Fluent resource
 LL |     fluent_messages! { "./invalid-escape.ftl" }
    |                        ^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: os-specific message
+   = note: Fluent does not interpret these escape sequences (<https://projectfluent.org/fluent/guide/special.html>)
 
 error: aborting due to 13 previous errors
 
diff --git a/tests/ui/associated-type-bounds/return-type-notation/bad-inputs-and-output.rs b/tests/ui/associated-type-bounds/return-type-notation/bad-inputs-and-output.rs
new file mode 100644
index 00000000000..2f9a1d1c76e
--- /dev/null
+++ b/tests/ui/associated-type-bounds/return-type-notation/bad-inputs-and-output.rs
@@ -0,0 +1,22 @@
+// edition: 2021
+
+#![feature(return_type_notation, async_fn_in_trait)]
+//~^ WARN the feature `return_type_notation` is incomplete
+//~| WARN the feature `async_fn_in_trait` is incomplete
+
+trait Trait {
+    async fn method() {}
+}
+
+fn foo<T: Trait<method(i32): Send>>() {}
+//~^ ERROR argument types not allowed with return type notation
+//~| ERROR associated type bounds are unstable
+
+fn bar<T: Trait<method(..) -> (): Send>>() {}
+//~^ ERROR return type not allowed with return type notation
+
+fn baz<T: Trait<method(): Send>>() {}
+//~^ ERROR return type notation arguments must be elided with `..`
+//~| ERROR associated type bounds are unstable
+
+fn main() {}
diff --git a/tests/ui/associated-type-bounds/return-type-notation/bad-inputs-and-output.stderr b/tests/ui/associated-type-bounds/return-type-notation/bad-inputs-and-output.stderr
new file mode 100644
index 00000000000..b354a6805d6
--- /dev/null
+++ b/tests/ui/associated-type-bounds/return-type-notation/bad-inputs-and-output.stderr
@@ -0,0 +1,56 @@
+error: return type not allowed with return type notation
+  --> $DIR/bad-inputs-and-output.rs:15:28
+   |
+LL | fn bar<T: Trait<method(..) -> (): Send>>() {}
+   |                            ^^^^^ help: remove the return type
+
+error[E0658]: associated type bounds are unstable
+  --> $DIR/bad-inputs-and-output.rs:11:17
+   |
+LL | fn foo<T: Trait<method(i32): Send>>() {}
+   |                 ^^^^^^^^^^^^^^^^^
+   |
+   = note: see issue #52662 <https://github.com/rust-lang/rust/issues/52662> for more information
+   = help: add `#![feature(associated_type_bounds)]` to the crate attributes to enable
+
+error[E0658]: associated type bounds are unstable
+  --> $DIR/bad-inputs-and-output.rs:18:17
+   |
+LL | fn baz<T: Trait<method(): Send>>() {}
+   |                 ^^^^^^^^^^^^^^
+   |
+   = note: see issue #52662 <https://github.com/rust-lang/rust/issues/52662> for more information
+   = help: add `#![feature(associated_type_bounds)]` to the crate attributes to enable
+
+warning: the feature `return_type_notation` is incomplete and may not be safe to use and/or cause compiler crashes
+  --> $DIR/bad-inputs-and-output.rs:3:12
+   |
+LL | #![feature(return_type_notation, async_fn_in_trait)]
+   |            ^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: see issue #109417 <https://github.com/rust-lang/rust/issues/109417> for more information
+   = note: `#[warn(incomplete_features)]` on by default
+
+warning: the feature `async_fn_in_trait` is incomplete and may not be safe to use and/or cause compiler crashes
+  --> $DIR/bad-inputs-and-output.rs:3:34
+   |
+LL | #![feature(return_type_notation, async_fn_in_trait)]
+   |                                  ^^^^^^^^^^^^^^^^^
+   |
+   = note: see issue #91611 <https://github.com/rust-lang/rust/issues/91611> for more information
+
+error: argument types not allowed with return type notation
+  --> $DIR/bad-inputs-and-output.rs:11:23
+   |
+LL | fn foo<T: Trait<method(i32): Send>>() {}
+   |                       ^^^^^ help: remove the input types: `(..)`
+
+error: return type notation arguments must be elided with `..`
+  --> $DIR/bad-inputs-and-output.rs:18:23
+   |
+LL | fn baz<T: Trait<method(): Send>>() {}
+   |                       ^^ help: add `..`: `(..)`
+
+error: aborting due to 5 previous errors; 2 warnings emitted
+
+For more information about this error, try `rustc --explain E0658`.
diff --git a/tests/ui/associated-type-bounds/return-type-notation/basic.rs b/tests/ui/associated-type-bounds/return-type-notation/basic.rs
new file mode 100644
index 00000000000..75d1dc745d1
--- /dev/null
+++ b/tests/ui/associated-type-bounds/return-type-notation/basic.rs
@@ -0,0 +1,28 @@
+// revisions: with without
+// edition: 2021
+//[with] check-pass
+
+#![feature(return_type_notation, async_fn_in_trait)]
+//~^ WARN the feature `return_type_notation` is incomplete
+//~| WARN the feature `async_fn_in_trait` is incomplete
+
+trait Foo {
+    async fn method() -> Result<(), ()>;
+}
+
+async fn foo<T: Foo>() -> Result<(), ()> {
+    T::method().await?;
+    Ok(())
+}
+
+fn is_send(_: impl Send) {}
+
+fn test<
+    #[cfg(with)] T: Foo<method(..): Send>,
+    #[cfg(without)] T: Foo,
+>() {
+    is_send(foo::<T>());
+    //[without]~^ ERROR future cannot be sent between threads safely
+}
+
+fn main() {}
diff --git a/tests/ui/associated-type-bounds/return-type-notation/basic.with.stderr b/tests/ui/associated-type-bounds/return-type-notation/basic.with.stderr
new file mode 100644
index 00000000000..722c774cb33
--- /dev/null
+++ b/tests/ui/associated-type-bounds/return-type-notation/basic.with.stderr
@@ -0,0 +1,19 @@
+warning: the feature `return_type_notation` is incomplete and may not be safe to use and/or cause compiler crashes
+  --> $DIR/basic.rs:5:12
+   |
+LL | #![feature(return_type_notation, async_fn_in_trait)]
+   |            ^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: see issue #109417 <https://github.com/rust-lang/rust/issues/109417> for more information
+   = note: `#[warn(incomplete_features)]` on by default
+
+warning: the feature `async_fn_in_trait` is incomplete and may not be safe to use and/or cause compiler crashes
+  --> $DIR/basic.rs:5:34
+   |
+LL | #![feature(return_type_notation, async_fn_in_trait)]
+   |                                  ^^^^^^^^^^^^^^^^^
+   |
+   = note: see issue #91611 <https://github.com/rust-lang/rust/issues/91611> for more information
+
+warning: 2 warnings emitted
+
diff --git a/tests/ui/associated-type-bounds/return-type-notation/basic.without.stderr b/tests/ui/associated-type-bounds/return-type-notation/basic.without.stderr
new file mode 100644
index 00000000000..1645d8c2650
--- /dev/null
+++ b/tests/ui/associated-type-bounds/return-type-notation/basic.without.stderr
@@ -0,0 +1,37 @@
+warning: the feature `return_type_notation` is incomplete and may not be safe to use and/or cause compiler crashes
+  --> $DIR/basic.rs:5:12
+   |
+LL | #![feature(return_type_notation, async_fn_in_trait)]
+   |            ^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: see issue #109417 <https://github.com/rust-lang/rust/issues/109417> for more information
+   = note: `#[warn(incomplete_features)]` on by default
+
+warning: the feature `async_fn_in_trait` is incomplete and may not be safe to use and/or cause compiler crashes
+  --> $DIR/basic.rs:5:34
+   |
+LL | #![feature(return_type_notation, async_fn_in_trait)]
+   |                                  ^^^^^^^^^^^^^^^^^
+   |
+   = note: see issue #91611 <https://github.com/rust-lang/rust/issues/91611> for more information
+
+error: future cannot be sent between threads safely
+  --> $DIR/basic.rs:24:13
+   |
+LL |     is_send(foo::<T>());
+   |             ^^^^^^^^^^ future returned by `foo` is not `Send`
+   |
+   = help: within `impl Future<Output = Result<(), ()>>`, the trait `Send` is not implemented for `impl Future<Output = Result<(), ()>>`
+note: future is not `Send` as it awaits another future which is not `Send`
+  --> $DIR/basic.rs:14:5
+   |
+LL |     T::method().await?;
+   |     ^^^^^^^^^^^ await occurs here on type `impl Future<Output = Result<(), ()>>`, which is not `Send`
+note: required by a bound in `is_send`
+  --> $DIR/basic.rs:18:20
+   |
+LL | fn is_send(_: impl Send) {}
+   |                    ^^^^ required by this bound in `is_send`
+
+error: aborting due to previous error; 2 warnings emitted
+
diff --git a/tests/ui/associated-type-bounds/return-type-notation/equality.rs b/tests/ui/associated-type-bounds/return-type-notation/equality.rs
new file mode 100644
index 00000000000..c8fc980974e
--- /dev/null
+++ b/tests/ui/associated-type-bounds/return-type-notation/equality.rs
@@ -0,0 +1,16 @@
+// edition: 2021
+
+#![feature(return_type_notation, async_fn_in_trait)]
+//~^ WARN the feature `return_type_notation` is incomplete
+//~| WARN the feature `async_fn_in_trait` is incomplete
+
+use std::future::Future;
+
+trait Trait {
+    async fn method() {}
+}
+
+fn test<T: Trait<method(..) = Box<dyn Future<Output = ()>>>>() {}
+//~^ ERROR return type notation is not allowed to use type equality
+
+fn main() {}
diff --git a/tests/ui/associated-type-bounds/return-type-notation/equality.stderr b/tests/ui/associated-type-bounds/return-type-notation/equality.stderr
new file mode 100644
index 00000000000..cd50ff38694
--- /dev/null
+++ b/tests/ui/associated-type-bounds/return-type-notation/equality.stderr
@@ -0,0 +1,25 @@
+warning: the feature `return_type_notation` is incomplete and may not be safe to use and/or cause compiler crashes
+  --> $DIR/equality.rs:3:12
+   |
+LL | #![feature(return_type_notation, async_fn_in_trait)]
+   |            ^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: see issue #109417 <https://github.com/rust-lang/rust/issues/109417> for more information
+   = note: `#[warn(incomplete_features)]` on by default
+
+warning: the feature `async_fn_in_trait` is incomplete and may not be safe to use and/or cause compiler crashes
+  --> $DIR/equality.rs:3:34
+   |
+LL | #![feature(return_type_notation, async_fn_in_trait)]
+   |                                  ^^^^^^^^^^^^^^^^^
+   |
+   = note: see issue #91611 <https://github.com/rust-lang/rust/issues/91611> for more information
+
+error: return type notation is not allowed to use type equality
+  --> $DIR/equality.rs:13:18
+   |
+LL | fn test<T: Trait<method(..) = Box<dyn Future<Output = ()>>>>() {}
+   |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to previous error; 2 warnings emitted
+
diff --git a/tests/ui/associated-type-bounds/return-type-notation/missing.rs b/tests/ui/associated-type-bounds/return-type-notation/missing.rs
new file mode 100644
index 00000000000..1263cae4477
--- /dev/null
+++ b/tests/ui/associated-type-bounds/return-type-notation/missing.rs
@@ -0,0 +1,14 @@
+// edition: 2021
+
+#![feature(return_type_notation, async_fn_in_trait)]
+//~^ WARN the feature `return_type_notation` is incomplete
+//~| WARN the feature `async_fn_in_trait` is incomplete
+
+trait Trait {
+    async fn method() {}
+}
+
+fn bar<T: Trait<methid(..): Send>>() {}
+//~^ ERROR cannot find associated function `methid` in trait `Trait`
+
+fn main() {}
diff --git a/tests/ui/associated-type-bounds/return-type-notation/missing.stderr b/tests/ui/associated-type-bounds/return-type-notation/missing.stderr
new file mode 100644
index 00000000000..93111b5c36b
--- /dev/null
+++ b/tests/ui/associated-type-bounds/return-type-notation/missing.stderr
@@ -0,0 +1,25 @@
+warning: the feature `return_type_notation` is incomplete and may not be safe to use and/or cause compiler crashes
+  --> $DIR/missing.rs:3:12
+   |
+LL | #![feature(return_type_notation, async_fn_in_trait)]
+   |            ^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: see issue #109417 <https://github.com/rust-lang/rust/issues/109417> for more information
+   = note: `#[warn(incomplete_features)]` on by default
+
+warning: the feature `async_fn_in_trait` is incomplete and may not be safe to use and/or cause compiler crashes
+  --> $DIR/missing.rs:3:34
+   |
+LL | #![feature(return_type_notation, async_fn_in_trait)]
+   |                                  ^^^^^^^^^^^^^^^^^
+   |
+   = note: see issue #91611 <https://github.com/rust-lang/rust/issues/91611> for more information
+
+error: cannot find associated function `methid` in trait `Trait`
+  --> $DIR/missing.rs:11:17
+   |
+LL | fn bar<T: Trait<methid(..): Send>>() {}
+   |                 ^^^^^^^^^^^^^^^^
+
+error: aborting due to previous error; 2 warnings emitted
+
diff --git a/tests/ui/associated-type-bounds/return-type-notation/non-rpitit.rs b/tests/ui/associated-type-bounds/return-type-notation/non-rpitit.rs
new file mode 100644
index 00000000000..d283c6eab37
--- /dev/null
+++ b/tests/ui/associated-type-bounds/return-type-notation/non-rpitit.rs
@@ -0,0 +1,11 @@
+#![feature(return_type_notation)]
+//~^ WARN the feature `return_type_notation` is incomplete
+
+trait Trait {
+    fn method() {}
+}
+
+fn test<T: Trait<method(..): Send>>() {}
+//~^ ERROR  return type notation used on function that is not `async` and does not return `impl Trait`
+
+fn main() {}
diff --git a/tests/ui/associated-type-bounds/return-type-notation/non-rpitit.stderr b/tests/ui/associated-type-bounds/return-type-notation/non-rpitit.stderr
new file mode 100644
index 00000000000..38c498bc2fb
--- /dev/null
+++ b/tests/ui/associated-type-bounds/return-type-notation/non-rpitit.stderr
@@ -0,0 +1,22 @@
+warning: the feature `return_type_notation` is incomplete and may not be safe to use and/or cause compiler crashes
+  --> $DIR/non-rpitit.rs:1:12
+   |
+LL | #![feature(return_type_notation)]
+   |            ^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: see issue #109417 <https://github.com/rust-lang/rust/issues/109417> for more information
+   = note: `#[warn(incomplete_features)]` on by default
+
+error: return type notation used on function that is not `async` and does not return `impl Trait`
+  --> $DIR/non-rpitit.rs:8:18
+   |
+LL |     fn method() {}
+   |     ----------- this function must be `async` or return `impl Trait`
+...
+LL | fn test<T: Trait<method(..): Send>>() {}
+   |                  ^^^^^^^^^^^^^^^^
+   |
+   = note: function returns `()`, which is not compatible with associated type return bounds
+
+error: aborting due to previous error; 1 warning emitted
+
diff --git a/tests/ui/associated-type-bounds/return-type-notation/unpretty-parenthesized.rs b/tests/ui/associated-type-bounds/return-type-notation/unpretty-parenthesized.rs
new file mode 100644
index 00000000000..9129f37e0c6
--- /dev/null
+++ b/tests/ui/associated-type-bounds/return-type-notation/unpretty-parenthesized.rs
@@ -0,0 +1,11 @@
+// edition: 2021
+// compile-flags: -Zunpretty=expanded
+
+trait Trait {
+    async fn method() {}
+}
+
+fn foo<T: Trait<method(i32): Send>>() {}
+//~^ ERROR associated type bounds are unstable
+
+fn main() {}
diff --git a/tests/ui/associated-type-bounds/return-type-notation/unpretty-parenthesized.stderr b/tests/ui/associated-type-bounds/return-type-notation/unpretty-parenthesized.stderr
new file mode 100644
index 00000000000..77e015b4160
--- /dev/null
+++ b/tests/ui/associated-type-bounds/return-type-notation/unpretty-parenthesized.stderr
@@ -0,0 +1,12 @@
+error[E0658]: associated type bounds are unstable
+  --> $DIR/unpretty-parenthesized.rs:8:17
+   |
+LL | fn foo<T: Trait<method(i32): Send>>() {}
+   |                 ^^^^^^^^^^^^^^^^^
+   |
+   = note: see issue #52662 <https://github.com/rust-lang/rust/issues/52662> for more information
+   = help: add `#![feature(associated_type_bounds)]` to the crate attributes to enable
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0658`.
diff --git a/tests/ui/associated-type-bounds/return-type-notation/unpretty-parenthesized.stdout b/tests/ui/associated-type-bounds/return-type-notation/unpretty-parenthesized.stdout
new file mode 100644
index 00000000000..b3dea8f6eca
--- /dev/null
+++ b/tests/ui/associated-type-bounds/return-type-notation/unpretty-parenthesized.stdout
@@ -0,0 +1,15 @@
+#![feature(prelude_import)]
+#[prelude_import]
+use std::prelude::rust_2021::*;
+#[macro_use]
+extern crate std;
+// edition: 2021
+// compile-flags: -Zunpretty=expanded
+
+trait Trait {
+    async fn method() {}
+}
+
+fn foo<T: Trait<method(i32) : Send>>() {}
+
+fn main() {}
diff --git a/tests/ui/async-await/missed-capture-issue-107414.rs b/tests/ui/async-await/missed-capture-issue-107414.rs
new file mode 100644
index 00000000000..0ab4f5ade98
--- /dev/null
+++ b/tests/ui/async-await/missed-capture-issue-107414.rs
@@ -0,0 +1,24 @@
+// check-pass
+// edition:2018
+
+fn main() {}
+
+struct StructA {}
+struct StructB {}
+
+impl StructA {
+    fn fn_taking_struct_b(&self, struct_b: &StructB) -> bool {
+        true
+    }
+}
+
+async fn get_struct_a_async() -> StructA {
+    StructA {}
+}
+
+async fn ice() {
+    match Some(StructB {}) {
+        Some(struct_b) if get_struct_a_async().await.fn_taking_struct_b(&struct_b) => {}
+        _ => {}
+    }
+}
diff --git a/tests/ui/autoref-autoderef/issue-38940.rs b/tests/ui/autoref-autoderef/issue-38940.rs
deleted file mode 100644
index d2f1c6e3271..00000000000
--- a/tests/ui/autoref-autoderef/issue-38940.rs
+++ /dev/null
@@ -1,52 +0,0 @@
-// issue-38940: error printed twice for deref recursion limit exceeded
-// Test that the recursion limit can be changed. In this case, we have
-// deeply nested types that will fail the `Send` check by overflow
-// when the recursion limit is set very low.
-// compile-flags: -Zdeduplicate-diagnostics=yes
-
-#![allow(dead_code)]
-#![recursion_limit = "10"]
-macro_rules! link {
-    ($outer:ident, $inner:ident) => {
-        struct $outer($inner);
-        impl $outer {
-            fn new() -> $outer {
-                $outer($inner::new())
-            }
-        }
-        impl std::ops::Deref for $outer {
-            type Target = $inner;
-            fn deref(&self) -> &$inner {
-                &self.0
-            }
-        }
-    };
-}
-
-struct Bottom;
-
-impl Bottom {
-    fn new() -> Bottom {
-        Bottom
-    }
-}
-
-link!(Top, A);
-link!(A, B);
-link!(B, C);
-link!(C, D);
-link!(D, E);
-link!(E, F);
-link!(F, G);
-link!(G, H);
-link!(H, I);
-link!(I, J);
-link!(J, K);
-link!(K, Bottom);
-
-fn main() {
-    let t = Top::new();
-    let x: &Bottom = &t;
-    //~^ ERROR mismatched types
-    //~| ERROR reached the recursion limit while auto-dereferencing `J`
-}
diff --git a/tests/ui/autoref-autoderef/issue-38940.stderr b/tests/ui/autoref-autoderef/issue-38940.stderr
deleted file mode 100644
index 8e98bfcd90f..00000000000
--- a/tests/ui/autoref-autoderef/issue-38940.stderr
+++ /dev/null
@@ -1,23 +0,0 @@
-error[E0055]: reached the recursion limit while auto-dereferencing `J`
-  --> $DIR/issue-38940.rs:49:22
-   |
-LL |     let x: &Bottom = &t;
-   |                      ^^ deref recursion limit reached
-   |
-   = help: consider increasing the recursion limit by adding a `#![recursion_limit = "20"]` attribute to your crate (`issue_38940`)
-
-error[E0308]: mismatched types
-  --> $DIR/issue-38940.rs:49:22
-   |
-LL |     let x: &Bottom = &t;
-   |            -------   ^^ expected `&Bottom`, found `&Top`
-   |            |
-   |            expected due to this
-   |
-   = note: expected reference `&Bottom`
-              found reference `&Top`
-
-error: aborting due to 2 previous errors
-
-Some errors have detailed explanations: E0055, E0308.
-For more information about an error, try `rustc --explain E0055`.
diff --git a/tests/ui/closures/2229_closure_analysis/array_subslice.rs b/tests/ui/closures/2229_closure_analysis/array_subslice.rs
new file mode 100644
index 00000000000..5f244ea8936
--- /dev/null
+++ b/tests/ui/closures/2229_closure_analysis/array_subslice.rs
@@ -0,0 +1,13 @@
+// regression test for #109298
+// edition: 2021
+
+pub fn subslice_array(x: [u8; 3]) {
+    let f = || {
+        let [_x @ ..] = x;
+        let [ref y, ref mut z @ ..] = x; //~ ERROR cannot borrow `x[..]` as mutable
+    };
+
+    f(); //~ ERROR cannot borrow `f` as mutable
+}
+
+fn main() {}
diff --git a/tests/ui/closures/2229_closure_analysis/array_subslice.stderr b/tests/ui/closures/2229_closure_analysis/array_subslice.stderr
new file mode 100644
index 00000000000..888c60d5e91
--- /dev/null
+++ b/tests/ui/closures/2229_closure_analysis/array_subslice.stderr
@@ -0,0 +1,26 @@
+error[E0596]: cannot borrow `x[..]` as mutable, as `x` is not declared as mutable
+  --> $DIR/array_subslice.rs:7:21
+   |
+LL | pub fn subslice_array(x: [u8; 3]) {
+   |                       - help: consider changing this to be mutable: `mut x`
+...
+LL |         let [ref y, ref mut z @ ..] = x;
+   |                     ^^^^^^^^^ cannot borrow as mutable
+
+error[E0596]: cannot borrow `f` as mutable, as it is not declared as mutable
+  --> $DIR/array_subslice.rs:10:5
+   |
+LL |         let [ref y, ref mut z @ ..] = x;
+   |                                       - calling `f` requires mutable binding due to mutable borrow of `x`
+...
+LL |     f();
+   |     ^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL |     let mut f = || {
+   |         +++
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0596`.
diff --git a/tests/ui/did_you_mean/recursion_limit_deref.stderr b/tests/ui/did_you_mean/recursion_limit_deref.stderr
index 32fb628c470..b0c493faf1e 100644
--- a/tests/ui/did_you_mean/recursion_limit_deref.stderr
+++ b/tests/ui/did_you_mean/recursion_limit_deref.stderr
@@ -1,3 +1,7 @@
+error: reached the recursion limit finding the struct tail for `Bottom`
+   |
+   = help: consider increasing the recursion limit by adding a `#![recursion_limit = "20"]`
+
 error[E0055]: reached the recursion limit while auto-dereferencing `J`
   --> $DIR/recursion_limit_deref.rs:51:22
    |
@@ -17,7 +21,7 @@ LL |     let x: &Bottom = &t;
    = note: expected reference `&Bottom`
               found reference `&Top`
 
-error: aborting due to 2 previous errors
+error: aborting due to 3 previous errors
 
 Some errors have detailed explanations: E0055, E0308.
 For more information about an error, try `rustc --explain E0055`.
diff --git a/tests/ui/feature-gates/feature-gate-return_type_notation.cfg.stderr b/tests/ui/feature-gates/feature-gate-return_type_notation.cfg.stderr
new file mode 100644
index 00000000000..85728f8e1ad
--- /dev/null
+++ b/tests/ui/feature-gates/feature-gate-return_type_notation.cfg.stderr
@@ -0,0 +1,21 @@
+error[E0658]: return type notation is experimental
+  --> $DIR/feature-gate-return_type_notation.rs:12:18
+   |
+LL | fn foo<T: Trait<m(..): Send>>() {}
+   |                  ^^^^
+   |
+   = note: see issue #109417 <https://github.com/rust-lang/rust/issues/109417> for more information
+   = help: add `#![feature(return_type_notation)]` to the crate attributes to enable
+
+warning: the feature `async_fn_in_trait` is incomplete and may not be safe to use and/or cause compiler crashes
+  --> $DIR/feature-gate-return_type_notation.rs:4:12
+   |
+LL | #![feature(async_fn_in_trait)]
+   |            ^^^^^^^^^^^^^^^^^
+   |
+   = note: see issue #91611 <https://github.com/rust-lang/rust/issues/91611> for more information
+   = note: `#[warn(incomplete_features)]` on by default
+
+error: aborting due to previous error; 1 warning emitted
+
+For more information about this error, try `rustc --explain E0658`.
diff --git a/tests/ui/feature-gates/feature-gate-return_type_notation.no.stderr b/tests/ui/feature-gates/feature-gate-return_type_notation.no.stderr
new file mode 100644
index 00000000000..85728f8e1ad
--- /dev/null
+++ b/tests/ui/feature-gates/feature-gate-return_type_notation.no.stderr
@@ -0,0 +1,21 @@
+error[E0658]: return type notation is experimental
+  --> $DIR/feature-gate-return_type_notation.rs:12:18
+   |
+LL | fn foo<T: Trait<m(..): Send>>() {}
+   |                  ^^^^
+   |
+   = note: see issue #109417 <https://github.com/rust-lang/rust/issues/109417> for more information
+   = help: add `#![feature(return_type_notation)]` to the crate attributes to enable
+
+warning: the feature `async_fn_in_trait` is incomplete and may not be safe to use and/or cause compiler crashes
+  --> $DIR/feature-gate-return_type_notation.rs:4:12
+   |
+LL | #![feature(async_fn_in_trait)]
+   |            ^^^^^^^^^^^^^^^^^
+   |
+   = note: see issue #91611 <https://github.com/rust-lang/rust/issues/91611> for more information
+   = note: `#[warn(incomplete_features)]` on by default
+
+error: aborting due to previous error; 1 warning emitted
+
+For more information about this error, try `rustc --explain E0658`.
diff --git a/tests/ui/feature-gates/feature-gate-return_type_notation.rs b/tests/ui/feature-gates/feature-gate-return_type_notation.rs
new file mode 100644
index 00000000000..b75feb130a6
--- /dev/null
+++ b/tests/ui/feature-gates/feature-gate-return_type_notation.rs
@@ -0,0 +1,15 @@
+// edition: 2021
+// revisions: cfg no
+
+#![feature(async_fn_in_trait)]
+//~^ WARN the feature `async_fn_in_trait` is incomplete
+
+trait Trait {
+    async fn m();
+}
+
+#[cfg(cfg)]
+fn foo<T: Trait<m(..): Send>>() {}
+//~^ ERROR return type notation is experimental
+
+fn main() {}
diff --git a/tests/ui/fn/fn-ptr-trait-int-float-infer-var.rs b/tests/ui/fn/fn-ptr-trait-int-float-infer-var.rs
new file mode 100644
index 00000000000..eec7da044c0
--- /dev/null
+++ b/tests/ui/fn/fn-ptr-trait-int-float-infer-var.rs
@@ -0,0 +1,10 @@
+// check-pass
+trait MyCmp {
+    fn cmp(&self) {}
+}
+impl MyCmp for f32 {}
+
+fn main() {
+    // Ensure that `impl<F: FnPtr> Ord for F` is never considered for int and float infer vars.
+    0.0.cmp();
+}
diff --git a/tests/ui/slightly-nice-generic-literal-messages.rs b/tests/ui/generics/slightly-nice-generic-literal-messages.rs
index 268009f65a5..268009f65a5 100644
--- a/tests/ui/slightly-nice-generic-literal-messages.rs
+++ b/tests/ui/generics/slightly-nice-generic-literal-messages.rs
diff --git a/tests/ui/slightly-nice-generic-literal-messages.stderr b/tests/ui/generics/slightly-nice-generic-literal-messages.stderr
index 83ef522ab46..83ef522ab46 100644
--- a/tests/ui/slightly-nice-generic-literal-messages.stderr
+++ b/tests/ui/generics/slightly-nice-generic-literal-messages.stderr
diff --git a/tests/ui/implied-bounds/normalization-nested.lifetime.stderr b/tests/ui/implied-bounds/normalization-nested.lifetime.stderr
new file mode 100644
index 00000000000..898e5e9511e
--- /dev/null
+++ b/tests/ui/implied-bounds/normalization-nested.lifetime.stderr
@@ -0,0 +1,18 @@
+error[E0759]: `fn` parameter has lifetime `'x` but it needs to satisfy a `'static` lifetime requirement
+  --> $DIR/normalization-nested.rs:35:20
+   |
+LL | pub fn test<'x>(_: Map<Vec<&'x ()>>, s: &'x str) -> &'static str {
+   |                    ^^^^^^^^^^^^^^^^
+   |                    |
+   |                    this data with lifetime `'x`...
+   |                    ...is used and required to live as long as `'static` here
+   |
+note: `'static` lifetime requirement introduced by this bound
+  --> $DIR/normalization-nested.rs:33:14
+   |
+LL |     I::Item: 'static;
+   |              ^^^^^^^
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0759`.
diff --git a/tests/ui/implied-bounds/normalization-nested.rs b/tests/ui/implied-bounds/normalization-nested.rs
new file mode 100644
index 00000000000..5f1cbb3f697
--- /dev/null
+++ b/tests/ui/implied-bounds/normalization-nested.rs
@@ -0,0 +1,39 @@
+// Test for normalization of projections that appear in the item bounds
+// (versus those that appear directly in the input types).
+// Both revisions should pass. `lifetime` revision is a bug.
+//
+// revisions: param_ty lifetime
+// [param_ty] check-pass
+// [lifetime] check-fail
+// [lifetime] known-bug: #109799
+
+pub trait Iter {
+    type Item;
+}
+
+#[cfg(param_ty)]
+impl<X, I> Iter for I
+where
+    I: IntoIterator<Item = X>,
+{
+    type Item = X;
+}
+
+#[cfg(lifetime)]
+impl<'x, I> Iter for I
+where
+    I: IntoIterator<Item = &'x ()>,
+{
+    type Item = &'x ();
+}
+
+pub struct Map<I>(I)
+where
+    I: Iter,
+    I::Item: 'static;
+
+pub fn test<'x>(_: Map<Vec<&'x ()>>, s: &'x str) -> &'static str {
+    s
+}
+
+fn main() {}
diff --git a/tests/ui/unterminated-comment.rs b/tests/ui/lexer/unterminated-comment.rs
index 1cfdfb1fb45..1cfdfb1fb45 100644
--- a/tests/ui/unterminated-comment.rs
+++ b/tests/ui/lexer/unterminated-comment.rs
diff --git a/tests/ui/unterminated-comment.stderr b/tests/ui/lexer/unterminated-comment.stderr
index c513fafeeb3..c513fafeeb3 100644
--- a/tests/ui/unterminated-comment.stderr
+++ b/tests/ui/lexer/unterminated-comment.stderr
diff --git a/tests/ui/unterminated-nested-comment.rs b/tests/ui/lexer/unterminated-nested-comment.rs
index db5f2f3ba13..db5f2f3ba13 100644
--- a/tests/ui/unterminated-nested-comment.rs
+++ b/tests/ui/lexer/unterminated-nested-comment.rs
diff --git a/tests/ui/unterminated-nested-comment.stderr b/tests/ui/lexer/unterminated-nested-comment.stderr
index 3653e76c9cb..3653e76c9cb 100644
--- a/tests/ui/unterminated-nested-comment.stderr
+++ b/tests/ui/lexer/unterminated-nested-comment.stderr
diff --git a/tests/ui/lint/use-redundant/issue-92904.rs b/tests/ui/lint/use-redundant/issue-92904.rs
new file mode 100644
index 00000000000..511d9d263cf
--- /dev/null
+++ b/tests/ui/lint/use-redundant/issue-92904.rs
@@ -0,0 +1,17 @@
+// check-pass
+
+pub struct Foo(bar::Bar);
+
+pub mod bar {
+    pub struct Foo(pub Bar);
+    pub struct Bar(pub char);
+}
+
+pub fn warning() -> Foo {
+    use bar::*;
+    #[deny(unused_imports)]
+    use self::Foo; // no error
+    Foo(Bar('a'))
+}
+
+fn main() {}
diff --git a/tests/ui/lint/use-redundant/use-redundant-glob-parent.rs b/tests/ui/lint/use-redundant/use-redundant-glob-parent.rs
new file mode 100644
index 00000000000..6b1e018d2dc
--- /dev/null
+++ b/tests/ui/lint/use-redundant/use-redundant-glob-parent.rs
@@ -0,0 +1,16 @@
+// check-pass
+#![warn(unused_imports)]
+
+pub mod bar {
+    pub struct Foo(pub Bar);
+    pub struct Bar(pub char);
+}
+
+use bar::*;
+
+pub fn warning() -> Foo {
+    use bar::Foo; //~ WARNING imported redundantly
+    Foo(Bar('a'))
+}
+
+fn main() {}
diff --git a/tests/ui/lint/use-redundant/use-redundant-glob-parent.stderr b/tests/ui/lint/use-redundant/use-redundant-glob-parent.stderr
new file mode 100644
index 00000000000..2c3b3345270
--- /dev/null
+++ b/tests/ui/lint/use-redundant/use-redundant-glob-parent.stderr
@@ -0,0 +1,17 @@
+warning: the item `Foo` is imported redundantly
+  --> $DIR/use-redundant-glob-parent.rs:12:9
+   |
+LL | use bar::*;
+   |     ------ the item `Foo` is already imported here
+...
+LL |     use bar::Foo;
+   |         ^^^^^^^^
+   |
+note: the lint level is defined here
+  --> $DIR/use-redundant-glob-parent.rs:2:9
+   |
+LL | #![warn(unused_imports)]
+   |         ^^^^^^^^^^^^^^
+
+warning: 1 warning emitted
+
diff --git a/tests/ui/lint/use-redundant/use-redundant-glob.rs b/tests/ui/lint/use-redundant/use-redundant-glob.rs
new file mode 100644
index 00000000000..bd9e51b6f59
--- /dev/null
+++ b/tests/ui/lint/use-redundant/use-redundant-glob.rs
@@ -0,0 +1,15 @@
+// check-pass
+#![warn(unused_imports)]
+
+pub mod bar {
+    pub struct Foo(pub Bar);
+    pub struct Bar(pub char);
+}
+
+pub fn warning() -> bar::Foo {
+    use bar::*;
+    use bar::Foo; //~ WARNING imported redundantly
+    Foo(Bar('a'))
+}
+
+fn main() {}
diff --git a/tests/ui/lint/use-redundant/use-redundant-glob.stderr b/tests/ui/lint/use-redundant/use-redundant-glob.stderr
new file mode 100644
index 00000000000..d3b406d82b6
--- /dev/null
+++ b/tests/ui/lint/use-redundant/use-redundant-glob.stderr
@@ -0,0 +1,16 @@
+warning: the item `Foo` is imported redundantly
+  --> $DIR/use-redundant-glob.rs:11:9
+   |
+LL |     use bar::*;
+   |         ------ the item `Foo` is already imported here
+LL |     use bar::Foo;
+   |         ^^^^^^^^
+   |
+note: the lint level is defined here
+  --> $DIR/use-redundant-glob.rs:2:9
+   |
+LL | #![warn(unused_imports)]
+   |         ^^^^^^^^^^^^^^
+
+warning: 1 warning emitted
+
diff --git a/tests/ui/lint/use-redundant/use-redundant-multiple-namespaces.rs b/tests/ui/lint/use-redundant/use-redundant-multiple-namespaces.rs
new file mode 100644
index 00000000000..0fb60840f8a
--- /dev/null
+++ b/tests/ui/lint/use-redundant/use-redundant-multiple-namespaces.rs
@@ -0,0 +1,21 @@
+// check-pass
+#![allow(nonstandard_style)]
+
+pub mod bar {
+    pub struct Foo { pub bar: Bar }
+    pub struct Bar(pub char);
+}
+
+pub mod x {
+    use crate::bar;
+    pub const Foo: bar::Bar = bar::Bar('a');
+}
+
+pub fn warning() -> bar::Foo {
+    #![deny(unused_imports)] // no error
+    use bar::*;
+    use x::Foo;
+    Foo { bar: Foo }
+}
+
+fn main() {}
diff --git a/tests/ui/lint/use-redundant/use-redundant-not-parent.rs b/tests/ui/lint/use-redundant/use-redundant-not-parent.rs
new file mode 100644
index 00000000000..c97a3d34163
--- /dev/null
+++ b/tests/ui/lint/use-redundant/use-redundant-not-parent.rs
@@ -0,0 +1,19 @@
+// check-pass
+
+pub mod bar {
+    pub struct Foo(pub Bar);
+    pub struct Bar(pub char);
+}
+
+pub mod x {
+    pub struct Foo(pub crate::bar::Bar);
+}
+
+pub fn warning() -> x::Foo {
+    use bar::*;
+    #[deny(unused_imports)]
+    use x::Foo; // no error
+    Foo(Bar('a'))
+}
+
+fn main() {}
diff --git a/tests/ui/lint/use-redundant.rs b/tests/ui/lint/use-redundant/use-redundant.rs
index 53315dcf638..53315dcf638 100644
--- a/tests/ui/lint/use-redundant.rs
+++ b/tests/ui/lint/use-redundant/use-redundant.rs
diff --git a/tests/ui/lint/use-redundant.stderr b/tests/ui/lint/use-redundant/use-redundant.stderr
index c861a1956e1..c861a1956e1 100644
--- a/tests/ui/lint/use-redundant.stderr
+++ b/tests/ui/lint/use-redundant/use-redundant.stderr
diff --git a/tests/ui/mir/issue-109004-drop-large-array.rs b/tests/ui/mir/issue-109004-drop-large-array.rs
new file mode 100644
index 00000000000..5e3361cef6e
--- /dev/null
+++ b/tests/ui/mir/issue-109004-drop-large-array.rs
@@ -0,0 +1,16 @@
+// check-pass
+
+const SZ: usize = 64_000_000;
+type BigDrop = [String; SZ];
+
+fn f(_dropme: BigDrop) {}
+
+fn f2(_moveme: BigDrop) -> String {
+    let [a, ..] = _moveme;
+    a
+}
+
+fn main() {
+    f(std::array::from_fn(|_| String::new()));
+    f2(std::array::from_fn(|_| String::new()));
+}
diff --git a/tests/ui/nll/user-annotations/region-error-ice-109072.rs b/tests/ui/nll/user-annotations/region-error-ice-109072.rs
new file mode 100644
index 00000000000..3f2ad3ccbf5
--- /dev/null
+++ b/tests/ui/nll/user-annotations/region-error-ice-109072.rs
@@ -0,0 +1,14 @@
+// Regression test for #109072.
+// Check that we don't ICE when canonicalizing user annotation.
+
+trait Lt<'a> {
+    type T;
+}
+
+impl Lt<'missing> for () { //~ ERROR undeclared lifetime
+    type T = &'missing (); //~ ERROR undeclared lifetime
+}
+
+fn main() {
+    let _: <() as Lt<'_>>::T = &();
+}
diff --git a/tests/ui/nll/user-annotations/region-error-ice-109072.stderr b/tests/ui/nll/user-annotations/region-error-ice-109072.stderr
new file mode 100644
index 00000000000..d90971bed25
--- /dev/null
+++ b/tests/ui/nll/user-annotations/region-error-ice-109072.stderr
@@ -0,0 +1,26 @@
+error[E0261]: use of undeclared lifetime name `'missing`
+  --> $DIR/region-error-ice-109072.rs:8:9
+   |
+LL | impl Lt<'missing> for () {
+   |     -   ^^^^^^^^ undeclared lifetime
+   |     |
+   |     help: consider introducing lifetime `'missing` here: `<'missing>`
+
+error[E0261]: use of undeclared lifetime name `'missing`
+  --> $DIR/region-error-ice-109072.rs:9:15
+   |
+LL |     type T = &'missing ();
+   |               ^^^^^^^^ undeclared lifetime
+   |
+help: consider introducing lifetime `'missing` here
+   |
+LL |     type T<'missing> = &'missing ();
+   |           ++++++++++
+help: consider introducing lifetime `'missing` here
+   |
+LL | impl<'missing> Lt<'missing> for () {
+   |     ++++++++++
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0261`.
diff --git a/tests/ui/auxiliary/xc-private-method-lib.rs b/tests/ui/privacy/auxiliary/xc-private-method-lib.rs
index 4d5ec6de392..4d5ec6de392 100644
--- a/tests/ui/auxiliary/xc-private-method-lib.rs
+++ b/tests/ui/privacy/auxiliary/xc-private-method-lib.rs
diff --git a/tests/ui/xc-private-method.rs b/tests/ui/privacy/xc-private-method.rs
index f05994646b3..f05994646b3 100644
--- a/tests/ui/xc-private-method.rs
+++ b/tests/ui/privacy/xc-private-method.rs
diff --git a/tests/ui/xc-private-method.stderr b/tests/ui/privacy/xc-private-method.stderr
index 0eabc592aa4..0eabc592aa4 100644
--- a/tests/ui/xc-private-method.stderr
+++ b/tests/ui/privacy/xc-private-method.stderr
diff --git a/tests/ui/xc-private-method2.rs b/tests/ui/privacy/xc-private-method2.rs
index f11b251082b..f11b251082b 100644
--- a/tests/ui/xc-private-method2.rs
+++ b/tests/ui/privacy/xc-private-method2.rs
diff --git a/tests/ui/xc-private-method2.stderr b/tests/ui/privacy/xc-private-method2.stderr
index af0c3cfcb2c..af0c3cfcb2c 100644
--- a/tests/ui/xc-private-method2.stderr
+++ b/tests/ui/privacy/xc-private-method2.stderr
diff --git a/tests/ui/reachable-unnameable-type-alias.rs b/tests/ui/reachable/reachable-unnameable-type-alias.rs
index 461355f87cf..461355f87cf 100644
--- a/tests/ui/reachable-unnameable-type-alias.rs
+++ b/tests/ui/reachable/reachable-unnameable-type-alias.rs
diff --git a/tests/ui/disambiguate-identical-names.rs b/tests/ui/resolve/disambiguate-identical-names.rs
index 708d2cd76a1..708d2cd76a1 100644
--- a/tests/ui/disambiguate-identical-names.rs
+++ b/tests/ui/resolve/disambiguate-identical-names.rs
diff --git a/tests/ui/disambiguate-identical-names.stderr b/tests/ui/resolve/disambiguate-identical-names.stderr
index 7d8293018d2..7d8293018d2 100644
--- a/tests/ui/disambiguate-identical-names.stderr
+++ b/tests/ui/resolve/disambiguate-identical-names.stderr
diff --git a/tests/ui/rfc-2008-non-exhaustive/omitted-patterns.rs b/tests/ui/rfc-2008-non-exhaustive/omitted-patterns.rs
index d8f07bb8f24..3482af74752 100644
--- a/tests/ui/rfc-2008-non-exhaustive/omitted-patterns.rs
+++ b/tests/ui/rfc-2008-non-exhaustive/omitted-patterns.rs
@@ -184,4 +184,28 @@ fn main() {
     // OK: both unstable and stable fields are matched with feature on
     #[warn(non_exhaustive_omitted_patterns)]
     let UnstableStruct { stable, stable2, unstable, .. } = UnstableStruct::default();
+
+    // Ok: local bindings are allowed
+    #[deny(non_exhaustive_omitted_patterns)]
+    let local = NonExhaustiveEnum::Unit;
+
+    // Ok: missing patterns will be blocked by the pattern being refutable
+    #[deny(non_exhaustive_omitted_patterns)]
+    let local_refutable @ NonExhaustiveEnum::Unit = NonExhaustiveEnum::Unit;
+    //~^ refutable pattern in local binding
+
+    // Check that matching on a reference results in a correctly spanned diagnostic
+    #[deny(non_exhaustive_omitted_patterns)]
+    match &non_enum {
+        NonExhaustiveEnum::Unit => {}
+        NonExhaustiveEnum::Tuple(_) => {}
+        _ => {}
+    }
+    //~^^ some variants are not matched explicitly
+}
+
+#[deny(non_exhaustive_omitted_patterns)]
+// Ok: Pattern in a param is always wildcard
+pub fn takes_non_exhaustive(_: NonExhaustiveEnum) {
+    let _closure = |_: NonExhaustiveEnum| {};
 }
diff --git a/tests/ui/rfc-2008-non-exhaustive/omitted-patterns.stderr b/tests/ui/rfc-2008-non-exhaustive/omitted-patterns.stderr
index 996bd4a1298..520a90322c1 100644
--- a/tests/ui/rfc-2008-non-exhaustive/omitted-patterns.stderr
+++ b/tests/ui/rfc-2008-non-exhaustive/omitted-patterns.stderr
@@ -184,5 +184,34 @@ note: the lint level is defined here
 LL |     #[deny(non_exhaustive_omitted_patterns)]
    |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error: aborting due to 8 previous errors; 6 warnings emitted
+error[E0005]: refutable pattern in local binding
+  --> $DIR/omitted-patterns.rs:194:9
+   |
+LL |     let local_refutable @ NonExhaustiveEnum::Unit = NonExhaustiveEnum::Unit;
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ pattern `_` not covered
+   |
+   = note: `let` bindings require an "irrefutable pattern", like a `struct` or an `enum` with only one variant
+   = note: for more information, visit https://doc.rust-lang.org/book/ch18-02-refutability.html
+   = note: the matched value is of type `NonExhaustiveEnum`
+help: you might want to use `let else` to handle the variant that isn't matched
+   |
+LL |     let local_refutable @ NonExhaustiveEnum::Unit = NonExhaustiveEnum::Unit else { todo!() };
+   |                                                                             ++++++++++++++++
+
+error: some variants are not matched explicitly
+  --> $DIR/omitted-patterns.rs:202:9
+   |
+LL |         _ => {}
+   |         ^ pattern `NonExhaustiveEnum::Struct { .. }` not covered
+   |
+   = help: ensure that all variants are matched explicitly by adding the suggested match arms
+   = note: the matched value is of type `NonExhaustiveEnum` and the `non_exhaustive_omitted_patterns` attribute was found
+note: the lint level is defined here
+  --> $DIR/omitted-patterns.rs:198:12
+   |
+LL |     #[deny(non_exhaustive_omitted_patterns)]
+   |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to 10 previous errors; 6 warnings emitted
 
+For more information about this error, try `rustc --explain E0005`.
diff --git a/tests/ui/rustdoc/doc-primitive.rs b/tests/ui/rustdoc/doc-primitive.rs
new file mode 100644
index 00000000000..4336961e3b5
--- /dev/null
+++ b/tests/ui/rustdoc/doc-primitive.rs
@@ -0,0 +1,8 @@
+#![deny(invalid_doc_attributes)]
+
+#[doc(primitive = "foo")]
+//~^ ERROR unknown `doc` attribute `primitive`
+//~| WARN
+mod bar {}
+
+fn main() {}
diff --git a/tests/ui/rustdoc/doc-primitive.stderr b/tests/ui/rustdoc/doc-primitive.stderr
new file mode 100644
index 00000000000..d61eb381647
--- /dev/null
+++ b/tests/ui/rustdoc/doc-primitive.stderr
@@ -0,0 +1,16 @@
+error: unknown `doc` attribute `primitive`
+  --> $DIR/doc-primitive.rs:3:7
+   |
+LL | #[doc(primitive = "foo")]
+   |       ^^^^^^^^^^^^^^^^^
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #82730 <https://github.com/rust-lang/rust/issues/82730>
+note: the lint level is defined here
+  --> $DIR/doc-primitive.rs:1:9
+   |
+LL | #![deny(invalid_doc_attributes)]
+   |         ^^^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to previous error
+
diff --git a/tests/ui/rustdoc/feature-gate-doc_primitive.rs b/tests/ui/rustdoc/feature-gate-doc_primitive.rs
index 18e99e72f8b..78fcd90752e 100644
--- a/tests/ui/rustdoc/feature-gate-doc_primitive.rs
+++ b/tests/ui/rustdoc/feature-gate-doc_primitive.rs
@@ -1,7 +1,5 @@
-// check-pass
-#[doc(primitive = "usize")]
-//~^ WARNING `doc(primitive)` should never have been stable
-//~| WARNING hard error in a future release
+#[rustc_doc_primitive = "usize"]
+//~^ ERROR `rustc_doc_primitive` is a rustc internal attribute
 /// Some docs
 mod usize {}
 
diff --git a/tests/ui/rustdoc/feature-gate-doc_primitive.stderr b/tests/ui/rustdoc/feature-gate-doc_primitive.stderr
index 194b2d87db2..5920880675d 100644
--- a/tests/ui/rustdoc/feature-gate-doc_primitive.stderr
+++ b/tests/ui/rustdoc/feature-gate-doc_primitive.stderr
@@ -1,12 +1,11 @@
-warning: `doc(primitive)` should never have been stable
-  --> $DIR/feature-gate-doc_primitive.rs:2:7
+error[E0658]: `rustc_doc_primitive` is a rustc internal attribute
+  --> $DIR/feature-gate-doc_primitive.rs:1:1
    |
-LL | #[doc(primitive = "usize")]
-   |       ^^^^^^^^^^^^^^^^^^^
+LL | #[rustc_doc_primitive = "usize"]
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
-   = note: for more information, see issue #82730 <https://github.com/rust-lang/rust/issues/82730>
-   = note: `#[warn(invalid_doc_attributes)]` on by default
+   = help: add `#![feature(rustc_attrs)]` to the crate attributes to enable
 
-warning: 1 warning emitted
+error: aborting due to previous error
 
+For more information about this error, try `rustc --explain E0658`.
diff --git a/tests/ui/stats/hir-stats.stderr b/tests/ui/stats/hir-stats.stderr
index ee62d8f2d25..d723ff538a8 100644
--- a/tests/ui/stats/hir-stats.stderr
+++ b/tests/ui/stats/hir-stats.stderr
@@ -15,45 +15,45 @@ ast-stats-1 Arm                       96 ( 1.5%)             2            48
 ast-stats-1 ForeignItem               96 ( 1.5%)             1            96
 ast-stats-1 - Fn                        96 ( 1.5%)             1
 ast-stats-1 FnDecl                   120 ( 1.8%)             5            24
-ast-stats-1 FieldDef                 160 ( 2.4%)             2            80
-ast-stats-1 Stmt                     160 ( 2.4%)             5            32
+ast-stats-1 FieldDef                 160 ( 2.5%)             2            80
+ast-stats-1 Stmt                     160 ( 2.5%)             5            32
 ast-stats-1 - Local                     32 ( 0.5%)             1
 ast-stats-1 - MacCall                   32 ( 0.5%)             1
 ast-stats-1 - Expr                      96 ( 1.5%)             3
-ast-stats-1 Param                    160 ( 2.4%)             4            40
-ast-stats-1 Block                    192 ( 2.9%)             6            32
+ast-stats-1 Param                    160 ( 2.5%)             4            40
+ast-stats-1 Block                    192 ( 3.0%)             6            32
 ast-stats-1 Variant                  208 ( 3.2%)             2           104
-ast-stats-1 GenericBound             224 ( 3.4%)             4            56
-ast-stats-1 - Trait                    224 ( 3.4%)             4
-ast-stats-1 AssocItem                416 ( 6.3%)             4           104
-ast-stats-1 - Type                     208 ( 3.2%)             2
-ast-stats-1 - Fn                       208 ( 3.2%)             2
-ast-stats-1 GenericParam             480 ( 7.3%)             5            96
-ast-stats-1 Pat                      504 ( 7.7%)             7            72
+ast-stats-1 GenericBound             224 ( 3.5%)             4            56
+ast-stats-1 - Trait                    224 ( 3.5%)             4
+ast-stats-1 AssocItem                352 ( 5.4%)             4            88
+ast-stats-1 - Type                     176 ( 2.7%)             2
+ast-stats-1 - Fn                       176 ( 2.7%)             2
+ast-stats-1 GenericParam             480 ( 7.4%)             5            96
+ast-stats-1 Pat                      504 ( 7.8%)             7            72
 ast-stats-1 - Struct                    72 ( 1.1%)             1
 ast-stats-1 - Wild                      72 ( 1.1%)             1
 ast-stats-1 - Ident                    360 ( 5.5%)             5
-ast-stats-1 Expr                     576 ( 8.8%)             8            72
+ast-stats-1 Expr                     576 ( 8.9%)             8            72
 ast-stats-1 - Path                      72 ( 1.1%)             1
 ast-stats-1 - Match                     72 ( 1.1%)             1
 ast-stats-1 - Struct                    72 ( 1.1%)             1
 ast-stats-1 - Lit                      144 ( 2.2%)             2
 ast-stats-1 - Block                    216 ( 3.3%)             3
-ast-stats-1 PathSegment              720 (11.0%)            30            24
-ast-stats-1 Ty                       896 (13.7%)            14            64
+ast-stats-1 PathSegment              720 (11.1%)            30            24
+ast-stats-1 Ty                       896 (13.8%)            14            64
 ast-stats-1 - Ptr                       64 ( 1.0%)             1
 ast-stats-1 - Ref                       64 ( 1.0%)             1
 ast-stats-1 - ImplicitSelf             128 ( 2.0%)             2
-ast-stats-1 - Path                     640 ( 9.8%)            10
-ast-stats-1 Item                   1_224 (18.7%)             9           136
+ast-stats-1 - Path                     640 ( 9.9%)            10
+ast-stats-1 Item                   1_224 (18.9%)             9           136
 ast-stats-1 - Trait                    136 ( 2.1%)             1
 ast-stats-1 - Enum                     136 ( 2.1%)             1
 ast-stats-1 - ForeignMod               136 ( 2.1%)             1
 ast-stats-1 - Impl                     136 ( 2.1%)             1
 ast-stats-1 - Fn                       272 ( 4.2%)             2
-ast-stats-1 - Use                      408 ( 6.2%)             3
+ast-stats-1 - Use                      408 ( 6.3%)             3
 ast-stats-1 ----------------------------------------------------------------
-ast-stats-1 Total                  6_552
+ast-stats-1 Total                  6_488
 ast-stats-1
 ast-stats-2 POST EXPANSION AST STATS
 ast-stats-2 Name                Accumulated Size         Count     Item Size
@@ -65,32 +65,32 @@ ast-stats-2 ExprField                 48 ( 0.7%)             1            48
 ast-stats-2 WherePredicate            56 ( 0.8%)             1            56
 ast-stats-2 - BoundPredicate            56 ( 0.8%)             1
 ast-stats-2 Local                     72 ( 1.0%)             1            72
-ast-stats-2 Arm                       96 ( 1.3%)             2            48
-ast-stats-2 ForeignItem               96 ( 1.3%)             1            96
-ast-stats-2 - Fn                        96 ( 1.3%)             1
+ast-stats-2 Arm                       96 ( 1.4%)             2            48
+ast-stats-2 ForeignItem               96 ( 1.4%)             1            96
+ast-stats-2 - Fn                        96 ( 1.4%)             1
 ast-stats-2 InlineAsm                120 ( 1.7%)             1           120
 ast-stats-2 FnDecl                   120 ( 1.7%)             5            24
 ast-stats-2 Attribute                128 ( 1.8%)             4            32
-ast-stats-2 - DocComment                32 ( 0.4%)             1
-ast-stats-2 - Normal                    96 ( 1.3%)             3
-ast-stats-2 FieldDef                 160 ( 2.2%)             2            80
-ast-stats-2 Stmt                     160 ( 2.2%)             5            32
-ast-stats-2 - Local                     32 ( 0.4%)             1
-ast-stats-2 - Semi                      32 ( 0.4%)             1
-ast-stats-2 - Expr                      96 ( 1.3%)             3
-ast-stats-2 Param                    160 ( 2.2%)             4            40
+ast-stats-2 - DocComment                32 ( 0.5%)             1
+ast-stats-2 - Normal                    96 ( 1.4%)             3
+ast-stats-2 FieldDef                 160 ( 2.3%)             2            80
+ast-stats-2 Stmt                     160 ( 2.3%)             5            32
+ast-stats-2 - Local                     32 ( 0.5%)             1
+ast-stats-2 - Semi                      32 ( 0.5%)             1
+ast-stats-2 - Expr                      96 ( 1.4%)             3
+ast-stats-2 Param                    160 ( 2.3%)             4            40
 ast-stats-2 Block                    192 ( 2.7%)             6            32
 ast-stats-2 Variant                  208 ( 2.9%)             2           104
-ast-stats-2 GenericBound             224 ( 3.1%)             4            56
-ast-stats-2 - Trait                    224 ( 3.1%)             4
-ast-stats-2 AssocItem                416 ( 5.8%)             4           104
-ast-stats-2 - Type                     208 ( 2.9%)             2
-ast-stats-2 - Fn                       208 ( 2.9%)             2
-ast-stats-2 GenericParam             480 ( 6.7%)             5            96
-ast-stats-2 Pat                      504 ( 7.0%)             7            72
+ast-stats-2 GenericBound             224 ( 3.2%)             4            56
+ast-stats-2 - Trait                    224 ( 3.2%)             4
+ast-stats-2 AssocItem                352 ( 5.0%)             4            88
+ast-stats-2 - Type                     176 ( 2.5%)             2
+ast-stats-2 - Fn                       176 ( 2.5%)             2
+ast-stats-2 GenericParam             480 ( 6.8%)             5            96
+ast-stats-2 Pat                      504 ( 7.1%)             7            72
 ast-stats-2 - Struct                    72 ( 1.0%)             1
 ast-stats-2 - Wild                      72 ( 1.0%)             1
-ast-stats-2 - Ident                    360 ( 5.0%)             5
+ast-stats-2 - Ident                    360 ( 5.1%)             5
 ast-stats-2 Expr                     648 ( 9.1%)             9            72
 ast-stats-2 - Path                      72 ( 1.0%)             1
 ast-stats-2 - Match                     72 ( 1.0%)             1
@@ -98,22 +98,22 @@ ast-stats-2 - Struct                    72 ( 1.0%)             1
 ast-stats-2 - InlineAsm                 72 ( 1.0%)             1
 ast-stats-2 - Lit                      144 ( 2.0%)             2
 ast-stats-2 - Block                    216 ( 3.0%)             3
-ast-stats-2 PathSegment              792 (11.1%)            33            24
-ast-stats-2 Ty                       896 (12.5%)            14            64
+ast-stats-2 PathSegment              792 (11.2%)            33            24
+ast-stats-2 Ty                       896 (12.6%)            14            64
 ast-stats-2 - Ptr                       64 ( 0.9%)             1
 ast-stats-2 - Ref                       64 ( 0.9%)             1
 ast-stats-2 - ImplicitSelf             128 ( 1.8%)             2
-ast-stats-2 - Path                     640 ( 8.9%)            10
-ast-stats-2 Item                   1_496 (20.9%)            11           136
+ast-stats-2 - Path                     640 ( 9.0%)            10
+ast-stats-2 Item                   1_496 (21.1%)            11           136
 ast-stats-2 - Trait                    136 ( 1.9%)             1
 ast-stats-2 - Enum                     136 ( 1.9%)             1
 ast-stats-2 - ExternCrate              136 ( 1.9%)             1
 ast-stats-2 - ForeignMod               136 ( 1.9%)             1
 ast-stats-2 - Impl                     136 ( 1.9%)             1
 ast-stats-2 - Fn                       272 ( 3.8%)             2
-ast-stats-2 - Use                      544 ( 7.6%)             4
+ast-stats-2 - Use                      544 ( 7.7%)             4
 ast-stats-2 ----------------------------------------------------------------
-ast-stats-2 Total                  7_152
+ast-stats-2 Total                  7_088
 ast-stats-2
 hir-stats HIR STATS
 hir-stats Name                Accumulated Size         Count     Item Size
diff --git a/tests/ui/thread-local-mutation.rs b/tests/ui/thread-local/thread-local-mutation.rs
index e738225ce2a..e738225ce2a 100644
--- a/tests/ui/thread-local-mutation.rs
+++ b/tests/ui/thread-local/thread-local-mutation.rs
diff --git a/tests/ui/thread-local-mutation.stderr b/tests/ui/thread-local/thread-local-mutation.stderr
index e5dc0e72edf..e5dc0e72edf 100644
--- a/tests/ui/thread-local-mutation.stderr
+++ b/tests/ui/thread-local/thread-local-mutation.stderr
diff --git a/tests/ui/thread-local-static.rs b/tests/ui/thread-local/thread-local-static.rs
index c7fee9e6b4c..c7fee9e6b4c 100644
--- a/tests/ui/thread-local-static.rs
+++ b/tests/ui/thread-local/thread-local-static.rs
diff --git a/tests/ui/thread-local-static.stderr b/tests/ui/thread-local/thread-local-static.stderr
index 712050a25fc..712050a25fc 100644
--- a/tests/ui/thread-local-static.stderr
+++ b/tests/ui/thread-local/thread-local-static.stderr
diff --git a/tests/ui/wrong-mul-method-signature.rs b/tests/ui/traits/wrong-mul-method-signature.rs
index 1c2f865599e..1c2f865599e 100644
--- a/tests/ui/wrong-mul-method-signature.rs
+++ b/tests/ui/traits/wrong-mul-method-signature.rs
diff --git a/tests/ui/wrong-mul-method-signature.stderr b/tests/ui/traits/wrong-mul-method-signature.stderr
index 25a92f5ec12..25a92f5ec12 100644
--- a/tests/ui/wrong-mul-method-signature.stderr
+++ b/tests/ui/traits/wrong-mul-method-signature.stderr
diff --git a/tests/ui/tuple-index.rs b/tests/ui/tuple/tuple-index.rs
index 3e1d92b42aa..3e1d92b42aa 100644
--- a/tests/ui/tuple-index.rs
+++ b/tests/ui/tuple/tuple-index.rs
diff --git a/tests/ui/output-type-mismatch.rs b/tests/ui/typeck/output-type-mismatch.rs
index 35097aa9ec6..35097aa9ec6 100644
--- a/tests/ui/output-type-mismatch.rs
+++ b/tests/ui/typeck/output-type-mismatch.rs
diff --git a/tests/ui/output-type-mismatch.stderr b/tests/ui/typeck/output-type-mismatch.stderr
index 4507a4df621..4507a4df621 100644
--- a/tests/ui/output-type-mismatch.stderr
+++ b/tests/ui/typeck/output-type-mismatch.stderr
diff --git a/tests/ui/suppressed-error.rs b/tests/ui/typeck/suppressed-error.rs
index 1e39be46080..1e39be46080 100644
--- a/tests/ui/suppressed-error.rs
+++ b/tests/ui/typeck/suppressed-error.rs
diff --git a/tests/ui/suppressed-error.stderr b/tests/ui/typeck/suppressed-error.stderr
index 11d70f8a433..11d70f8a433 100644
--- a/tests/ui/suppressed-error.stderr
+++ b/tests/ui/typeck/suppressed-error.stderr
diff --git a/tests/ui/tag-that-dare-not-speak-its-name.rs b/tests/ui/typeck/tag-that-dare-not-speak-its-name.rs
index 0e76ec246d7..0e76ec246d7 100644
--- a/tests/ui/tag-that-dare-not-speak-its-name.rs
+++ b/tests/ui/typeck/tag-that-dare-not-speak-its-name.rs
diff --git a/tests/ui/tag-that-dare-not-speak-its-name.stderr b/tests/ui/typeck/tag-that-dare-not-speak-its-name.stderr
index f53abe53bf1..f53abe53bf1 100644
--- a/tests/ui/tag-that-dare-not-speak-its-name.stderr
+++ b/tests/ui/typeck/tag-that-dare-not-speak-its-name.stderr
diff --git a/tests/ui/terr-in-field.rs b/tests/ui/typeck/terr-in-field.rs
index cfe350ef86d..cfe350ef86d 100644
--- a/tests/ui/terr-in-field.rs
+++ b/tests/ui/typeck/terr-in-field.rs
diff --git a/tests/ui/terr-in-field.stderr b/tests/ui/typeck/terr-in-field.stderr
index 09df4b34bb5..09df4b34bb5 100644
--- a/tests/ui/terr-in-field.stderr
+++ b/tests/ui/typeck/terr-in-field.stderr
diff --git a/tests/ui/terr-sorts.rs b/tests/ui/typeck/terr-sorts.rs
index c1e2f7daee5..c1e2f7daee5 100644
--- a/tests/ui/terr-sorts.rs
+++ b/tests/ui/typeck/terr-sorts.rs
diff --git a/tests/ui/terr-sorts.stderr b/tests/ui/typeck/terr-sorts.stderr
index 8f1975374a5..8f1975374a5 100644
--- a/tests/ui/terr-sorts.stderr
+++ b/tests/ui/typeck/terr-sorts.stderr
diff --git a/tests/ui/while-type-error.rs b/tests/ui/typeck/while-type-error.rs
index 8098bfcd8d9..8098bfcd8d9 100644
--- a/tests/ui/while-type-error.rs
+++ b/tests/ui/typeck/while-type-error.rs
diff --git a/tests/ui/while-type-error.stderr b/tests/ui/typeck/while-type-error.stderr
index 529cbff0563..529cbff0563 100644
--- a/tests/ui/while-type-error.stderr
+++ b/tests/ui/typeck/while-type-error.stderr
diff --git a/tests/ui/wrong-ret-type.rs b/tests/ui/typeck/wrong-ret-type.rs
index cbff8dbae21..cbff8dbae21 100644
--- a/tests/ui/wrong-ret-type.rs
+++ b/tests/ui/typeck/wrong-ret-type.rs
diff --git a/tests/ui/wrong-ret-type.stderr b/tests/ui/typeck/wrong-ret-type.stderr
index c686a0b2f5a..c686a0b2f5a 100644
--- a/tests/ui/wrong-ret-type.stderr
+++ b/tests/ui/typeck/wrong-ret-type.stderr
diff --git a/tests/ui/ufcs-polymorphic-paths.rs b/tests/ui/ufcs/ufcs-polymorphic-paths.rs
index a14ebd6a41f..a14ebd6a41f 100644
--- a/tests/ui/ufcs-polymorphic-paths.rs
+++ b/tests/ui/ufcs/ufcs-polymorphic-paths.rs
diff --git a/tests/ui/expr-block-generic-unique1.rs b/tests/ui/unique/expr-block-generic-unique1.rs
index 14603a2c71f..14603a2c71f 100644
--- a/tests/ui/expr-block-generic-unique1.rs
+++ b/tests/ui/unique/expr-block-generic-unique1.rs
diff --git a/tests/ui/expr-block-generic-unique2.rs b/tests/ui/unique/expr-block-generic-unique2.rs
index 7879c144b10..7879c144b10 100644
--- a/tests/ui/expr-block-generic-unique2.rs
+++ b/tests/ui/unique/expr-block-generic-unique2.rs
diff --git a/tests/ui/expr-if-unique.rs b/tests/ui/unique/expr-if-unique.rs
index 86232683549..86232683549 100644
--- a/tests/ui/expr-if-unique.rs
+++ b/tests/ui/unique/expr-if-unique.rs
diff --git a/tests/ui/unique-object-noncopyable.rs b/tests/ui/unique/unique-object-noncopyable.rs
index 2c40dfc7a4b..2c40dfc7a4b 100644
--- a/tests/ui/unique-object-noncopyable.rs
+++ b/tests/ui/unique/unique-object-noncopyable.rs
diff --git a/tests/ui/unique-object-noncopyable.stderr b/tests/ui/unique/unique-object-noncopyable.stderr
index db42ed9baf1..db42ed9baf1 100644
--- a/tests/ui/unique-object-noncopyable.stderr
+++ b/tests/ui/unique/unique-object-noncopyable.stderr
diff --git a/tests/ui/unique-pinned-nocopy.rs b/tests/ui/unique/unique-pinned-nocopy.rs
index 8edaeef51e0..8edaeef51e0 100644
--- a/tests/ui/unique-pinned-nocopy.rs
+++ b/tests/ui/unique/unique-pinned-nocopy.rs
diff --git a/tests/ui/unique-pinned-nocopy.stderr b/tests/ui/unique/unique-pinned-nocopy.stderr
index de6611324ca..de6611324ca 100644
--- a/tests/ui/unique-pinned-nocopy.stderr
+++ b/tests/ui/unique/unique-pinned-nocopy.stderr
diff --git a/tests/ui/unwind-unique.rs b/tests/ui/unique/unwind-unique.rs
index 50ecf751a86..50ecf751a86 100644
--- a/tests/ui/unwind-unique.rs
+++ b/tests/ui/unique/unwind-unique.rs
diff --git a/tests/ui/mir-unpretty.rs b/tests/ui/unpretty/mir-unpretty.rs
index 30620c69fea..30620c69fea 100644
--- a/tests/ui/mir-unpretty.rs
+++ b/tests/ui/unpretty/mir-unpretty.rs
diff --git a/tests/ui/mir-unpretty.stderr b/tests/ui/unpretty/mir-unpretty.stderr
index 3808f8583b8..3808f8583b8 100644
--- a/tests/ui/mir-unpretty.stderr
+++ b/tests/ui/unpretty/mir-unpretty.stderr
diff --git a/tests/ui/unpretty-expr-fn-arg.rs b/tests/ui/unpretty/unpretty-expr-fn-arg.rs
index 6e1132a3372..6e1132a3372 100644
--- a/tests/ui/unpretty-expr-fn-arg.rs
+++ b/tests/ui/unpretty/unpretty-expr-fn-arg.rs
diff --git a/tests/ui/unpretty-expr-fn-arg.stdout b/tests/ui/unpretty/unpretty-expr-fn-arg.stdout
index b745b988631..b745b988631 100644
--- a/tests/ui/unpretty-expr-fn-arg.stdout
+++ b/tests/ui/unpretty/unpretty-expr-fn-arg.stdout
diff --git a/tests/ui/foreign-unsafe-fn-called.mir.stderr b/tests/ui/unsafe/foreign-unsafe-fn-called.mir.stderr
index d3cf5d84fdd..d3cf5d84fdd 100644
--- a/tests/ui/foreign-unsafe-fn-called.mir.stderr
+++ b/tests/ui/unsafe/foreign-unsafe-fn-called.mir.stderr
diff --git a/tests/ui/foreign-unsafe-fn-called.rs b/tests/ui/unsafe/foreign-unsafe-fn-called.rs
index 67302ea1bcd..67302ea1bcd 100644
--- a/tests/ui/foreign-unsafe-fn-called.rs
+++ b/tests/ui/unsafe/foreign-unsafe-fn-called.rs
diff --git a/tests/ui/foreign-unsafe-fn-called.thir.stderr b/tests/ui/unsafe/foreign-unsafe-fn-called.thir.stderr
index 00ba0f7a6a3..00ba0f7a6a3 100644
--- a/tests/ui/foreign-unsafe-fn-called.thir.stderr
+++ b/tests/ui/unsafe/foreign-unsafe-fn-called.thir.stderr
diff --git a/tests/ui/new-unsafe-pointers.rs b/tests/ui/unsafe/new-unsafe-pointers.rs
index d99eb4cbd1c..d99eb4cbd1c 100644
--- a/tests/ui/new-unsafe-pointers.rs
+++ b/tests/ui/unsafe/new-unsafe-pointers.rs
diff --git a/tests/ui/unsafe-fn-called-from-unsafe-blk.rs b/tests/ui/unsafe/unsafe-fn-called-from-unsafe-blk.rs
index 3713a7065f5..3713a7065f5 100644
--- a/tests/ui/unsafe-fn-called-from-unsafe-blk.rs
+++ b/tests/ui/unsafe/unsafe-fn-called-from-unsafe-blk.rs
diff --git a/tests/ui/unsafe-fn-called-from-unsafe-fn.rs b/tests/ui/unsafe/unsafe-fn-called-from-unsafe-fn.rs
index 5e953107686..5e953107686 100644
--- a/tests/ui/unsafe-fn-called-from-unsafe-fn.rs
+++ b/tests/ui/unsafe/unsafe-fn-called-from-unsafe-fn.rs
diff --git a/tests/ui/unsafe-pointer-assignability.rs b/tests/ui/unsafe/unsafe-pointer-assignability.rs
index db822bb6a02..db822bb6a02 100644
--- a/tests/ui/unsafe-pointer-assignability.rs
+++ b/tests/ui/unsafe/unsafe-pointer-assignability.rs
diff --git a/tests/ui/variance-intersection-of-ref-and-opt-ref.rs b/tests/ui/variance/variance-intersection-of-ref-and-opt-ref.rs
index 74707a98d32..74707a98d32 100644
--- a/tests/ui/variance-intersection-of-ref-and-opt-ref.rs
+++ b/tests/ui/variance/variance-intersection-of-ref-and-opt-ref.rs
diff --git a/tests/ui/variance-iterators-in-libcore.rs b/tests/ui/variance/variance-iterators-in-libcore.rs
index a542e44d517..a542e44d517 100644
--- a/tests/ui/variance-iterators-in-libcore.rs
+++ b/tests/ui/variance/variance-iterators-in-libcore.rs
diff --git a/tests/ui/wasm-custom-section-relocations.rs b/tests/ui/wasm/wasm-custom-section-relocations.rs
index c3cca3a35ac..c3cca3a35ac 100644
--- a/tests/ui/wasm-custom-section-relocations.rs
+++ b/tests/ui/wasm/wasm-custom-section-relocations.rs
diff --git a/tests/ui/wasm-custom-section-relocations.stderr b/tests/ui/wasm/wasm-custom-section-relocations.stderr
index a37edc51d19..a37edc51d19 100644
--- a/tests/ui/wasm-custom-section-relocations.stderr
+++ b/tests/ui/wasm/wasm-custom-section-relocations.stderr