[0.2] Backports #4393
Merged
[0.2] Backports #4393
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
(backport <rust-lang#4368>) (cherry picked from commit 0096196)
(backport <rust-lang#4374>) (cherry picked from commit 5adc1ec)
Define ioctl codes including `FICLONE` and `FS_IOC32_GETVERSION` using `_IOR` and `_IOW` so that they're automatically supported on all architectures, including riscv32gc-unknown-linux-gnu. (backport <rust-lang#4382>) (cherry picked from commit 4b439b0)
FreeBSD removed these upstream in [1], so deprecate them here. This resolves a recent CI failure. These constants were originally added in [2]. [1]: freebsd/freebsd-src@6e76489 [2]: rust-lang#1151 (backport <rust-lang#4381>) (cherry picked from commit c8f0910)
Less commands makes for a cleaner `set -x` log. And it is more efficient. (backport <rust-lang#4345>) (cherry picked from commit afa5c65)
Variables set with `env` in the matrix never propagated into the environment. Add a step in test_tier1 and test_tier2 that reads the env context from the matrix and adds the variables to the environment used by later steps. (backport <rust-lang#4345>) (cherry picked from commit 84a04a1)
The `Create I artifacts` step is always run, whether earlier steps succeeds or not. But the upload step would only run if all preceeding steps wer successfull. Add a conditional to always run except if artifact creation failed. (backport <rust-lang#4345>) (cherry picked from commit f10e8e4)
(backport <rust-lang#4345>) (cherry picked from commit a184436)
Add new jobs for i686 in test_tier1 and arm and powerpc in test_tier2 where RUST_LIBC_UNSTABLE_GNU_FILE_OFFSET_BITS=64. Use artifact-tag to avoid artifact name collisions. (backport <rust-lang#4345>) (cherry picked from commit 874e399)
Set the basic types correctly for gnu_file_offset_bits64 (_FILE_OFFSET_BITS=64). (backport <rust-lang#4345>) (cherry picked from commit f44fdc1)
gnu_file_offset_bits64 means _FILE_OFFSET_BITS=64. (backport <rust-lang#4345>) (cherry picked from commit 862ba8a)
(backport <rust-lang#4345>) (cherry picked from commit 6ed2bc8)
(backport <rust-lang#4345>) (cherry picked from commit 5c5c364)
When _FILE_OFFSET_BITS=64, glibc redirects some function calls to 64 bit versions. These symbols are sometimes the public LFS variants, sometimes hidden variants. (backport <rust-lang#4345>) (cherry picked from commit 2b4fafb)
Like mips, the stat struct will become different once support for gnu_file_offset_bits64 is added. (backport <rust-lang#4345>) (cherry picked from commit 0c6d56c)
Like mips and powerpc, the stat struct will become different once support for gnu_file_offset_bits64 is added. (backport <rust-lang#4345>) (cherry picked from commit e134959)
Change the __padX members in b32/mod.rs from short to uint even though they are actually unsigned short in C. Using unsigned int will give the same alignment, and make the struct equivalent to stat64 when gnu_file_offset_bits64 is set. (backport <rust-lang#4345>) (cherry picked from commit 5a5abc2)
(backport <rust-lang#4345>) (cherry picked from commit 96e81e7)
(backport <rust-lang#4345>) (cherry picked from commit 169d50b)
Struct stat and stat64 needs to match when gnu_file_offset_bits64 is set. (backport <rust-lang#4345>) (cherry picked from commit 22ac02c)
The __f_unused field should be the same in statvfs and statvfs64 (where it was already included) as can be seen in https://sourceware.org/git/?p=glibc.git;a=blob;f=sysdeps/unix/sysv/linux/bits/statvfs.h;h=1aed2f54aa86e43ac1c1d3a33197b3232be76580;hb=HEAD (backport <rust-lang#4345>) (cherry picked from commit 131efe9)
(backport <rust-lang#4345>) (cherry picked from commit c1e4812)
(backport <rust-lang#4345>) (cherry picked from commit 872642a)
(backport <rust-lang#4345>) (cherry picked from commit 7ba56f2)
(backport <rust-lang#4345>) (cherry picked from commit 4a7c9a9)
|
@tgross35: no appropriate reviewer found, use |
Merged
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
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.
Backport the following:
ctest#4368