Skip to content

newlib: fix definition of time_t and off_t#5132

Open
dybucc wants to merge 2 commits into
rust-lang:mainfrom
dybucc:newlib-fix-time_t
Open

newlib: fix definition of time_t and off_t#5132
dybucc wants to merge 2 commits into
rust-lang:mainfrom
dybucc:newlib-fix-time_t

Conversation

@dybucc

@dybucc dybucc commented Jun 1, 2026

Copy link
Copy Markdown
Contributor

Description

This PR addresses bit width mismatches for both time_t and file offset types. This applies to the linux/newlib module.

Upstream and forks for each supported target provide conditional definitions. time_t can be configured in the newlib build script. File offset types require manual intervention in a specific header file. The file containing the default definition will check for a macro that is defined in that specific "override" file. The default definition is a C long.

A number of supported targets were using either one of the above overrides. This was not being taken into account in the libc crate. This patch fixes that by further expanding conditionally compiled type definitions.

Sources

Checklist

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

@dybucc

dybucc commented Jun 2, 2026

Copy link
Copy Markdown
Contributor Author

CI seems to be failing for reasons unrelated to the changes introduced in the patch. A rerun should
do it.

@dybucc dybucc changed the title refactor: fix definition of time_t in Newlib refactor: fix definition of time_t and off_t in Newlib Jun 3, 2026
@dybucc dybucc force-pushed the newlib-fix-time_t branch 4 times, most recently from 7152f77 to e821035 Compare June 7, 2026 16:34
@dybucc dybucc marked this pull request as ready for review June 7, 2026 16:35
@dybucc dybucc force-pushed the newlib-fix-time_t branch from e821035 to de697e2 Compare June 9, 2026 07:11
@rustbot

This comment has been minimized.

@dybucc

dybucc commented Jun 9, 2026

Copy link
Copy Markdown
Contributor Author

CI actually passes. There seems to be an issue with a glob import that is not used, but this has not
been changed in the patch (it's not even part of it, for that matter.) For some reason, rebasing
onto main with dependabot updates has ended up with a warning across all of my open PRs due to
that one (now apparently unused) import.

@dybucc dybucc force-pushed the newlib-fix-time_t branch from de697e2 to 0e027c7 Compare June 15, 2026 15:11
@rustbot

This comment has been minimized.

@dybucc dybucc force-pushed the newlib-fix-time_t branch from 0e027c7 to 6abed2e Compare June 18, 2026 16:20
@rustbot

This comment has been minimized.

@tgross35

Copy link
Copy Markdown
Contributor

I couldn't remember what the possible env+os combinations were for these platforms, here's a quick list.

> $cfg | find 'target_env="newlib"' | get tgt | each {|tgt| $cfg | find $tgt -n | find -nr '(target_env|target_os)' } | flatten
  #               tgt                        cfg
─────────────────────────────────────────────────────────
  0   armv6k-nintendo-3ds            target_env="newlib"
  1   armv6k-nintendo-3ds            target_os="horizon"
  2   armv7-rtems-eabihf             target_env="newlib"
  3   armv7-rtems-eabihf             target_os="rtems"
  4   armv7-sony-vita-newlibeabihf   target_env="newlib"
  5   armv7-sony-vita-newlibeabihf   target_os="vita"
  6   riscv32imac-esp-espidf         target_env="newlib"
  7   riscv32imac-esp-espidf         target_os="espidf"
  8   riscv32imafc-esp-espidf        target_env="newlib"
  9   riscv32imafc-esp-espidf        target_os="espidf"
 10   riscv32imc-esp-espidf          target_env="newlib"
 11   riscv32imc-esp-espidf          target_os="espidf"
 12   xtensa-esp32-espidf            target_env="newlib"
 13   xtensa-esp32-espidf            target_os="espidf"
 14   xtensa-esp32s2-espidf          target_env="newlib"
 15   xtensa-esp32s2-espidf          target_os="espidf"
 16   xtensa-esp32s3-espidf          target_env="newlib"
 17   xtensa-esp32s3-espidf          target_os="espidf"

@tgross35 tgross35 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm having some difficulty extracting a simplified goal from the top post. Is this the net delta on targets we currently support?

  • On armv7-rtems, time_t changes from i32 to i64
  • On armv7-rtems, off_t changes from i64 to c_long, which should be i64->i32
  • On armv7-vita, off_t changes from c_int to c_long. I think there is no change here?

If this sounds accurate, ping the target maintainer (see https://doc.rust-lang.org/rustc/platform-support/armv7-rtems-eabihf.html) for confirmation. This is generally a good idea when tricky things like this change on less popular targets, there may be config or other nuance that doesn't show up in the source code.

Also please don't call this a refactor, that term usually means cleaning up code without changing behavior - if the user experience changes somehow then it's kind of misleading. (Applies to some of your other PRs as well).

Note this option is "documented" as being meant for end users of the libc crate to enable, but no information on it is provided anywhere in all of the libc crate.

It's mostly intended to be set by espidf build tooling, but it would be good to at least mention it. A PR would be welcome in the crate-level docs, after #5179 adds some structure.

It would also be great to know whether the libc crate considers horizon to be the OS for both the Nintendo Switch and the Nintendo 3DS targets, or only for the Nintendo 3DS target.

aarch64-nintendo-switch-freestanding does not appear to set a target_env, so I would assume the latter.

View changes since this review

@tgross35

Copy link
Copy Markdown
Contributor

@rustbot author for clarification

@rustbot

rustbot commented Jun 19, 2026

Copy link
Copy Markdown
Collaborator

Reminder, once the PR becomes ready for a review, use @rustbot ready.

@dybucc dybucc changed the title refactor: fix definition of time_t and off_t in Newlib newlib: fix definition of time_t and off_t Jun 19, 2026
@dybucc

dybucc commented Jun 19, 2026

Copy link
Copy Markdown
Contributor Author

The changes here are required to fit the definitions upstream of time_t, which was generally mismatched.

The changes for file offset types are concerned with either

  1. having a mirrored definition, rather an an equivalent one, and
  2. with the same bit width mismatches as with time_t.

I'll open a PR soon with the documentation for ESP-IDF.

@rustbot ready

@dybucc dybucc force-pushed the newlib-fix-time_t branch from 6abed2e to c2b0970 Compare June 19, 2026 10:56
@rustbot

This comment has been minimized.

@dybucc

dybucc commented Jun 19, 2026

Copy link
Copy Markdown
Contributor Author

Hey @thesummer!

I was wondering if I could get confirmation on these changes on the RTEMS target you maintain?

@dybucc

dybucc commented Jun 19, 2026

Copy link
Copy Markdown
Contributor Author

Hey @nikarh @pheki @zetanumbers!

I was wondering if I could get confirmation on these changes on the Sony PS Vita target you maintain?

@pheki pheki left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for asking!

Just need a change as the Vita uses 32-bit time_t.

Keeping it on the top-level comment for easy reference, here are the sources I could find (somewhat redundant with the finds in the root PR comment but in vitasdk's fork):

off_t

time_t

View changes since this review

Comment thread src/unix/newlib/mod.rs
Comment on lines +9 to +14
if #[cfg(any(
target_os = "espidf",
target_os = "vita",
target_os = "rtems",
target_arch = "aarch64"
))] {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For vita, this one seems correct, as by looking at the definitions it seems to be defined as a long. There should also be no change in behavior as both c_int and c_long are aliases to i32 in this platform.

Sources in the top level review comment.

Comment thread src/unix/newlib/mod.rs
Comment on lines +60 to +61
} else {
pub type time_t = i64;

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one looks wrong for the vita, which uses 32-bit time, as --enable-newlib-long-time_t is set when building newlib in vitasdk (currently the only supported SDK).

The correct definition would be c_long (effectively i32).

Sources in the top-level comment.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. That's fixed now.

@tgross35

Copy link
Copy Markdown
Contributor

The changes here are required to fit the definitions upstream of time_t, which was generally mismatched.

The changes for file offset types are concerned with either

1. having a mirrored definition, rather an an equivalent one, and
2. with the same bit width mismatches as with `time_t`.

Indeed libc doesn't match every source, but with every change I need to figure out a succinct description of what (1) is changing to look more similar to source without affecting users, vs. (2) is a behavior change of some form. IOW I'm interested in the intent more than the problem list, to make sure I'm on the same page as PR authors.

To help with that, are the summary bullet points at #5132 (review) accurate?

@dybucc dybucc force-pushed the newlib-fix-time_t branch from c2b0970 to 3388aa7 Compare June 20, 2026 15:37
@rustbot

This comment has been minimized.

dybucc added 2 commits June 21, 2026 12:12
The `newlib` module uses a faulty definition for `time_t`. That type
falls back to a 32-bit signed integer definition except in `horizon` and
`espidf`.

The option to opt out of a 64-bit `time_t` is configurable. There were
other supported targets that had it enabled in their build scripts.
These were still having `time_t` exposed as 64-bits wide. This patch
fixes that.
The `off_t` type was being exposed as a 32-bit signed integer in targets
where it was 64-bits wide. The same applies the other way around.

This option is configurable. It is not configurable in the build
scripts. The default definition is to have a C `long` as `off_t`. This
can be altered in another header file. That file defines a macro after
defininig the type alias. The macro is then checked in the header file
with the default definition.

A number of supported targets use this overriding behavior. The `libc`
crate is not currently taking them all into consideration. This patch
fixes that.
@dybucc dybucc force-pushed the newlib-fix-time_t branch from 3388aa7 to 1573775 Compare June 21, 2026 10:14
@rustbot

rustbot commented Jun 21, 2026

Copy link
Copy Markdown
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.

@dybucc

dybucc commented Jun 21, 2026

Copy link
Copy Markdown
Contributor Author

Just updated the PR description. It's hopefully clearer now.

The extent of the changes has now changed.

  • RTEMS is unaffected.
  • The changes on vita are as you outlined.
  • AArch64 had changes to its file offset types.
  • horizon has a gone from 32-bit to 64-bit time_t.

@dybucc dybucc requested a review from tgross35 June 21, 2026 17:04
@pheki

pheki commented Jun 21, 2026

Copy link
Copy Markdown
Contributor

I have some questions, first regarding this:

having a mirrored definition, rather an an equivalent one, and

You kept the vita with pub type time_t = i32;. If the idea is to have a mirrored definition, shouldn't it be c_long?

horizon has a gone from 32-bit to 64-bit time_t.

Wasn't it already 64-bit, as c_longlong is an alias to i64 on all supported platforms?

RTEMS is unaffected.
AArch64 had changes to its file offset types.

It seems like time_t has changed from i32 to i64 for those, no?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants