Skip to content

linux(uclibc): remove redundant records and explicit linking to libutil #5165

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

Merged
tgross35 merged 2 commits into from
Aug 2, 2026
Merged

linux(uclibc): remove redundant records and explicit linking to libutil #5165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
acc9804
linux(uclibc): remove explicit linking to libutil
dybucc Jun 25, 2026
5e6c4d9
linux(uclibc): remove conflicting records
dybucc Jun 25, 2026
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
1 change: 0 additions & 1 deletion src/unix/linux_like/linux/uclibc/mips/mips32/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -661,7 +661,6 @@ pub const SYS_process_mrelease: c_long = 4000 + 448;
pub const SYS_futex_waitv: c_long = 4000 + 449;
pub const SYS_set_mempolicy_home_node: c_long = 4000 + 450;

#[link(name = "util")]
extern "C" {

@tgross35 tgross35 Jul 9, 2026 •
edited by rustbot
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

"linux(uclibc): remove explicit linking to libutil" seems reasonable to me, especially with #5265

View changes since the review

pub fn sysctl(
name: *mut c_int,
Expand Down
23 changes: 0 additions & 23 deletions src/unix/linux_like/linux/uclibc/x86_64/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,19 +234,6 @@ s! {
pub _f: [c_char; 0],
}

pub struct glob_t {
// FIXME(ulibc)
pub gl_pathc: size_t,
pub gl_pathv: *mut *mut c_char,
pub gl_offs: size_t,
pub gl_flags: c_int,
__unused1: Padding<*mut c_void>,
__unused2: Padding<*mut c_void>,
__unused3: Padding<*mut c_void>,
__unused4: Padding<*mut c_void>,
__unused5: Padding<*mut c_void>,
}
Comment on lines -237 to -248

@tgross35 tgross35 Jul 9, 2026 •
edited by rustbot
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

"linux(uclibc): remove conflicting records": The message currently says:

Remove records that are already declared in top-level modules. This
affects x86_64 only. There is no such supported Rust target. This change
should virtually affect nobody.

Who does this affect at all? The definitions look identical

View changes since the review

@dybucc dybucc Jul 9, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

i didn't mean the changes to have an effect on end users. i meant that the changes were only to the x86_64 module. that's why i top it off by saying that it should virtually affect nobody.


pub struct cpu_set_t {
// FIXME(ulibc)
#[cfg(target_pointer_width = "32")]
Expand Down Expand Up @@ -276,16 +263,6 @@ s! {
}
}

s_no_extra_traits! {
pub struct dirent {
pub d_ino: crate::ino64_t,
pub d_off: off64_t,
pub d_reclen: u16,
pub d_type: u8,
pub d_name: [c_char; 256],
}
}

// constants
pub const ENAMETOOLONG: c_int = 36; // File name too long
pub const ENOTEMPTY: c_int = 39; // Directory not empty
Expand Down