From c0125f3192a453195cad108bf8155c64be78f197 Mon Sep 17 00:00:00 2001 From: Laytan Date: Wed, 21 Aug 2024 14:41:23 +0200 Subject: [PATCH] correct the riscv64 stat structs --- core/os/os_linux.odin | 21 +-------------------- core/sys/linux/types.odin | 21 +-------------------- 2 files changed, 2 insertions(+), 40 deletions(-) diff --git a/core/os/os_linux.odin b/core/os/os_linux.odin index f1b3720c6..2f7a5ac43 100644 --- a/core/os/os_linux.odin +++ b/core/os/os_linux.odin @@ -262,7 +262,7 @@ Unix_File_Time :: struct { nanoseconds: i64, } -when ODIN_ARCH == .arm64 { +when ODIN_ARCH == .arm64 || ODIN_ARCH == .riscv64 { OS_Stat :: struct { device_id: u64, // ID of device containing file serial: u64, // File serial number @@ -284,25 +284,6 @@ when ODIN_ARCH == .arm64 { _reserved: [2]i32, } #assert(size_of(OS_Stat) == 128) -} else when ODIN_ARCH == .riscv64 { - OS_Stat :: struct { - device_id: u64, - serial: u64, - mode: u32, - nlink: u32, - uid: u32, - gid: u32, - rdev: u64, - _: u64, - size: i64, - block_size: i32, - _: i32, - blocks: i64, - last_access: Unix_File_Time, - modified: Unix_File_Time, - status_change: Unix_File_Time, - _: [3]uint, - } } else { OS_Stat :: struct { device_id: u64, // ID of device containing file diff --git a/core/sys/linux/types.odin b/core/sys/linux/types.odin index c78a5b576..3f873f96c 100644 --- a/core/sys/linux/types.odin +++ b/core/sys/linux/types.odin @@ -119,7 +119,7 @@ when ODIN_ARCH == .amd64 { ctime: Time_Spec, _: [3]uint, } -} else when ODIN_ARCH == .arm64 { +} else when ODIN_ARCH == .arm64 || ODIN_ARCH == .riscv64 { _Arch_Stat :: struct { dev: Dev, ino: Inode, @@ -138,25 +138,6 @@ when ODIN_ARCH == .amd64 { ctime: Time_Spec, _: [2]u32, } -} else when ODIN_ARCH == .riscv64 { - _Arch_Stat :: struct { - dev: Dev, - ino: Inode, - mode: Mode, - nlink: u32, - uid: Uid, - gid: Gid, - rdev: Dev, - _: u64, - size: int, - blksize: i32, - _: i32, - blocks: int, - atime: Time_Spec, - mtime: Time_Spec, - ctime: Time_Spec, - _: [3]uint, - } } else { _Arch_Stat :: struct { dev: Dev,