Skip to content

Commit 8a39619

Browse files
committed
Use the new abi-cafe-rules.toml support
1 parent 3e59f14 commit 8a39619

File tree

4 files changed

+43
-69
lines changed

4 files changed

+43
-69
lines changed

build_system/abi_cafe.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ pub(crate) fn run(
4646
let mut cmd = ABI_CAFE.run(bootstrap_host_compiler, dirs);
4747
cmd.arg("--");
4848

49+
cmd.arg("--rules").arg(dirs.source_dir.join("scripts/abi-cafe-rules.toml"));
50+
4951
// stdcall, vectorcall and such don't work yet
5052
cmd.arg("--conventions").arg("c").arg("--conventions").arg("rust");
5153

patches/0002-abi-cafe-Disable-broken-tests.patch

Lines changed: 0 additions & 69 deletions
This file was deleted.
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
From 236df390f3bc4ed69c26f4d51d584bea246da886 Mon Sep 17 00:00:00 2001
2+
From: bjorn3 <[email protected]>
3+
Date: Tue, 9 Jul 2024 11:25:14 +0000
4+
Subject: [PATCH] Enable debuginfo
5+
6+
---
7+
src/toolchains/rust.rs | 1 +
8+
1 file changed, 1 insertions(+)
9+
10+
diff --git a/src/toolchains/rust.rs b/src/toolchains/rust.rs
11+
index 0c50f7a..bfde2b1 100644
12+
--- a/src/toolchains/rust.rs
13+
+++ b/src/toolchains/rust.rs
14+
@@ -83,6 +83,7 @@ impl Toolchain for RustcToolchain {
15+
.arg(out_dir)
16+
.arg("--target")
17+
.arg(&self.platform_info.target)
18+
+ .arg("-g")
19+
.arg(format!("-Cmetadata={lib_name}"))
20+
.arg(src_path);
21+
if let Some(codegen_backend) = &self.codegen_backend {
22+
--
23+
2.34.1
24+

scripts/abi-cafe-rules.toml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
[target.'cfg(all(target_arch = "aarch64", target_os = "linux"))']
2+
'F32Array::conv_c'.busted = "check"
3+
4+
[target.'cfg(all(target_arch = "aarch64", target_os = "macos"))']
5+
'SingleVariantUnion::conv_c::repr_c'.busted = "check"
6+
'OptionU128::conv_rust::repr_c::rustc_caller'.busted = "run"
7+
'OptionU128::conv_rust::repr_c::cgclif_caller'.busted = "check"
8+
9+
[target.'cfg(all(target_arch = "x86_64", windows))']
10+
'simple::conv_rust'.busted = "check"
11+
'simple::conv_rust::rustc_caller'.busted = "run"
12+
13+
[target.'*'.'f16']
14+
run = "skip"
15+
16+
[target.'*'.'f128']
17+
run = "skip"

0 commit comments

Comments
 (0)