-
Notifications
You must be signed in to change notification settings - Fork 1.2k
musl: 64-bit time support #4463
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
Open
xbjfk
wants to merge
12
commits into
rust-lang:main
Choose a base branch
from
xbjfk:musl-time64
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
8578eaf
musl: riscv: fix public padding fields in `stat/stat64`
xbjfk ef2785f
musl: Merge stat64 and stat with `stat`
xbjfk dd90dd0
musl: add musl_time64 feature
xbjfk ef1407d
musl: time64: adjust struct timespec definition
xbjfk 5da5ebe
musl: time64: set link names for symbols
xbjfk 963d648
musl: time64: update struct sched_param
xbjfk 1958f14
musl: time64: change time_t type and structs
xbjfk a59a247
musl: time64: update {IPC,MSG,SEM}_STAT definitions
xbjfk 4feece3
semver: linux powerpc: split GNU-specific symbols into own file.
xbjfk 5b58dda
linux: time64: skip testing input_event time field
xbjfk fb63658
libc-test: add allowlist for positive s! marco configs
xbjfk 9387345
libc-test: delete handle_s_macro_no_attrs
xbjfk File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,5 @@ | ||
| //! Linux-specific definitions for linux-like values | ||
| use core::cfg; | ||
|
|
||
| use crate::prelude::*; | ||
| use crate::{ | ||
|
|
@@ -2767,9 +2768,9 @@ pub const IPC_NOWAIT: c_int = 0o4000; | |
|
|
||
| pub const IPC_RMID: c_int = 0; | ||
| pub const IPC_SET: c_int = 1; | ||
| pub const IPC_STAT: c_int = 2; | ||
| pub const IPC_STAT: c_int = if cfg!(musl32_time64) { 0x102 } else { 2 }; | ||
| pub const IPC_INFO: c_int = 3; | ||
| pub const MSG_STAT: c_int = 11; | ||
| pub const MSG_STAT: c_int = if cfg!(musl32_time64) { 0x10b } else { 11 }; | ||
| pub const MSG_INFO: c_int = 12; | ||
| pub const MSG_NOTIFICATION: c_int = 0x8000; | ||
|
|
||
|
|
@@ -2786,9 +2787,9 @@ pub const GETNCNT: c_int = 14; | |
| pub const GETZCNT: c_int = 15; | ||
| pub const SETVAL: c_int = 16; | ||
| pub const SETALL: c_int = 17; | ||
| pub const SEM_STAT: c_int = 18; | ||
| pub const SEM_STAT: c_int = if cfg!(musl32_time64) { 0x112 } else { 18 }; | ||
| pub const SEM_INFO: c_int = 19; | ||
| pub const SEM_STAT_ANY: c_int = 20; | ||
| pub const SEM_STAT_ANY: c_int = if cfg!(musl32_time64) { 0x114 } else { 20 }; | ||
|
Comment on lines
-2789
to
+2792
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ditto, may as well define them in terms of IPC_STAT https://github.com/bminor/musl/blob/1b76ff0767d01df72f692806ee5adee13c67ef88/include/sys/sem.h#L32-L34 |
||
|
|
||
| pub const SHM_R: c_int = 0o400; | ||
| pub const SHM_W: c_int = 0o200; | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
I think this can be
(11 | (IPC_STAT & 0x100))to match the source https://github.com/bminor/musl/blob/1b76ff0767d01df72f692806ee5adee13c67ef88/include/sys/msg.h#L28