Skip to content

Commit 59f724c

Browse files
authored
Merge pull request #3590 from Xeonacid/riscv64-hwcap-main
Add Linux riscv64 HWCAP defines
2 parents db5eb04 + 430f83b commit 59f724c

File tree

3 files changed

+16
-1
lines changed

3 files changed

+16
-1
lines changed

libc-test/build.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3407,7 +3407,7 @@ fn test_linux(target: &str) {
34073407
// Include linux headers at the end:
34083408
headers! {
34093409
cfg:
3410-
[loongarch64]: "asm/hwcap.h",
3410+
[loongarch64 || riscv64]: "asm/hwcap.h",
34113411
"asm/mman.h",
34123412
[gnu]: "linux/aio_abi.h",
34133413
"linux/can.h",

libc-test/semver/linux-riscv64gc.txt

+7
Original file line numberDiff line numberDiff line change
@@ -71,3 +71,10 @@ TIOCSRS485
7171
flock64
7272
fsblkcnt64_t
7373
fsfilcnt64_t
74+
COMPAT_HWCAP_ISA_I
75+
COMPAT_HWCAP_ISA_M
76+
COMPAT_HWCAP_ISA_A
77+
COMPAT_HWCAP_ISA_F
78+
COMPAT_HWCAP_ISA_D
79+
COMPAT_HWCAP_ISA_C
80+
COMPAT_HWCAP_ISA_V

src/unix/linux_like/linux/gnu/b64/riscv64/mod.rs

+8
Original file line numberDiff line numberDiff line change
@@ -540,6 +540,14 @@ pub const REG_A0: usize = 10;
540540
pub const REG_S2: usize = 18;
541541
pub const REG_NARGS: usize = 8;
542542

543+
pub const COMPAT_HWCAP_ISA_I: ::c_ulong = 1 << (b'I' - b'A');
544+
pub const COMPAT_HWCAP_ISA_M: ::c_ulong = 1 << (b'M' - b'A');
545+
pub const COMPAT_HWCAP_ISA_A: ::c_ulong = 1 << (b'A' - b'A');
546+
pub const COMPAT_HWCAP_ISA_F: ::c_ulong = 1 << (b'F' - b'A');
547+
pub const COMPAT_HWCAP_ISA_D: ::c_ulong = 1 << (b'D' - b'A');
548+
pub const COMPAT_HWCAP_ISA_C: ::c_ulong = 1 << (b'C' - b'A');
549+
pub const COMPAT_HWCAP_ISA_V: ::c_ulong = 1 << (b'V' - b'A');
550+
543551
pub const SYS_read: ::c_long = 63;
544552
pub const SYS_write: ::c_long = 64;
545553
pub const SYS_close: ::c_long = 57;

0 commit comments

Comments
 (0)