[0.2] Backports #4898
Merged
[0.2] Backports #4898
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
Collaborator
rustbot
added
A-CI
Collaborator
|
(backport <rust-lang#4751>) (cherry picked from commit d06928f)
These were added way back when in rust-lang#2499 and while they may have existed in a historical version of wasi-libc they most certainly do not exist in the current wasi-libc. Any usage of them is already-breaking, so this deletes these items. (backport <rust-lang#4880>) (cherry picked from commit e883afc)
It's been fixed since probably sometime in February. rust-lang/rust#132185 (backport <rust-lang#4881>) (cherry picked from commit a3efefe)
Musl does not provide these. Signed-off-by: Jens Reidel <adrian@travitia.xyz> (backport <rust-lang#4884>) (cherry picked from commit 3d372c6)
These have had the values 10240 and 4096 respectively since the introduction of the s390x port in musl back in 2016. Signed-off-by: Jens Reidel <adrian@travitia.xyz> (backport <rust-lang#4884>) (cherry picked from commit cde9e8a)
(backport <rust-lang#4422>) (cherry picked from commit ec1e1e5)
Closes: rust-lang#4870 [ replace the commit summary - Trevor ] (backport <rust-lang#4874>) (cherry picked from commit 0bd3900)
(backport <rust-lang#4463>) (cherry picked from commit de1bd4e)
The structures are the same - and this follows the upstream definition On musl at least, blkcnt64_t == blkcnt_t == i64 and ino_t == ino64_t == u64 (backport <rust-lang#4463>) (cherry picked from commit 9ca4ae9)
This feature is enabled with independently from musl_v1_2_3 to support time64. Defining this feature makes this roughly equivalent to upstream commit bminor/musl@f12bd8e. (backport <rust-lang#4463>) (cherry picked from commit 47960b4)
This is equivalent to upstream commit bminor/musl@9b2921b. (backport <rust-lang#4463>) (cherry picked from commit fa7e710)
This corresponds to upstream commit bminor/musl@1febd21 (most symbols) and bminor/musl@22daaea (only dlsym) (backport <rust-lang#4463>) (cherry picked from commit 6fcc954)
A bunch of properties were removed upstream and set to reserved. This matches upstream commit bminor/musl@827aa8f and bminor/musl@2d69fcf (backport <rust-lang#4463>) (cherry picked from commit 72a590f)
(backport <rust-lang#4463>) (cherry picked from commit 80b82d8)
Change time_t type to i64 Change struct stat, msqid_ds and shmid_ds to reflect This commit follows upstream bminor/musl@3814333 and bminor/musl@d6dcfe4 It also implements a fix from bminor/musl@0fbd7d6 (backport <rust-lang#4463>) (cherry picked from commit 793fa97)
This is primarily based on a small part of bminor/musl@3814333. This also integrates bminor/musl@3c02bac, which update MSG_STAT, SEM_STAT, SEM_STAT_ANY. These are based on the value of IPC_STAT, however we can just use `cfg` as it is effectively the same. (backport <rust-lang#4463>) (cherry picked from commit 3d9801d)
This fixes test failures on musl. (backport <rust-lang#4463>) (cherry picked from commit 8195473)
Namely, this allows `target_endian` as well as adds a constant array where certain configs are explicitly allowed (e.g. musl32_time64). (backport <rust-lang#4463>) (cherry picked from commit 75fb1f0)
Unfortunately does not seem to handle cfg_if well (backport <rust-lang#4463>) (cherry picked from commit 587fd84)
This reverts commit 34e7583. (backport <rust-lang#4463>) (cherry picked from commit 092ccf2)
This reverts commit 72fe537. (backport <rust-lang#4463>) (cherry picked from commit 7726e8f)
(backport <rust-lang#4875>) (cherry picked from commit fb18f26)
(backport <rust-lang#4890>) (cherry picked from commit edd1b61)
(backport <rust-lang#4888>) (cherry picked from commit 9cbb6ff)
tgross35
force-pushed
the
backport-broad
branch
from
39bc74b to
1772e95
Compare
Collaborator
|
This PR was rebased onto a different libc-0.2 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. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
12 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.
Backport the following:
SIGSTKSZMINSIGSTKSZ#4884