From 3e59f14fb286859e01f467e17aa3fb251802e670 Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Sun, 15 Jun 2025 11:19:04 +0000
Subject: [PATCH 1/2] Update to abi-cafe 1.0

---
 build_system/abi_cafe.rs                      |  4 +-
 .../0002-abi-cafe-Disable-broken-tests.patch  | 68 +++++++++----------
 2 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/build_system/abi_cafe.rs b/build_system/abi_cafe.rs
index 674acfbd3..bee59b2b9 100644
--- a/build_system/abi_cafe.rs
+++ b/build_system/abi_cafe.rs
@@ -6,8 +6,8 @@ use crate::{CodegenBackend, SysrootKind, build_sysroot};
 static ABI_CAFE_REPO: GitRepo = GitRepo::github(
     "Gankra",
     "abi-cafe",
-    "f1220cfd13b57f5c0082c26529163865ee25e115",
-    "fe93a9acd461425d",
+    "49efdca14e9d48c34e50552d1f620615a87637bb",
+    "21fed1b4ca4cd439",
     "abi-cafe",
 );
 
diff --git a/patches/0002-abi-cafe-Disable-broken-tests.patch b/patches/0002-abi-cafe-Disable-broken-tests.patch
index 01b6a990b..708bef0ed 100644
--- a/patches/0002-abi-cafe-Disable-broken-tests.patch
+++ b/patches/0002-abi-cafe-Disable-broken-tests.patch
@@ -4,7 +4,7 @@ Date: Tue, 9 Jul 2024 11:25:14 +0000
 Subject: [PATCH] Disable broken tests
 
 ---
- src/report.rs | 36 ++++++++++++++++++++++++++++++++++++
+ src/harness/report.rs | 36 ++++++++++++++++++++++++++++++++++++
  1 file changed, 36 insertions(+)
 
 diff --git a/src/toolchains/rust.rs b/src/toolchains/rust.rs
@@ -14,56 +14,56 @@ index 0c50f7a..bfde2b1 100644
 @@ -83,6 +83,7 @@ impl Toolchain for RustcToolchain {
              .arg(out_dir)
              .arg("--target")
-             .arg(built_info::TARGET)
+             .arg(&self.platform_info.target)
 +            .arg("-g")
              .arg(format!("-Cmetadata={lib_name}"))
              .arg(src_path);
          if let Some(codegen_backend) = &self.codegen_backend {
-diff --git a/src/report.rs b/src/report.rs
+diff --git a/src/harness/report.rs b/src/harness/report.rs
 index 958ab43..dcf1044 100644
---- a/src/report.rs
-+++ b/src/report.rs
+--- a/src/harness/report.rs
++++ b/src/harness/report.rs
 @@ -48,6 +48,40 @@ pub fn get_test_rules(test: &TestKey, caller: &dyn Toolchain, callee: &dyn Toolc
-     //
-     // THIS AREA RESERVED FOR VENDORS TO APPLY PATCHES
+         //
+         // THIS AREA RESERVED FOR VENDORS TO APPLY PATCHES
  
-+    if cfg!(all(target_arch = "aarch64", target_os = "linux")) {
-+        if test.test == "F32Array" && test.options.convention == CallingConvention::C {
-+            result.check = Busted(Check);
++        if cfg!(all(target_arch = "aarch64", target_os = "linux")) {
++            if key.test == "F32Array" && key.options.convention == CallingConvention::C {
++                result.check = Busted(Check);
++            }
 +        }
-+    }
 +
-+    if cfg!(all(target_arch = "aarch64", target_os = "macos")) {
-+        if test.test == "SingleVariantUnion" && test.options.convention == CallingConvention::C && test.options.repr == LangRepr::C {
-+            result.check = Busted(Check);
-+        }
++        if cfg!(all(target_arch = "aarch64", target_os = "macos")) {
++            if key.test == "SingleVariantUnion" && key.options.convention == CallingConvention::C && key.options.repr == LangRepr::C {
++                result.check = Busted(Check);
++            }
 +
-+        if test.test == "OptionU128" && test.caller == "rustc" && test.options.convention == CallingConvention::Rust && test.options.repr == LangRepr::C {
-+            result.check = Busted(Run);
-+        }
++            if key.test == "OptionU128" && key.caller == "rustc" && key.options.convention == CallingConvention::Rust && key.options.repr == LangRepr::C {
++                result.check = Busted(Run);
++            }
 +
-+        if test.test == "OptionU128" && test.caller == "cgclif" && test.options.convention == CallingConvention::Rust && test.options.repr == LangRepr::C {
-+            result.check = Busted(Check);
++            if key.test == "OptionU128" && key.caller == "cgclif" && key.options.convention == CallingConvention::Rust && key.options.repr == LangRepr::C {
++                result.check = Busted(Check);
++            }
 +        }
-+    }
 +
-+    if cfg!(all(target_arch = "x86_64", windows)) {
-+        if test.test == "simple" && test.options.convention == CallingConvention::Rust {
-+            result.check = Busted(Check);
-+        }
++        if cfg!(all(target_arch = "x86_64", windows)) {
++            if key.test == "simple" && key.options.convention == CallingConvention::Rust {
++                result.check = Busted(Check);
++            }
 +
-+        if test.test == "simple" && test.options.convention == CallingConvention::Rust && test.caller == "rustc" {
-+            result.check = Busted(Run);
++            if key.test == "simple" && key.options.convention == CallingConvention::Rust && key.caller == "rustc" {
++                result.check = Busted(Run);
++            }
 +        }
-+    }
 +
-+    if test.test == "f16" || test.test == "f128" {
-+        result.run = Skip;
-+    }
++        if key.test == "f16" || key.test == "f128" {
++            result.run = Skip;
++        }
 +
-     // END OF VENDOR RESERVED AREA
-     //
-     //
+         // END OF VENDOR RESERVED AREA
+         //
+         //
 -- 
 2.34.1
 

From 8a396193432f4a9cb25ab76f6fdeefe08484edf8 Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Sun, 15 Jun 2025 12:09:50 +0000
Subject: [PATCH 2/2] Use the new abi-cafe-rules.toml support

---
 build_system/abi_cafe.rs                      |  2 +
 .../0002-abi-cafe-Disable-broken-tests.patch  | 69 -------------------
 patches/0002-abi-cafe-Enable-debuginfo.patch  | 24 +++++++
 scripts/abi-cafe-rules.toml                   | 17 +++++
 4 files changed, 43 insertions(+), 69 deletions(-)
 delete mode 100644 patches/0002-abi-cafe-Disable-broken-tests.patch
 create mode 100644 patches/0002-abi-cafe-Enable-debuginfo.patch
 create mode 100644 scripts/abi-cafe-rules.toml

diff --git a/build_system/abi_cafe.rs b/build_system/abi_cafe.rs
index bee59b2b9..8f8884d2a 100644
--- a/build_system/abi_cafe.rs
+++ b/build_system/abi_cafe.rs
@@ -46,6 +46,8 @@ pub(crate) fn run(
     let mut cmd = ABI_CAFE.run(bootstrap_host_compiler, dirs);
     cmd.arg("--");
 
+    cmd.arg("--rules").arg(dirs.source_dir.join("scripts/abi-cafe-rules.toml"));
+
     // stdcall, vectorcall and such don't work yet
     cmd.arg("--conventions").arg("c").arg("--conventions").arg("rust");
 
diff --git a/patches/0002-abi-cafe-Disable-broken-tests.patch b/patches/0002-abi-cafe-Disable-broken-tests.patch
deleted file mode 100644
index 708bef0ed..000000000
--- a/patches/0002-abi-cafe-Disable-broken-tests.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 236df390f3bc4ed69c26f4d51d584bea246da886 Mon Sep 17 00:00:00 2001
-From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
-Date: Tue, 9 Jul 2024 11:25:14 +0000
-Subject: [PATCH] Disable broken tests
-
----
- src/harness/report.rs | 36 ++++++++++++++++++++++++++++++++++++
- 1 file changed, 36 insertions(+)
-
-diff --git a/src/toolchains/rust.rs b/src/toolchains/rust.rs
-index 0c50f7a..bfde2b1 100644
---- a/src/toolchains/rust.rs
-+++ b/src/toolchains/rust.rs
-@@ -83,6 +83,7 @@ impl Toolchain for RustcToolchain {
-             .arg(out_dir)
-             .arg("--target")
-             .arg(&self.platform_info.target)
-+            .arg("-g")
-             .arg(format!("-Cmetadata={lib_name}"))
-             .arg(src_path);
-         if let Some(codegen_backend) = &self.codegen_backend {
-diff --git a/src/harness/report.rs b/src/harness/report.rs
-index 958ab43..dcf1044 100644
---- a/src/harness/report.rs
-+++ b/src/harness/report.rs
-@@ -48,6 +48,40 @@ pub fn get_test_rules(test: &TestKey, caller: &dyn Toolchain, callee: &dyn Toolc
-         //
-         // THIS AREA RESERVED FOR VENDORS TO APPLY PATCHES
- 
-+        if cfg!(all(target_arch = "aarch64", target_os = "linux")) {
-+            if key.test == "F32Array" && key.options.convention == CallingConvention::C {
-+                result.check = Busted(Check);
-+            }
-+        }
-+
-+        if cfg!(all(target_arch = "aarch64", target_os = "macos")) {
-+            if key.test == "SingleVariantUnion" && key.options.convention == CallingConvention::C && key.options.repr == LangRepr::C {
-+                result.check = Busted(Check);
-+            }
-+
-+            if key.test == "OptionU128" && key.caller == "rustc" && key.options.convention == CallingConvention::Rust && key.options.repr == LangRepr::C {
-+                result.check = Busted(Run);
-+            }
-+
-+            if key.test == "OptionU128" && key.caller == "cgclif" && key.options.convention == CallingConvention::Rust && key.options.repr == LangRepr::C {
-+                result.check = Busted(Check);
-+            }
-+        }
-+
-+        if cfg!(all(target_arch = "x86_64", windows)) {
-+            if key.test == "simple" && key.options.convention == CallingConvention::Rust {
-+                result.check = Busted(Check);
-+            }
-+
-+            if key.test == "simple" && key.options.convention == CallingConvention::Rust && key.caller == "rustc" {
-+                result.check = Busted(Run);
-+            }
-+        }
-+
-+        if key.test == "f16" || key.test == "f128" {
-+            result.run = Skip;
-+        }
-+
-         // END OF VENDOR RESERVED AREA
-         //
-         //
--- 
-2.34.1
-
diff --git a/patches/0002-abi-cafe-Enable-debuginfo.patch b/patches/0002-abi-cafe-Enable-debuginfo.patch
new file mode 100644
index 000000000..6f5c588f2
--- /dev/null
+++ b/patches/0002-abi-cafe-Enable-debuginfo.patch
@@ -0,0 +1,24 @@
+From 236df390f3bc4ed69c26f4d51d584bea246da886 Mon Sep 17 00:00:00 2001
+From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
+Date: Tue, 9 Jul 2024 11:25:14 +0000
+Subject: [PATCH] Enable debuginfo
+
+---
+ src/toolchains/rust.rs | 1 +
+ 1 file changed, 1 insertions(+)
+
+diff --git a/src/toolchains/rust.rs b/src/toolchains/rust.rs
+index 0c50f7a..bfde2b1 100644
+--- a/src/toolchains/rust.rs
++++ b/src/toolchains/rust.rs
+@@ -83,6 +83,7 @@ impl Toolchain for RustcToolchain {
+             .arg(out_dir)
+             .arg("--target")
+             .arg(&self.platform_info.target)
++            .arg("-g")
+             .arg(format!("-Cmetadata={lib_name}"))
+             .arg(src_path);
+         if let Some(codegen_backend) = &self.codegen_backend {
+-- 
+2.34.1
+
diff --git a/scripts/abi-cafe-rules.toml b/scripts/abi-cafe-rules.toml
new file mode 100644
index 000000000..54f9445c8
--- /dev/null
+++ b/scripts/abi-cafe-rules.toml
@@ -0,0 +1,17 @@
+[target.'cfg(all(target_arch = "aarch64", target_os = "linux"))']
+'F32Array::conv_c'.busted = "check"
+
+[target.'cfg(all(target_arch = "aarch64", target_os = "macos"))']
+'SingleVariantUnion::conv_c::repr_c'.busted = "check"
+'OptionU128::conv_rust::repr_c::rustc_caller'.busted = "run"
+'OptionU128::conv_rust::repr_c::cgclif_caller'.busted = "check"
+
+[target.'cfg(all(target_arch = "x86_64", windows))']
+'simple::conv_rust'.busted = "check"
+'simple::conv_rust::rustc_caller'.busted = "run"
+
+[target.'*'.'f16']
+run = "skip"
+
+[target.'*'.'f128']
+run = "skip"