From 6f8c064f427a8150d28af7ab5a146eb9ced0cbb2 Mon Sep 17 00:00:00 2001 From: Havard Eidnes Date: Wed, 5 Jul 2023 09:47:22 +0000 Subject: [PATCH 1/2] Use correct ABI on NetBSD/riscv64, and add target entry for same. --- src/lib.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/lib.rs b/src/lib.rs index 428b6f9c..26ac6cf6 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1975,6 +1975,9 @@ impl Build { } else if target.contains("freebsd") && arch.starts_with("64") { cmd.args.push(("-march=rv64gc").into()); cmd.args.push("-mabi=lp64d".into()); + } else if target.contains("netbsd") && arch.starts_with("64") { + cmd.args.push(("-march=rv64gc").into()); + cmd.args.push("-mabi=lp64d".into()); } else if target.contains("openbsd") && arch.starts_with("64") { cmd.args.push(("-march=rv64gc").into()); cmd.args.push("-mabi=lp64d".into()); @@ -3004,6 +3007,7 @@ impl Build { "riscv32gc-unknown-linux-gnu" => Some("riscv32-linux-gnu"), "riscv64gc-unknown-linux-musl" => Some("riscv64-linux-musl"), "riscv32gc-unknown-linux-musl" => Some("riscv32-linux-musl"), + "riscv64gc-unknown-netbsd" => Some("riscv64--netbsd"), "s390x-unknown-linux-gnu" => Some("s390x-linux-gnu"), "sparc-unknown-linux-gnu" => Some("sparc-linux-gnu"), "sparc64-unknown-linux-gnu" => Some("sparc64-linux-gnu"), From bb36e5ec40e0096d81911e39d92de53f446fd1ea Mon Sep 17 00:00:00 2001 From: Havard Eidnes Date: Thu, 20 Jul 2023 11:49:16 +0000 Subject: [PATCH 2/2] lib.rs: do as "cargo fmt" suggests. --- src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib.rs b/src/lib.rs index 26ac6cf6..652306f4 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1975,7 +1975,7 @@ impl Build { } else if target.contains("freebsd") && arch.starts_with("64") { cmd.args.push(("-march=rv64gc").into()); cmd.args.push("-mabi=lp64d".into()); - } else if target.contains("netbsd") && arch.starts_with("64") { + } else if target.contains("netbsd") && arch.starts_with("64") { cmd.args.push(("-march=rv64gc").into()); cmd.args.push("-mabi=lp64d".into()); } else if target.contains("openbsd") && arch.starts_with("64") {