musl: 64-bit time support #4463

xbjfk · 2025-05-26T12:19:15Z

Description

This change includes time64 support for applicable architectures (x86, arm, mips and powerpc). This is based on the previous PRs to this repo as well as the musl changelog from 1.1.24 -> 1.2. It can be enabled with the environment variable
RUST_LIBC_UNSTABLE_MUSL_TIME64 only when musl_v1_2_3 is enabled and the architecture is supported.

A lot of structures, especially ones with mixed endian became excessively complicated, so I used cfg_if to separate them. It looks like you can only nest s! {} in cfg_if! {}, but not vice versa.

As a note, I'm considering removing musl_not_time64, and just keeping the old logic of allowing deprecated for function definitions involving time_t as it introduces necessary complexity.

When libc 1.0 is released, I believe the best path would be to remove the musl_v1_2_3 feature, making it unconditionally enabled, keeping musl_time64 which will expand to (musl && time64_arch).

Tested through QEMU for all architectures.

Sources

Sources are located on each commit, in the form of upstream commits

Checklist

Relevant tests in libc-test/semver have been updated
No placeholder or unstable values like *LAST or *MAX are
included (see rust-lang/libc#3131)
Tested locally (cd libc-test && cargo test --target mytarget);
especially relevant for platforms that may not be checked in CI

@rustbot label +stable-nominated

xbjfk · 2025-05-26T12:22:55Z

Hmm, seems like the style checker isn't happy with mixing s! {} and cfg_if! {}, and putting cfg_if! {} inside an s! {} block does not seem to work either. I'm not sure what the best course of action is regarding this.

xbjfk · 2025-05-30T12:08:42Z

Since #4433 seems close to merging, I can rebase on top of it once merged.

xbjfk · 2025-06-03T09:09:05Z

Rebased on top of the GNU changes :)

tgross35 · 2025-06-03T17:51:54Z

Thanks! Sorry it's taken me a while, I'll try to look at this very soon

tgross35

Thanks for working on this! Left a few comments here.

For the style check, are the changes it is suggesting possible? If not, that will probably have to be updated unfortunately (hopefully we will be able to reorganize things at some point so it's less annoying...)

build.rs

ci/run-docker.sh

build.rs

src/unix/linux_like/linux/mod.rs

xbjfk · 2025-06-15T10:50:57Z

Thanks for the review! I'll get around to implementing the changes hopefully in the next few days. I'll try figure out how to pass the style lints - but it might need a new file.

After this merges and when 1.0 is closer to release feel free to ping me on GitHub and I can help fully complete the transition for these changes in the 1.0 branch on the musl side :).

src/unix/mod.rs

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 <#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 <#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 <#4463>) (cherry picked from commit 47960b4)

This is equivalent to upstream commit bminor/musl@9b2921b. (backport <#4463>) (cherry picked from commit fa7e710)

This corresponds to upstream commit bminor/musl@1febd21 (most symbols) and bminor/musl@22daaea (only dlsym) (backport <#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 <#4463>) (cherry picked from commit 72a590f)

(backport <#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 <#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 <#4463>) (cherry picked from commit 3d9801d)

This fixes test failures on musl. (backport <#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 <#4463>) (cherry picked from commit 75fb1f0)

Unfortunately does not seem to handle cfg_if well (backport <#4463>) (cherry picked from commit 587fd84)

This reverts commit 34e7583. (backport <#4463>) (cherry picked from commit 092ccf2)

This reverts commit 72fe537. (backport <#4463>) (cherry picked from commit 7726e8f)

rustbot added A-CI Area: CI-related items O-arm O-linux O-linux-like O-mips O-musl O-unix O-x86 S-waiting-on-review stable-nominated This PR should be considered for cherry-pick to libc's stable release branch labels May 26, 2025

xbjfk changed the title ~~musl: time64~~ musl: 64-bit time support May 26, 2025

xbjfk mentioned this pull request May 26, 2025

Start update to musl v1.2.3 #4443

Merged

5 tasks

xbjfk force-pushed the musl-time64 branch 6 times, most recently from 8b32bb3 to e91f182 Compare June 3, 2025 08:26

tgross35 requested changes Jun 9, 2025

View reviewed changes

build.rs Outdated Show resolved Hide resolved

ci/run-docker.sh Show resolved Hide resolved

build.rs Show resolved Hide resolved

src/unix/linux_like/linux/mod.rs Outdated Show resolved Hide resolved

This was referenced Jun 19, 2025

Rebase of "Upgrade musl supported version to 1.2.3" #3791

Closed

Upgrade musl supported version to 1.2.3 #3068

Closed

musl: Change time_t definition on 32-bit targets according to "time64" #1848

Open

martinetd reviewed Jun 20, 2025

View reviewed changes

src/unix/mod.rs Outdated Show resolved Hide resolved

xbjfk force-pushed the musl-time64 branch 2 times, most recently from 9b5ca40 to f669296 Compare June 23, 2025 11:51

tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Jan 3, 2026

musl: time64: adjust struct timespec definition

4089c85

This is equivalent to upstream commit bminor/musl@9b2921b. (backport <rust-lang#4463>) (cherry picked from commit fa7e710)

tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Jan 3, 2026

musl: convert inline timespecs to timespec

918b541

(backport <rust-lang#4463>) (cherry picked from commit 80b82d8)

tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Jan 3, 2026

semver: linux powerpc: split GNU-specific symbols into own file.

761901c

This fixes test failures on musl. (backport <rust-lang#4463>) (cherry picked from commit 8195473)

tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Jan 3, 2026

libc-test: delete handle_s_macro_no_attrs

0a9180b

Unfortunately does not seem to handle cfg_if well (backport <rust-lang#4463>) (cherry picked from commit 587fd84)

tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Jan 3, 2026

Revert "test: Skip input_event.time on recent musl"

9826b56

This reverts commit 34e7583. (backport <rust-lang#4463>) (cherry picked from commit 092ccf2)

tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Jan 3, 2026

Revert "test: musl: Skip time64-dependent API on new musl"

b4a456d

This reverts commit 72fe537. (backport <rust-lang#4463>) (cherry picked from commit 7726e8f)

tgross35 mentioned this pull request Jan 3, 2026

[0.2] Backports #4898

Merged

github-merge-queue bot pushed a commit that referenced this pull request Jan 3, 2026

musl: riscv: fix public padding fields in stat/stat64

65508f3

(backport <#4463>) (cherry picked from commit de1bd4e)

github-merge-queue bot pushed a commit that referenced this pull request Jan 3, 2026

musl: time64: adjust struct timespec definition

8a28ac4

This is equivalent to upstream commit bminor/musl@9b2921b. (backport <#4463>) (cherry picked from commit fa7e710)

github-merge-queue bot pushed a commit that referenced this pull request Jan 3, 2026

musl: convert inline timespecs to timespec

55fa65b

(backport <#4463>) (cherry picked from commit 80b82d8)

github-merge-queue bot pushed a commit that referenced this pull request Jan 3, 2026

semver: linux powerpc: split GNU-specific symbols into own file.

59ff713

This fixes test failures on musl. (backport <#4463>) (cherry picked from commit 8195473)

github-merge-queue bot pushed a commit that referenced this pull request Jan 3, 2026

libc-test: delete handle_s_macro_no_attrs

d71c136

Unfortunately does not seem to handle cfg_if well (backport <#4463>) (cherry picked from commit 587fd84)

github-merge-queue bot pushed a commit that referenced this pull request Jan 3, 2026

Revert "test: Skip input_event.time on recent musl"

2131fa1

This reverts commit 34e7583. (backport <#4463>) (cherry picked from commit 092ccf2)

github-merge-queue bot pushed a commit that referenced this pull request Jan 3, 2026

Revert "test: musl: Skip time64-dependent API on new musl"

ca8cd03

This reverts commit 72fe537. (backport <#4463>) (cherry picked from commit 7726e8f)

tgross35 added stable-applied This PR has been cherry-picked to libc's stable release branch and removed stable-nominated This PR should be considered for cherry-pick to libc's stable release branch labels Jan 3, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

musl: 64-bit time support #4463

musl: 64-bit time support #4463

Uh oh!

xbjfk commented May 26, 2025 •

edited by rustbot

Loading

Uh oh!

xbjfk commented May 26, 2025 •

edited

Loading

Uh oh!

xbjfk commented May 30, 2025

Uh oh!

xbjfk commented Jun 3, 2025

Uh oh!

tgross35 commented Jun 3, 2025

Uh oh!

tgross35 left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

xbjfk commented Jun 15, 2025 •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

musl: 64-bit time support #4463

musl: 64-bit time support #4463

Uh oh!

Conversation

xbjfk commented May 26, 2025 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Sources

Checklist

Uh oh!

xbjfk commented May 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

xbjfk commented May 30, 2025

Uh oh!

xbjfk commented Jun 3, 2025

Uh oh!

tgross35 commented Jun 3, 2025

Uh oh!

tgross35 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

xbjfk commented Jun 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

xbjfk commented May 26, 2025 •

edited by rustbot

Loading

xbjfk commented May 26, 2025 •

edited

Loading

xbjfk commented Jun 15, 2025 •

edited

Loading