-
Notifications
You must be signed in to change notification settings - Fork 667
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.
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
base: master
Are you sure you want to change the base?
Conversation
@@ -414,7 +414,7 @@ cfg_if! { | |||
if #[cfg(target_os = "redox")] { | |||
type SaFlags_t = libc::c_ulong; | |||
} else if #[cfg(target_env = "uclibc")] { | |||
type SaFlags_t = libc::c_ulong; |
There was a problem hiding this comment.
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?🤔
There was a problem hiding this comment.
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.
Signed-off-by: Xiaobo Liu <cppcoffee@gmail.com>
change to |
src/sys/signal.rs
Outdated
@@ -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"))] { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
} 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
I cannot merge this PR until we switch the branch of the libc dependency to |
Since this is tier 3 I can backport rust-lang/libc#3211 once it is merge-ready. Would appreciate a sanity check of that change if you get the chance @SteveLauC. |
Get it, thanks, then we can finish this PR once the backport is done.
Unfortunately, I don't have a uClibc/mips environment, and Nix does not have a CI for that, so I cannot test it:<. But from your comment, that libc PR looks exactly right. |
Signed-off-by: Xiaobo Liu <cppcoffee@gmail.com>
fixed uclibc
SA_*
type usec_uint
type.rust-lang/libc#3887 (comment)
rust-lang/libc#3211