Update to abi-cafe 1.0

2 files changed, 36 insertions, 36 deletions

diff --git a/build_system/abi_cafe.rs b/build_system/abi_cafe.rs
index 674acfbd309..bee59b2b956 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 01b6a990b72..708bef0edcf 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