cbindgen: Fix build on riscv32
PATCH v2 1/2 cbindgen: Fix build on riscv32
Signed-off-by Khem Raj <[email protected]>
---
v2: Patch libc instead of rustix
...l-codes-on-riscv32gc-unknown-linux-g.patch | 38 +++++++++++++++++++ .../cbindgen/cbindgen_0.28.0.bb | 3 +- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-devtools/cbindgen/cbindgen/0001-Define-more-ioctl-codes-on-riscv32gc-unknown-linux-g.patch
meta-oe/recipes-devtools/cbindgen/cbindgen/0001-Define-more-ioctl-codes-on-riscv32gc-unknown-linux-g.patch new file +38 -0
@@ -0,0 +1,38 @@ +From 6ab6af57cbd3b3b0cd4ba04f7f65693e1ca69870 Mon Sep 17 00:00:00 2001 +From: Dan Gohman <[email protected]> +Date: Sun, 6 Apr 2025 05:22:49 -0700 +Subject: [PATCH] Define more ioctl codes on riscv32gc-unknown-linux-gnu + +Define ioctl codes including `FICLONE` and `FS_IOC32_GETVERSION` on +riscv32gc-unknown-linux-gnu. + +Upstream-Status: Submitted [https://github.com/rust-lang/libc/pull/4382] +Signed-off-by: Khem Raj <[email protected]> +--- + src/unix/linux_like/linux/arch/generic/mod.rs | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/unix/linux_like/linux/arch/generic/mod.rs b/src/unix/linux_like/linux/arch/generic/mod.rs +index 2f437e1..db1f1e7 100644 +--- a/src/unix/linux_like/linux/arch/generic/mod.rs ++++ b/src/unix/linux_like/linux/arch/generic/mod.rs +@@ -114,6 +114,7 @@ cfg_if! { + target_arch = "x86_64", + target_arch = "arm", + target_arch = "aarch64", ++ target_arch = "riscv32", + target_arch = "riscv64", + target_arch = "s390x", + target_arch = "csky", +@@ -218,7 +219,10 @@ cfg_if! { + // where S stands for size (int, long, struct...) + // where T stands for type ('f','v','X'...) + // where N stands for NR (NumbeR) +- if #[cfg(any(target_arch = "x86", target_arch = "arm", target_arch = "csky"))] { ++ if #[cfg(any(target_arch = "x86", ++ target_arch = "arm", ++ target_arch = "riscv32", ++ target_arch = "csky"))] { + pub const FS_IOC_GETFLAGS: ::Ioctl = 0x80046601; + pub const FS_IOC_SETFLAGS: ::Ioctl = 0x40046602; + pub const FS_IOC_GETVERSION: ::Ioctl = 0x80047601;
meta-oe/recipes-devtools/cbindgen/cbindgen_0.28.0.bb +2 -1
@@ -3,7 +3,8 @@ HOMEPAGE = "https://github.com/mozilla/cbindgen" LICENSE = "MPL-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=9741c346eef56131163e13b9db1241b3" -SRC_URI += "git://github.com/mozilla/cbindgen.git;protocol=https;branch=master" +SRC_URI += "git://github.com/mozilla/cbindgen.git;protocol=https;branch=master \ + file://0001-Define-more-ioctl-codes-on-riscv32gc-unknown-linux-g.patch;patchdir=${CARGO_VENDORING_DIRECTORY}/libc-0.2.155" SRCREV = "bd78bbe59b10eda6ef1255e4acda95c56c6d0279" S = "${WORKDIR}/git"
PATCH v2 2/2 thin-provisioning-tools: Fix build on riscv32
Rustix crate needs libc crate to be patched
Fix build on 32-bit hosts without 64bit atomics
Use portable-atomic crate for 64bit atomics, helps 32bit arches without 64bit atomic intrinsics.
Signed-off-by Khem Raj <[email protected]>
---
v2: Patch libc instead of rustix
.../thin-provisioning-tools-crates.inc | 4 +- ...l-codes-on-riscv32gc-unknown-linux-g.patch | 38 ++++++++ .../0001-Use-portable-atomics-crate.patch | 86 +++++++++++++++++++ .../thin-provisioning-tools_1.1.0.bb | 2 + 4 files changed, 128 insertions(+), 2 deletions(-) create mode 100644 meta-oe/dynamic-layers/clang-layer/recipes-support/thin-provisioning-tools/thin-provisioning-tools/0001-Define-more-ioctl-codes-on-riscv32gc-unknown-linux-g.patch create mode 100644 meta-oe/dynamic-layers/clang-layer/recipes-support/thin-provisioning-tools/thin-provisioning-tools/0001-Use-portable-atomics-crate.patch
meta-oe/dynamic-layers/clang-layer/recipes-support/thin-provisioning-tools/thin-provisioning-tools-crates.inc +2 -2
@@ -78,7 +78,7 @@ SRC_URI += " \ crate://crates.io/once_cell/1.19.0 \ crate://crates.io/os_pipe/1.2.1 \ crate://crates.io/pkg-config/0.3.30 \ - crate://crates.io/portable-atomic/1.7.0 \ + crate://crates.io/portable-atomic/1.11.0 \ crate://crates.io/ppv-lite86/0.2.20 \ crate://crates.io/predicates/3.1.2 \ crate://crates.io/predicates-core/1.0.8 \
@@ -218,7 +218,7 @@ SRC_URI[numtoa-0.1.0.sha256sum] = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26 SRC_URI[once_cell-1.19.0.sha256sum] = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" SRC_URI[os_pipe-1.2.1.sha256sum] = "5ffd2b0a5634335b135d5728d84c5e0fd726954b87111f7506a61c502280d982" SRC_URI[pkg-config-0.3.30.sha256sum] = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" -SRC_URI[portable-atomic-1.7.0.sha256sum] = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" +SRC_URI[portable-atomic-1.11.0.sha256sum] = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e" SRC_URI[ppv-lite86-0.2.20.sha256sum] = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" SRC_URI[predicates-3.1.2.sha256sum] = "7e9086cc7640c29a356d1a29fd134380bee9d8f79a17410aa76e7ad295f42c97" SRC_URI[predicates-core-1.0.8.sha256sum] = "ae8177bee8e75d6846599c6b9ff679ed51e882816914eec639944d7c9aa11931"
meta-oe/dynamic-layers/clang-layer/recipes-support/thin-provisioning-tools/thin-provisioning-tools/0001-Define-more-ioctl-codes-on-riscv32gc-unknown-linux-g.patch new file +38 -0
@@ -0,0 +1,38 @@ +From 11c494b418570a3fbdfbbbdfbbc4db0108743cc7 Mon Sep 17 00:00:00 2001 +From: Dan Gohman <[email protected]> +Date: Sun, 6 Apr 2025 05:22:49 -0700 +Subject: [PATCH] Define more ioctl codes on riscv32gc-unknown-linux-gnu + +Define ioctl codes including `FICLONE` and `FS_IOC32_GETVERSION` on +riscv32gc-unknown-linux-gnu. + +Upstream-Status: Submitted [https://github.com/rust-lang/libc/pull/4382] +Signed-off-by: Khem Raj <[email protected]> +--- + src/unix/linux_like/linux/arch/generic/mod.rs | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/unix/linux_like/linux/arch/generic/mod.rs b/src/unix/linux_like/linux/arch/generic/mod.rs +index 2f437e1..db1f1e7 100644 +--- a/src/unix/linux_like/linux/arch/generic/mod.rs ++++ b/src/unix/linux_like/linux/arch/generic/mod.rs +@@ -114,6 +114,7 @@ cfg_if! { + target_arch = "x86_64", + target_arch = "arm", + target_arch = "aarch64", ++ target_arch = "riscv32", + target_arch = "riscv64", + target_arch = "s390x", + target_arch = "csky", +@@ -218,7 +219,10 @@ cfg_if! { + // where S stands for size (int, long, struct...) + // where T stands for type ('f','v','X'...) + // where N stands for NR (NumbeR) +- if #[cfg(any(target_arch = "x86", target_arch = "arm", target_arch = "csky"))] { ++ if #[cfg(any(target_arch = "x86", ++ target_arch = "arm", ++ target_arch = "riscv32", ++ target_arch = "csky"))] { + pub const FS_IOC_GETFLAGS: ::Ioctl = 0x80046601; + pub const FS_IOC_SETFLAGS: ::Ioctl = 0x40046602; + pub const FS_IOC_GETVERSION: ::Ioctl = 0x80047601;
meta-oe/dynamic-layers/clang-layer/recipes-support/thin-provisioning-tools/thin-provisioning-tools/0001-Use-portable-atomics-crate.patch new file +86 -0
86 lines not on this page · raw message
meta-oe/dynamic-layers/clang-layer/recipes-support/thin-provisioning-tools/thin-provisioning-tools_1.1.0.bb +2 -0
@@ -9,6 +9,8 @@ S = "${WORKDIR}/git" SRC_URI = " \ git://github.com/jthornber/thin-provisioning-tools;branch=main;protocol=https \ + file://0001-Define-more-ioctl-codes-on-riscv32gc-unknown-linux-g.patch;patchdir=${CARGO_VENDORING_DIRECTORY}/libc-0.2.155 \ + file://0001-Use-portable-atomics-crate.patch \ " # v1.1.0