netbsd/riscv64.rs: make changes so that this builds again. #4886
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
At least the rust compiler 1.92.0 cross-builds for this target with this version of the file.
wip-sync
pushed a commit
to NetBSD/pkgsrc-wip
that referenced
this pull request
Dec 19, 2025
...to something which also passes the upstream automated checks. Pull request submitted at rust-lang/libc#4886
...and let each machine definition implement their own of the latter,
instead of c_uchar which is inconsistent with the C implementation.
This allows us to fix the errors from
$ cd libc-test; cargo test
...
bad `pthread_spin_t` size: rust: 1 != c 4
bad `pthread_spin_t` align: rust: 1 != c 4
bad `__cpu_simple_lock_nv_t` signed: rust: 1 != c 0
size of `pthread_spin_t` is 4 in C and 1 in Rust
* Use the same type names as used by the native libc, to allow more self-tests to succeed * Eliminate use of s! and s_no_extra_traits! * Move type definitions up before their use * Remove un-needed imports, uncovered by libc's "cargo test" * Hardwire _ALIGNBYTES to what't it's in C instead of a dynamic erroneous define. THis now makes all the libc self-tests succeed.
Contributor
Author
|
Not sure how those two failing CI jobs can be related to my proposed changes... |
Collaborator
|
This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed. Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers. |
he32
added a commit
to he32/libc
that referenced
this pull request
Dec 29, 2025
…finition. This is already part of pull request rust-lang#4886 which is yet to be applied.
Contributor
Author
Evidently caused by what I had not done (merged upstream 'main' branch into mine). |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Description
These are changes which appear to be required to get this file to build (and cross-build) again.
Admittedly, some of the additions are based on error messages emitted by the rustc compiler.
Sources
Checklist
libc-test/semverhave been updated*LASTor*MAXareincluded (see #3131)
cd libc-test && cargo test --target mytarget);especially relevant for platforms that may not be checked in CI