From 8c8d0db02deccea377e179948b8b3bfdd4b92e44 Mon Sep 17 00:00:00 2001
From: Oneirical <manchot@videotron.ca>
Date: Tue, 28 May 2024 11:35:33 -0400
Subject: [PATCH] rewrite and rename issue-37893 to rmake

---
 src/tools/tidy/src/allowed_run_make_makefiles.txt |  2 --
 tests/run-make/issue-37893/Makefile               |  5 -----
 .../{issue-37893 => proc-macro-init-order}/a.rs   |  0
 .../{issue-37893 => proc-macro-init-order}/b.rs   |  0
 .../{issue-37893 => proc-macro-init-order}/c.rs   |  0
 tests/run-make/proc-macro-init-order/rmake.rs     | 15 +++++++++++++++
 tests/ui/errors/pic-linker.rs                     |  2 +-
 tests/ui/imports/auxiliary/simple-dylib.rs        |  2 +-
 tests/ui/imports/simple-dylib-import.rs           |  2 +-
 9 files changed, 18 insertions(+), 10 deletions(-)
 delete mode 100644 tests/run-make/issue-37893/Makefile
 rename tests/run-make/{issue-37893 => proc-macro-init-order}/a.rs (100%)
 rename tests/run-make/{issue-37893 => proc-macro-init-order}/b.rs (100%)
 rename tests/run-make/{issue-37893 => proc-macro-init-order}/c.rs (100%)
 create mode 100644 tests/run-make/proc-macro-init-order/rmake.rs

diff --git a/src/tools/tidy/src/allowed_run_make_makefiles.txt b/src/tools/tidy/src/allowed_run_make_makefiles.txt
index 1639286e902..c47361ebc05 100644
--- a/src/tools/tidy/src/allowed_run_make_makefiles.txt
+++ b/src/tools/tidy/src/allowed_run_make_makefiles.txt
@@ -72,7 +72,6 @@ run-make/forced-unwind-terminate-pof/Makefile
 run-make/foreign-double-unwind/Makefile
 run-make/foreign-exceptions/Makefile
 run-make/foreign-rust-exceptions/Makefile
-run-make/fpic/Makefile
 run-make/glibc-staticlib-args/Makefile
 run-make/inaccessible-temp-dir/Makefile
 run-make/include_bytes_deps/Makefile
@@ -103,7 +102,6 @@ run-make/issue-33329/Makefile
 run-make/issue-35164/Makefile
 run-make/issue-36710/Makefile
 run-make/issue-37839/Makefile
-run-make/issue-37893/Makefile
 run-make/issue-40535/Makefile
 run-make/issue-47384/Makefile
 run-make/issue-47551/Makefile
diff --git a/tests/run-make/issue-37893/Makefile b/tests/run-make/issue-37893/Makefile
deleted file mode 100644
index 44e4a321a30..00000000000
--- a/tests/run-make/issue-37893/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# ignore-cross-compile
-include ../tools.mk
-
-all:
-	$(RUSTC) a.rs && $(RUSTC) b.rs && $(RUSTC) c.rs
diff --git a/tests/run-make/issue-37893/a.rs b/tests/run-make/proc-macro-init-order/a.rs
similarity index 100%
rename from tests/run-make/issue-37893/a.rs
rename to tests/run-make/proc-macro-init-order/a.rs
diff --git a/tests/run-make/issue-37893/b.rs b/tests/run-make/proc-macro-init-order/b.rs
similarity index 100%
rename from tests/run-make/issue-37893/b.rs
rename to tests/run-make/proc-macro-init-order/b.rs
diff --git a/tests/run-make/issue-37893/c.rs b/tests/run-make/proc-macro-init-order/c.rs
similarity index 100%
rename from tests/run-make/issue-37893/c.rs
rename to tests/run-make/proc-macro-init-order/c.rs
diff --git a/tests/run-make/proc-macro-init-order/rmake.rs b/tests/run-make/proc-macro-init-order/rmake.rs
new file mode 100644
index 00000000000..3c3fc813381
--- /dev/null
+++ b/tests/run-make/proc-macro-init-order/rmake.rs
@@ -0,0 +1,15 @@
+// a.rs is a procedural macro crate, on which b.rs and c.rs depend. A now
+// patched bug caused a compilation failure if the proc-macro crate was
+// initialized with its dependents in this exact order. This test checks
+// that compilation succeeds even when initialization is done in this order.
+// See https://github.com/rust-lang/rust/issues/37893
+
+//@ ignore-cross-compile
+
+use run_make_support::rustc;
+
+fn main() {
+    rustc().input("a.rs").run();
+    rustc().input("b.rs").run();
+    rustc().input("c.rs").run();
+}
diff --git a/tests/ui/errors/pic-linker.rs b/tests/ui/errors/pic-linker.rs
index 9fea42484ed..d9098990304 100644
--- a/tests/ui/errors/pic-linker.rs
+++ b/tests/ui/errors/pic-linker.rs
@@ -6,7 +6,7 @@
 //@ ignore-macos
 //@ ignore-cross-compile
 
-//@ compile-flags -Clink-args=-Wl,-z,text
+//@ compile-flags: -Clink-args=-Wl,-z,text
 //@ run-pass
 
 fn main() {}
diff --git a/tests/ui/imports/auxiliary/simple-dylib.rs b/tests/ui/imports/auxiliary/simple-dylib.rs
index 1b5d85104ca..af64aa66f31 100644
--- a/tests/ui/imports/auxiliary/simple-dylib.rs
+++ b/tests/ui/imports/auxiliary/simple-dylib.rs
@@ -1,4 +1,4 @@
-//@ compile-flags --crate-type=dylib -Cprefer-dynamic
+//@ compile-flags: -Cprefer-dynamic
 
 #![crate_type = "dylib"]
 pub fn bar() {}
diff --git a/tests/ui/imports/simple-dylib-import.rs b/tests/ui/imports/simple-dylib-import.rs
index 7c7f3afec93..d8ee3496b90 100644
--- a/tests/ui/imports/simple-dylib-import.rs
+++ b/tests/ui/imports/simple-dylib-import.rs
@@ -2,7 +2,7 @@
 // on the dynamic library simple-dylib.rs. If the test passes,
 // dylibs can be built and linked into another file successfully..
 
-//@ aux-crate: simple-dylib.rs
+//@ aux-crate:bar=simple-dylib.rs
 //@ run-pass
 
 extern crate bar;