Skip to content
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

signal: uclibc SA_* use c_uint type #2503

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

signal: uclibc SA_* use c_uint type #2503

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9673ec0
signal: uclibc use c_uint type
cppcoffee Sep 15, 2024
2c37e22
add target_arch=mips64
cppcoffee Sep 18, 2024
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
2 changes: 2 additions & 0 deletions src/sys/signal.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,8 @@ pub const SIGUNUSED : Signal = SIGSYS;
cfg_if! {
if #[cfg(target_os = "redox")] {
type SaFlags_t = libc::c_ulong;
} else if #[cfg(all(target_env = "uclibc", target_arch = "mips"))] {
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
} else if #[cfg(all(target_env = "uclibc", target_arch = "mips"))] {
} else if #[cfg(all(target_env = "uclibc", any(target_arch = "mips"), target_arch = "mips64"))] {

In your libc PR, you did it to both mips and mips64

type SaFlags_t = libc::c_uint;
} else if #[cfg(target_env = "uclibc")] {
type SaFlags_t = libc::c_ulong;
Copy link
Member

Choose a reason for hiding this comment

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

From the comment you linked, this change should be done to #[cfg(all(target_env = "uclibc", target_arch = "mips*"))], why are we doing this for all uclibc triples?🤔

Copy link
Member

Choose a reason for hiding this comment

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

Though if we do this:

this change should be done to #[cfg(all(target_env = "uclibc", target_arch = "mips*"))]

We need that libc PR and change our libc dependency from the libc-0.2 branch to main, as they are breaking changes for the libc crate.

} else {
Expand Down