Skip to content

l4re: change bit widths of file offset types #5173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dybucc wants to merge 1 commit into
base: main
Choose a base branch
from
Open

l4re: change bit widths of file offset types #5173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 22 additions & 4 deletions src/unix/linux_like/l4re/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@ pub type pthread_t = *mut c_void;
pub type dev_t = u64;
pub type socklen_t = u32;
pub type mode_t = u32;
pub type ino64_t = u64;
pub type off64_t = i64;
pub type blkcnt64_t = i64;
pub type rlim64_t = u64;
pub type nfds_t = c_ulong;
pub type nl_item = c_int;
pub type idtype_t = c_uint;
Expand All @@ -22,6 +18,28 @@ pub type pthread_key_t = c_uint;
pub type pthread_once_t = c_int;
pub type pthread_spinlock_t = c_int;

#[deprecated(
since = "0.2.187",
note = "Use `ino_t` instead. 64-bit targets alias both types."
)]
pub type ino64_t = u64;
#[deprecated(
since = "0.2.187",
note = "Use `off_t` instead. No matter the target platform, off_t is always 64-bits wide, and \
the `libc` crate is phasing out support for unsuffixed types."
)]
pub type off64_t = i64;
#[deprecated(
since = "0.2.187",
note = "Use `blkcnt_t` instead. 64-bit targets alias both types."
)]
pub type blkcnt64_t = i64;
#[deprecated(
since = "0.2.187",
note = "Use `rlim_t` instead. 64-bit targets alias both types."
)]
pub type rlim64_t = u64;

s! {
/// CPU sets.
pub struct l4_sched_cpu_set_t {
Expand Down
60 changes: 27 additions & 33 deletions src/unix/linux_like/l4re/uclibc/aarch64/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,64 +15,58 @@ pub type suseconds_t = c_long;
pub type blksize_t = c_long;
pub type blkcnt_t = c_long;

#[deprecated(
since = "0.2.187",
note = "Use `fsblkcnt_t` instead. The unsuffixed type is defined in terms of the suffixed type \
upstream under the current target architecture (x86_64,) and support for suffixed \
types is phasing out in the `libc` crate."
)]
pub type fsblkcnt64_t = c_ulong;
Comment on lines +18 to 24

@tgross35 tgross35 Jun 23, 2026 •
edited by rustbot
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The arch is wrong here but these deprecation messages are more complicated than needed anyway. Let's keep things simple and point elsewhere if more info is required, e.g.:

Use fsblkcnt_t instead. LFS64 aliases are being phased out, see #4805.

View changes since the review

#[deprecated(
since = "0.2.187",
note = "Use `fsfilcnt_t` instead. The unsuffixed type is defined in terms of the suffixed type \
upstream under the current target architecture (x86_64,) and support for suffixed \
types is phasing out in the `libc` crate."
)]
pub type fsfilcnt64_t = c_ulong;
pub type __u64 = c_ulong;

pub type flock64 = flock;
pub type stat64 = stat;

s! {
pub struct stat {
pub st_dev: c_ulong,
pub __pad1: c_ushort,
pub st_dev: crate::dev_t,
pub st_ino: crate::ino_t,
pub st_mode: crate::mode_t,
pub st_nlink: nlink_t,
pub st_uid: crate::uid_t,
pub st_gid: crate::gid_t,
pub st_rdev: c_ulong,
pub __pad2: c_ushort,
pub st_size: crate::off64_t,
pub st_blksize: blksize_t,
pub st_blocks: crate::blkcnt64_t,
pub st_atim: crate::timespec,
pub st_mtim: crate::timespec,
pub st_ctim: crate::timespec,
pub __uclibc_unused4: c_ulong,
pub __uclibc_unused5: c_ulong,
}

pub struct stat64 {
pub st_dev: c_ulong,
pub __pad1: c_uint,
pub __st_ino: crate::ino_t,
pub st_mode: crate::mode_t,
pub st_nlink: nlink_t,
pub st_uid: crate::uid_t,
pub st_gid: crate::gid_t,
pub st_rdev: c_ulong,
pub __pad2: c_uint,
pub st_size: crate::off64_t,
pub st_blksize: blksize_t,
pub st_blocks: crate::blkcnt64_t,
__pad0: Padding<c_int>,
pub st_rdev: crate::dev_t,
pub st_size: crate::off_t,
pub st_blksize: crate::blksize_t,
pub st_blocks: crate::blkcnt_t,
pub st_atim: crate::timespec,
pub st_mtim: crate::timespec,
pub st_ctim: crate::timespec,
pub st_ino: crate::ino64_t,
__uclibc_unused: Padding<[c_long; 3]>,
}

pub struct shmid_ds {
pub shm_perm: crate::ipc_perm,
pub shm_segsz: crate::size_t,
pub shm_atime: crate::time_t,
__unused1: c_ulong,
__unused1: Padding<c_ulong>,
pub shm_dtime: crate::time_t,
__unused2: c_ulong,
__unused2: Padding<c_ulong>,
pub shm_ctime: crate::time_t,
__unused3: c_ulong,
__unused3: Padding<c_ulong>,
pub shm_cpid: crate::pid_t,
pub shm_lpid: crate::pid_t,
pub shm_nattch: crate::shmatt_t,
__unused4: c_ulong,
__unused5: c_ulong,
__unused4: Padding<c_ulong>,
__unused5: Padding<c_ulong>,
}

#[allow(unpredictable_function_pointer_comparisons)]
Expand Down
79 changes: 31 additions & 48 deletions src/unix/linux_like/l4re/uclibc/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
use crate::off64_t;
use crate::prelude::*;

pub type shmatt_t = c_ulong;
Expand All @@ -10,6 +9,9 @@ pub type __priority_which_t = c_uint;
pub type _pthread_descr = *mut c_void;
pub type __pthread_cond_align_t = c_long;

pub type statfs64 = statfs;
pub type statvfs64 = statvfs;

cfg_if! {
if #[cfg(doc)] {
// Used in `linux::arch` to define ioctl constants.
Expand Down Expand Up @@ -44,48 +46,18 @@ s! {
}

pub struct statfs {
pub f_type: fsword_t,
pub f_bsize: fsword_t,
pub f_type: c_long,
pub f_bsize: c_long,
pub f_blocks: crate::fsblkcnt_t,
pub f_bfree: crate::fsblkcnt_t,
pub f_bavail: crate::fsblkcnt_t,
pub f_files: crate::fsfilcnt_t,
pub f_ffree: crate::fsfilcnt_t,
pub f_fsid: crate::fsid_t,
pub f_namelen: fsword_t,
pub f_frsize: fsword_t,
pub f_flags: fsword_t,
pub f_spare: [fsword_t; 4],
}

pub struct statfs64 {
pub f_type: fsword_t,
pub f_bsize: fsword_t,
pub f_blocks: crate::fsblkcnt64_t,
pub f_bfree: crate::fsblkcnt64_t,
pub f_bavail: crate::fsblkcnt64_t,
pub f_files: crate::fsfilcnt64_t,
pub f_ffree: crate::fsfilcnt64_t,
pub f_fsid: crate::fsid_t,
pub f_namelen: fsword_t,
pub f_frsize: fsword_t,
pub f_flags: fsword_t,
pub f_spare: [fsword_t; 4],
}

pub struct statvfs64 {
pub f_bsize: c_ulong,
pub f_frsize: c_ulong,
pub f_blocks: crate::fsfilcnt64_t,
pub f_bfree: crate::fsfilcnt64_t,
pub f_bavail: crate::fsfilcnt64_t,
pub f_files: crate::fsfilcnt64_t,
pub f_ffree: crate::fsfilcnt64_t,
pub f_favail: crate::fsfilcnt64_t,
pub f_fsid: c_ulong,
pub f_flag: c_ulong,
pub f_namemax: c_ulong,
pub __f_spare: [c_int; 6],
pub f_namelen: c_long,
pub f_frsize: c_long,
pub f_flags: c_long,
pub f_spare: [c_long; 4],
}

pub struct ipc_perm {
Expand All @@ -99,11 +71,11 @@ s! {
#[cfg(target_pointer_width = "64")]
pub mode: c_uint,
#[cfg(target_pointer_width = "32")]
__pad1: c_ushort,
__pad1: Padding<c_ushort>,
pub __seq: c_ushort,
__pad2: c_ushort,
__unused1: c_ulong,
__unused2: c_ulong,
__pad2: Padding<c_ushort>,
__unused1: Padding<c_ulong>,
__unused2: Padding<c_ulong>,
}

pub struct statvfs {
Expand All @@ -116,15 +88,12 @@ s! {
pub f_files: crate::fsfilcnt_t,
pub f_ffree: crate::fsfilcnt_t,
pub f_favail: crate::fsfilcnt_t,
#[cfg(target_endian = "little")]
pub f_fsid: c_ulong,
#[cfg(target_pointer_width = "32")]
__f_unused: c_int,
#[cfg(target_endian = "big")]
pub f_fsid: c_ulong,
__f_unused: Padding<c_int>,
pub f_flag: c_ulong,
pub f_namemax: c_ulong,
__f_spare: [c_int; 6],
__f_spare: Padding<[c_int; 6]>,
}

pub struct sysinfo {
Expand Down Expand Up @@ -513,10 +482,24 @@ extern "C" {
flags: c_int,
) -> c_int;

pub fn pwritev(fd: c_int, iov: *const crate::iovec, iovcnt: c_int, offset: off64_t) -> ssize_t;
pub fn preadv(fd: c_int, iov: *const crate::iovec, iovcnt: c_int, offset: off64_t) -> ssize_t;
pub fn pwritev(fd: c_int, iov: *const crate::iovec, iovcnt: c_int, offset: off_t) -> ssize_t;
pub fn preadv(fd: c_int, iov: *const crate::iovec, iovcnt: c_int, offset: off_t) -> ssize_t;

#[deprecated(
since = "0.2.187",
note = "Use `getrlimit` instead. Upstream `#define`s the unsuffixed variants in terms of \
the suffixed variants under builds that use the default configurations. Support for \
suffixed symbols is being phased out in the `libc` crate."
)]
#[allow(deprecated)]
pub fn getrlimit64(resource: crate::__rlimit_resource_t, rlim: *mut crate::rlimit64) -> c_int;
#[deprecated(
since = "0.2.187",
note = "Use `setrlimit` instead. Upstream `#define`s the unsuffixed variants in terms of \
the suffixed variants under builds that use the default configurations. Support for \
suffixed symbols is being phased out in the `libc` crate."
)]
#[allow(deprecated)]
pub fn setrlimit64(resource: crate::__rlimit_resource_t, rlim: *const crate::rlimit64)
-> c_int;
pub fn getrlimit(resource: crate::__rlimit_resource_t, rlim: *mut crate::rlimit) -> c_int;
Expand Down
49 changes: 22 additions & 27 deletions src/unix/linux_like/l4re/uclibc/x86_64/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,49 +17,44 @@ pub type suseconds_t = c_long;
pub type blksize_t = c_long;
pub type blkcnt_t = c_long;

#[deprecated(
since = "0.2.187",
note = "Use `fsblkcnt_t` instead. The unsuffixed type is defined in terms of the suffixed type \
upstream under the current target architecture (x86_64,) and support for suffixed \
types is phasing out in the `libc` crate."
)]
pub type fsblkcnt64_t = c_ulong;
#[deprecated(
since = "0.2.187",
note = "Use `fsfilcnt_t` instead. The unsuffixed type is defined in terms of the suffixed type \
upstream under the current target architecture (x86_64,) and support for suffixed \
types is phasing out in the `libc` crate."
)]
pub type fsfilcnt64_t = c_ulong;

pub type __u32 = c_uint;
pub type __u64 = c_ulong;

pub type stat64 = stat;
pub type flock64 = flock;

s! {
pub struct stat {
pub st_dev: c_ulong,
pub st_ino: crate::ino_t,
// According to uclibc/libc/sysdeps/linux/x86_64/bits/stat.h, order of
// nlink and mode are swapped on 64 bit systems.
pub st_nlink: nlink_t,
pub st_mode: crate::mode_t,
pub st_uid: crate::uid_t,
pub st_gid: crate::gid_t,
__pad0: c_int,
pub st_rdev: c_ulong,
pub st_size: crate::off_t,
pub st_blksize: crate::blksize_t,
pub st_blocks: crate::blkcnt64_t,
pub st_atim: crate::timespec,
pub st_mtim: crate::timespec,
pub st_ctim: crate::timespec,
__uclibc_unused: [c_long; 3],
}

pub struct stat64 {
pub st_dev: c_ulong,
pub st_dev: crate::dev_t,
pub st_ino: crate::ino_t,
pub st_nlink: nlink_t,
pub st_mode: crate::mode_t,
pub st_uid: crate::uid_t,
pub st_gid: crate::gid_t,
__pad0: c_int,
pub st_rdev: c_ulong,
__pad0: Padding<c_int>,
pub st_rdev: crate::dev_t,
pub st_size: crate::off_t,
pub st_blksize: crate::blksize_t,
pub st_blocks: crate::blkcnt64_t,
pub st_blocks: crate::blkcnt_t,
pub st_atim: crate::timespec,
pub st_mtim: crate::timespec,
pub st_ctim: crate::timespec,
st_pad4: [c_long; 3],
__uclibc_unused: Padding<[c_long; 3]>,
}

pub struct shmid_ds {
Expand All @@ -71,8 +66,8 @@ s! {
pub shm_cpid: crate::pid_t,
pub shm_lpid: crate::pid_t,
pub shm_nattch: crate::shmatt_t,
__unused4: c_ulong,
__unused5: c_ulong,
__unused4: Padding<c_ulong>,
__unused5: Padding<c_ulong>,
}

#[allow(unpredictable_function_pointer_comparisons)]
Expand Down
Loading