Enable clock_gettime on wasi #2499
Merged
Conversation
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
|
r? @Amanieu (rust-highfive has picked a reviewer for you, use r? to override) |
|
@bors r+ |
|
📌 Commit cd57a93 has been approved by |
|
☀️ Test successful - checks-actions, checks-cirrus-freebsd-11, checks-cirrus-freebsd-12, checks-cirrus-freebsd-13 |
bors
added a commit
that referenced
this pull request
Nov 11, 2021
Scope in Send, Sync for wasi Without this, libc fails during the build of rustc. See rust-lang/rust#90681 This dependency was introduced in #2499. Alternative solution: It's not clear this is necessary for core to finish building, so maybe we should `#[cfg]` it out in that case, instead?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
I think this mostly addresses the issues that were brought up in #1307 regarding clock ids; I made clockid_t a wrapper struct because it needs to be Send and Sync to be used in a constant, and I figured it was opaque in wasi-libc anyway. Instead of static ZSTs, I just made them
u8s, since I figured it's very unlikely that wasi-libc would change them fromstruct __clockid { __wasi_clockid_t id; }tostruct __clockid {}, and it'll always be valid to treat a static as a/(u8)+/. One thing I was wondering about, should I add a cfg check tobuild.rschecking forcore::ptr::addr_of? Since I think(?) using that would fix any issue of __clockid becoming a "zst" struct in the future.