Add new cfg gnu_file_offset_bits64 corresponding to _FILE_OFFSET_BITS=64 #4345
Conversation
This file contains 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
Less commands makes for a cleaner `set -x` log. And it is more efficient.
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.
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.
rustbot
added
A-CI
tgross35
requested changes
Mar 22, 2025
tgross35
added
the
stable-nominated
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.
Set the basic types correctly for gnu_file_offset_bits64 (_FILE_OFFSET_BITS=64).
gnu_file_offset_bits64 means _FILE_OFFSET_BITS=64.
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.
Like mips, the stat struct will become different once support for gnu_file_offset_bits64 is added.
Like mips and powerpc, the stat struct will become different once support for gnu_file_offset_bits64 is added.
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.
Struct stat and stat64 needs to match when gnu_file_offset_bits64 is set.
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
snogge
force-pushed
the
gnu-file-offset-64
branch
from
aba1e20 to
cf9c316
Compare
|
@rustbot ready |
tgross35
approved these changes
Apr 3, 2025
| set_cfg("gnu_file_offset_bits64"); | ||
| } | ||
| } | ||
| _ => {} |
There was a problem hiding this comment.
Could you add something like Ok(val) if val != "32" => panic!("RUST_LIBC_UNSTABLE_GNU_FILE_OFFSET_BITS may only be set to '32' or '64'),?
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.
Description
Add a new cfg
gnu_file_offset_bits64corresponding to-D_FILE_OFFSET_BITS=64.The cfg can also be enabled by setting the environment variable
RUST_LIBC_UNSTABLE_GNU_FILE_OFFSET_BITS64=1.This is the second part of what was #3175 .
Sources
off_tino_tblkcnt_tfsblkcnt_tfsfilcnt_trlim_tF_GETLKF_SETLKandF_SETLKWRLIM_INFINITYgetrlimit,setrlimit,prlimitpread,pwrite,preadv2,pwritev2aio_read,aio_write,aio_error,aio_return,aio_cancel,lio_listiofallocate,posix_fallocate,posix_fadvise,open,creat,fcntl,lockf,openatglob,globfreemkstemps,mkostemp,mkostemps,mkstempsendfilestatfs,fstatfsfopen,freopen,tmpfile,fgetpos,fsetpos,fseeko,ftellostat,fstat,fstatat,lstatstatfs,fstatfsreaddir,readdir_rlseek,pread,pwrite, truncate,ftruncatemmapstruct statvfs,struct fstatvfsstruct stat,struct stat64struct statfs,struct statfs64struct fpos_t,struct fpos64_tstruct aiocbstruct flockChecklist
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
I've tested this as widely as possible, but I have not been able to
run the sparc tests. mips and powerpc tests have been run on rust
1.85 using the yocto project, but it's not a fully compatible
environment for some reason.