fix: build-std on 32 bit arm with 64 bit time - #157609

Merged
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
guoxe:fix_build_std_arm32_gnu_time_bits64
Aug 8, 2026
Merged

fix: build-std on 32 bit arm with 64 bit time#157609
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
guoxe:fix_build_std_arm32_gnu_time_bits64

Conversation

@guoxe

@guoxeguoxe commented Jun 8, 2026

Copy link
Copy Markdown
Contributor

Infer target type of tv_usec.

The libc crate has support for building with 64 bit time on 32 bit
platforms, configurable currently via environment variable or cfg directives.
When building using 64 bit time, the tv_usec field will be aliased to __suseconds64_t instead of suseconds_t causing the build-std feature to not be able to build the standard library due to a type mismatch.
Adopting the same convention as in

letmut timeout = netc::timeval{tv_sec: secs,tv_usec: timeout.subsec_micros()as_};
fixes the issue, supporting 64 bit time on 32 bit arm platforms.

Another option would be using cfg attributes for this but from what I can tell there are no existing such attributes for time bits in the std and they would essentially duplicate the ones already present in the libc crate https://github.com/rust-lang/libc/blob/e27c7f1e2b281d7c551e6b394b897b4ff0a230e6/build.rs#L16

@rustbotrustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Jun 8, 2026
tv_usec: dur.subsec_micros() as libc::suseconds_t,
// If building 32 bit GNU platforms with 64 bit time, we need to call into here
// since `tv_usec` will in that case be an i64 aliased to __suseconds64_t
tv_usec: (dur.subsec_micros() as libc::suseconds_t).into(),

@sertonixsertonixJun 25, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

There is no reason to use as libc::suseconds_t if we ignore it anyways

Suggested change
tv_usec:(dur.subsec_micros()as libc::suseconds_t).into(),
tv_usec: dur.subsec_micros().into(),

View changes since the review

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

We can not use .into() directly here since subsec_micros returns an unsigned integer.

@guoxe
guoxeforce-pushed the fix_build_std_arm32_gnu_time_bits64 branch from dacadfc to 538573aCompareAugust 5, 2026 12:56
@guoxe
guoxe marked this pull request as ready for review August 5, 2026 14:12
@rustbotrustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 5, 2026
@rustbotrustbot removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Aug 5, 2026
@rustbot

Copy link
Copy Markdown
Collaborator

Thanks for the pull request, and welcome! The Rust Project is excited to review your changes, and you should hear from @jhpratt (or someone else) some time within the next two weeks.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

  • @rustbot author: the review is finished, PR author should check the comments and take action accordingly
  • @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue
Why was this reviewer chosen?

The reviewer was selected based on:

  • Owners of files modified in this PR: @ChrisDenton, libs
  • @ChrisDenton, libs expanded to 13 candidates
  • Random selection from JohnTitor, Mark-Simulacrum, clarfonthey, jhpratt, nia-e

@jhpratt

Copy link
Copy Markdown
Member

Stepping away from reviews temporarily.

@rustbot reroll

@Mark-Simulacrum

Copy link
Copy Markdown
Member

@bors squash

@rust-bors

This comment has been minimized.

* fix: build-std on 32 bit arm with 64 bit time
The libc crate has support for building with 64 bit time on 32 bit
platforms using the `RUST_LIBC_UNSTABLE_GNU_TIME_BITS` environment
variable.
Convert the tv_usec field to i64 via `into` in this case since
`suseconds_t` is still defined as an i32 when this environment variable
is set.
* Use placeholder as target type
This allows us to rely on the compiler to infer the correct target type,
mirroring the approach used in `sys/net/connection/socket/solid.rs`.
@rust-bors

rust-borsBot commented Aug 8, 2026

Copy link
Copy Markdown
Contributor

🔨 2 commits were squashed into f846f11.

@rust-bors
rust-borsBotforce-pushed the fix_build_std_arm32_gnu_time_bits64 branch from 538573a to f846f11CompareAugust 8, 2026 13:50
@Mark-Simulacrum

Copy link
Copy Markdown
Member

@bors r+ rollup

@rust-bors

rust-borsBot commented Aug 8, 2026

Copy link
Copy Markdown
Contributor

📌 Commit f846f11 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@rust-borsrust-borsBot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 8, 2026
rust-borsBot pushed a commit that referenced this pull request Aug 8, 2026
…uwer
Rollup of 12 pull requests
Successful merges:
- #160336 (Move attributes out of rustc_hir)
- #160715 (ignore tests with the GCC backend if we can't find `libgccjit.so` for the target)
- #157609 (fix: build-std on 32 bit arm with 64 bit time)
- #160613 (Add regression test for unsized non-last struct field with overlapping impls)
- #160658 (miri: implement more restrictive trivial-ABI checks)
- #160704 (sort lint names in lint pass declarations)
- #160707 (Add regression test for higher ranked fn pointer impl not general enough)
- #160713 (Add regression test for #135287)
- #160720 (triagebot: add ubiratan to infra-ci)
- #160747 (rustc_errors: remove unused code)
- #160751 (Add regression test for incremental borrowck ICE with generic const exprs)
- #160753 (rustc_lint: remove unused rustc_attrs feature)
Failed merges:
- #158835 (rustc_passes: lint unused `#[path]` attributes on inline modules)
@rust-bors
rust-borsBot merged commit 473809d into rust-lang:mainAug 8, 2026
13 checks passed
@rustbotrustbot added this to the 1.99.0 milestone Aug 8, 2026
rust-timer added a commit that referenced this pull request Aug 8, 2026
Rollup merge of #157609 - guoxe:fix_build_std_arm32_gnu_time_bits64, r=Mark-Simulacrum
fix: build-std on 32 bit arm with 64 bit time
Infer target type of `tv_usec`.
The libc crate has support for building with 64 bit time on 32 bit
platforms, configurable currently via environment variable or cfg directives.
When building using 64 bit time, the tv_usec field will be aliased to `__suseconds64_t` instead of `suseconds_t` causing the `build-std` feature to not be able to build the standard library due to a type mismatch.
Adopting the same convention as in https://github.com/rust-lang/rust/blob/1b29cfdbee8ee37333f4b24afb936350eb57e705/library/std/src/sys/net/connection/socket/solid.rs#L151 fixes the issue, supporting 64 bit time on 32 bit arm platforms.
Another option would be using cfg attributes for this but from what I can tell there are no existing such attributes for time bits in the std and they would essentially duplicate the ones already present in the libc crate https://github.com/rust-lang/libc/blob/e27c7f1e2b281d7c551e6b394b897b4ff0a230e6/build.rs#L16
pullBot pushed a commit to LeeeeeeM/miri that referenced this pull request Aug 9, 2026
…uwer
Rollup of 12 pull requests
Successful merges:
- rust-lang/rust#160336 (Move attributes out of rustc_hir)
- rust-lang/rust#160715 (ignore tests with the GCC backend if we can't find `libgccjit.so` for the target)
- rust-lang/rust#157609 (fix: build-std on 32 bit arm with 64 bit time)
- rust-lang/rust#160613 (Add regression test for unsized non-last struct field with overlapping impls)
- rust-lang/rust#160658 (miri: implement more restrictive trivial-ABI checks)
- rust-lang/rust#160704 (sort lint names in lint pass declarations)
- rust-lang/rust#160707 (Add regression test for higher ranked fn pointer impl not general enough)
- rust-lang/rust#160713 (Add regression test for rust-lang/rust#135287)
- rust-lang/rust#160720 (triagebot: add ubiratan to infra-ci)
- rust-lang/rust#160747 (rustc_errors: remove unused code)
- rust-lang/rust#160751 (Add regression test for incremental borrowck ICE with generic const exprs)
- rust-lang/rust#160753 (rustc_lint: remove unused rustc_attrs feature)
Failed merges:
- rust-lang/rust#158835 (rustc_passes: lint unused `#[path]` attributes on inline modules)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-libsRelevant to the library team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@guoxe@rustbot@jhpratt@Mark-Simulacrum@sertonix
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

fix: build-std on 32 bit arm with 64 bit time - #157609

Merged
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
guoxe:fix_build_std_arm32_gnu_time_bits64
Aug 8, 2026
Merged

fix: build-std on 32 bit arm with 64 bit time#157609
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
guoxe:fix_build_std_arm32_gnu_time_bits64

Conversation

@guoxe

@guoxeguoxe commented Jun 8, 2026

Copy link
Copy Markdown
Contributor

Infer target type of tv_usec.

The libc crate has support for building with 64 bit time on 32 bit
platforms, configurable currently via environment variable or cfg directives.
When building using 64 bit time, the tv_usec field will be aliased to __suseconds64_t instead of suseconds_t causing the build-std feature to not be able to build the standard library due to a type mismatch.
Adopting the same convention as in

letmut timeout = netc::timeval{tv_sec: secs,tv_usec: timeout.subsec_micros()as_};
fixes the issue, supporting 64 bit time on 32 bit arm platforms.

Another option would be using cfg attributes for this but from what I can tell there are no existing such attributes for time bits in the std and they would essentially duplicate the ones already present in the libc crate https://github.com/rust-lang/libc/blob/e27c7f1e2b281d7c551e6b394b897b4ff0a230e6/build.rs#L16

@rustbotrustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Jun 8, 2026
tv_usec: dur.subsec_micros() as libc::suseconds_t,
// If building 32 bit GNU platforms with 64 bit time, we need to call into here
// since `tv_usec` will in that case be an i64 aliased to __suseconds64_t
tv_usec: (dur.subsec_micros() as libc::suseconds_t).into(),

@sertonixsertonixJun 25, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

There is no reason to use as libc::suseconds_t if we ignore it anyways

Suggested change
tv_usec:(dur.subsec_micros()as libc::suseconds_t).into(),
tv_usec: dur.subsec_micros().into(),

View changes since the review

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

We can not use .into() directly here since subsec_micros returns an unsigned integer.

@guoxe
guoxeforce-pushed the fix_build_std_arm32_gnu_time_bits64 branch from dacadfc to 538573aCompareAugust 5, 2026 12:56
@guoxe
guoxe marked this pull request as ready for review August 5, 2026 14:12
@rustbotrustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 5, 2026
@rustbotrustbot removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Aug 5, 2026
@rustbot

Copy link
Copy Markdown
Collaborator

Thanks for the pull request, and welcome! The Rust Project is excited to review your changes, and you should hear from @jhpratt (or someone else) some time within the next two weeks.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

  • @rustbot author: the review is finished, PR author should check the comments and take action accordingly
  • @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue
Why was this reviewer chosen?

The reviewer was selected based on:

  • Owners of files modified in this PR: @ChrisDenton, libs
  • @ChrisDenton, libs expanded to 13 candidates
  • Random selection from JohnTitor, Mark-Simulacrum, clarfonthey, jhpratt, nia-e

@jhpratt

Copy link
Copy Markdown
Member

Stepping away from reviews temporarily.

@rustbot reroll

@Mark-Simulacrum

Copy link
Copy Markdown
Member

@bors squash

@rust-bors

This comment has been minimized.

* fix: build-std on 32 bit arm with 64 bit time
The libc crate has support for building with 64 bit time on 32 bit
platforms using the `RUST_LIBC_UNSTABLE_GNU_TIME_BITS` environment
variable.
Convert the tv_usec field to i64 via `into` in this case since
`suseconds_t` is still defined as an i32 when this environment variable
is set.
* Use placeholder as target type
This allows us to rely on the compiler to infer the correct target type,
mirroring the approach used in `sys/net/connection/socket/solid.rs`.
@rust-bors

rust-borsBot commented Aug 8, 2026

Copy link
Copy Markdown
Contributor

🔨 2 commits were squashed into f846f11.

@rust-bors
rust-borsBotforce-pushed the fix_build_std_arm32_gnu_time_bits64 branch from 538573a to f846f11CompareAugust 8, 2026 13:50
@Mark-Simulacrum

Copy link
Copy Markdown
Member

@bors r+ rollup

@rust-bors

rust-borsBot commented Aug 8, 2026

Copy link
Copy Markdown
Contributor

📌 Commit f846f11 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@rust-borsrust-borsBot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 8, 2026
rust-borsBot pushed a commit that referenced this pull request Aug 8, 2026
…uwer
Rollup of 12 pull requests
Successful merges:
- #160336 (Move attributes out of rustc_hir)
- #160715 (ignore tests with the GCC backend if we can't find `libgccjit.so` for the target)
- #157609 (fix: build-std on 32 bit arm with 64 bit time)
- #160613 (Add regression test for unsized non-last struct field with overlapping impls)
- #160658 (miri: implement more restrictive trivial-ABI checks)
- #160704 (sort lint names in lint pass declarations)
- #160707 (Add regression test for higher ranked fn pointer impl not general enough)
- #160713 (Add regression test for #135287)
- #160720 (triagebot: add ubiratan to infra-ci)
- #160747 (rustc_errors: remove unused code)
- #160751 (Add regression test for incremental borrowck ICE with generic const exprs)
- #160753 (rustc_lint: remove unused rustc_attrs feature)
Failed merges:
- #158835 (rustc_passes: lint unused `#[path]` attributes on inline modules)
@rust-bors
rust-borsBot merged commit 473809d into rust-lang:mainAug 8, 2026
13 checks passed
@rustbotrustbot added this to the 1.99.0 milestone Aug 8, 2026
rust-timer added a commit that referenced this pull request Aug 8, 2026
Rollup merge of #157609 - guoxe:fix_build_std_arm32_gnu_time_bits64, r=Mark-Simulacrum
fix: build-std on 32 bit arm with 64 bit time
Infer target type of `tv_usec`.
The libc crate has support for building with 64 bit time on 32 bit
platforms, configurable currently via environment variable or cfg directives.
When building using 64 bit time, the tv_usec field will be aliased to `__suseconds64_t` instead of `suseconds_t` causing the `build-std` feature to not be able to build the standard library due to a type mismatch.
Adopting the same convention as in https://github.com/rust-lang/rust/blob/1b29cfdbee8ee37333f4b24afb936350eb57e705/library/std/src/sys/net/connection/socket/solid.rs#L151 fixes the issue, supporting 64 bit time on 32 bit arm platforms.
Another option would be using cfg attributes for this but from what I can tell there are no existing such attributes for time bits in the std and they would essentially duplicate the ones already present in the libc crate https://github.com/rust-lang/libc/blob/e27c7f1e2b281d7c551e6b394b897b4ff0a230e6/build.rs#L16
pullBot pushed a commit to LeeeeeeM/miri that referenced this pull request Aug 9, 2026
…uwer
Rollup of 12 pull requests
Successful merges:
- rust-lang/rust#160336 (Move attributes out of rustc_hir)
- rust-lang/rust#160715 (ignore tests with the GCC backend if we can't find `libgccjit.so` for the target)
- rust-lang/rust#157609 (fix: build-std on 32 bit arm with 64 bit time)
- rust-lang/rust#160613 (Add regression test for unsized non-last struct field with overlapping impls)
- rust-lang/rust#160658 (miri: implement more restrictive trivial-ABI checks)
- rust-lang/rust#160704 (sort lint names in lint pass declarations)
- rust-lang/rust#160707 (Add regression test for higher ranked fn pointer impl not general enough)
- rust-lang/rust#160713 (Add regression test for rust-lang/rust#135287)
- rust-lang/rust#160720 (triagebot: add ubiratan to infra-ci)
- rust-lang/rust#160747 (rustc_errors: remove unused code)
- rust-lang/rust#160751 (Add regression test for incremental borrowck ICE with generic const exprs)
- rust-lang/rust#160753 (rustc_lint: remove unused rustc_attrs feature)
Failed merges:
- rust-lang/rust#158835 (rustc_passes: lint unused `#[path]` attributes on inline modules)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-libsRelevant to the library team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@guoxe@rustbot@jhpratt@Mark-Simulacrum@sertonix
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

fix: build-std on 32 bit arm with 64 bit time - #157609

Merged
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
guoxe:fix_build_std_arm32_gnu_time_bits64
Aug 8, 2026
Merged

fix: build-std on 32 bit arm with 64 bit time#157609
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
guoxe:fix_build_std_arm32_gnu_time_bits64

Conversation

@guoxe

@guoxeguoxe commented Jun 8, 2026

Copy link
Copy Markdown
Contributor

Infer target type of tv_usec.

The libc crate has support for building with 64 bit time on 32 bit
platforms, configurable currently via environment variable or cfg directives.
When building using 64 bit time, the tv_usec field will be aliased to __suseconds64_t instead of suseconds_t causing the build-std feature to not be able to build the standard library due to a type mismatch.
Adopting the same convention as in

letmut timeout = netc::timeval{tv_sec: secs,tv_usec: timeout.subsec_micros()as_};
fixes the issue, supporting 64 bit time on 32 bit arm platforms.

Another option would be using cfg attributes for this but from what I can tell there are no existing such attributes for time bits in the std and they would essentially duplicate the ones already present in the libc crate https://github.com/rust-lang/libc/blob/e27c7f1e2b281d7c551e6b394b897b4ff0a230e6/build.rs#L16

@rustbotrustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Jun 8, 2026
tv_usec: dur.subsec_micros() as libc::suseconds_t,
// If building 32 bit GNU platforms with 64 bit time, we need to call into here
// since `tv_usec` will in that case be an i64 aliased to __suseconds64_t
tv_usec: (dur.subsec_micros() as libc::suseconds_t).into(),

@sertonixsertonixJun 25, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

There is no reason to use as libc::suseconds_t if we ignore it anyways

Suggested change
tv_usec:(dur.subsec_micros()as libc::suseconds_t).into(),
tv_usec: dur.subsec_micros().into(),

View changes since the review

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

We can not use .into() directly here since subsec_micros returns an unsigned integer.

@guoxe
guoxeforce-pushed the fix_build_std_arm32_gnu_time_bits64 branch from dacadfc to 538573aCompareAugust 5, 2026 12:56
@guoxe
guoxe marked this pull request as ready for review August 5, 2026 14:12
@rustbotrustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 5, 2026
@rustbotrustbot removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Aug 5, 2026
@rustbot

Copy link
Copy Markdown
Collaborator

Thanks for the pull request, and welcome! The Rust Project is excited to review your changes, and you should hear from @jhpratt (or someone else) some time within the next two weeks.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

  • @rustbot author: the review is finished, PR author should check the comments and take action accordingly
  • @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue
Why was this reviewer chosen?

The reviewer was selected based on:

  • Owners of files modified in this PR: @ChrisDenton, libs
  • @ChrisDenton, libs expanded to 13 candidates
  • Random selection from JohnTitor, Mark-Simulacrum, clarfonthey, jhpratt, nia-e

@jhpratt

Copy link
Copy Markdown
Member

Stepping away from reviews temporarily.

@rustbot reroll

@Mark-Simulacrum

Copy link
Copy Markdown
Member

@bors squash

@rust-bors

This comment has been minimized.

* fix: build-std on 32 bit arm with 64 bit time
The libc crate has support for building with 64 bit time on 32 bit
platforms using the `RUST_LIBC_UNSTABLE_GNU_TIME_BITS` environment
variable.
Convert the tv_usec field to i64 via `into` in this case since
`suseconds_t` is still defined as an i32 when this environment variable
is set.
* Use placeholder as target type
This allows us to rely on the compiler to infer the correct target type,
mirroring the approach used in `sys/net/connection/socket/solid.rs`.
@rust-bors

rust-borsBot commented Aug 8, 2026

Copy link
Copy Markdown
Contributor

🔨 2 commits were squashed into f846f11.

@rust-bors
rust-borsBotforce-pushed the fix_build_std_arm32_gnu_time_bits64 branch from 538573a to f846f11CompareAugust 8, 2026 13:50
@Mark-Simulacrum

Copy link
Copy Markdown
Member

@bors r+ rollup

@rust-bors

rust-borsBot commented Aug 8, 2026

Copy link
Copy Markdown
Contributor

📌 Commit f846f11 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@rust-borsrust-borsBot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 8, 2026
rust-borsBot pushed a commit that referenced this pull request Aug 8, 2026
…uwer
Rollup of 12 pull requests
Successful merges:
- #160336 (Move attributes out of rustc_hir)
- #160715 (ignore tests with the GCC backend if we can't find `libgccjit.so` for the target)
- #157609 (fix: build-std on 32 bit arm with 64 bit time)
- #160613 (Add regression test for unsized non-last struct field with overlapping impls)
- #160658 (miri: implement more restrictive trivial-ABI checks)
- #160704 (sort lint names in lint pass declarations)
- #160707 (Add regression test for higher ranked fn pointer impl not general enough)
- #160713 (Add regression test for #135287)
- #160720 (triagebot: add ubiratan to infra-ci)
- #160747 (rustc_errors: remove unused code)
- #160751 (Add regression test for incremental borrowck ICE with generic const exprs)
- #160753 (rustc_lint: remove unused rustc_attrs feature)
Failed merges:
- #158835 (rustc_passes: lint unused `#[path]` attributes on inline modules)
@rust-bors
rust-borsBot merged commit 473809d into rust-lang:mainAug 8, 2026
13 checks passed
@rustbotrustbot added this to the 1.99.0 milestone Aug 8, 2026
rust-timer added a commit that referenced this pull request Aug 8, 2026
Rollup merge of #157609 - guoxe:fix_build_std_arm32_gnu_time_bits64, r=Mark-Simulacrum
fix: build-std on 32 bit arm with 64 bit time
Infer target type of `tv_usec`.
The libc crate has support for building with 64 bit time on 32 bit
platforms, configurable currently via environment variable or cfg directives.
When building using 64 bit time, the tv_usec field will be aliased to `__suseconds64_t` instead of `suseconds_t` causing the `build-std` feature to not be able to build the standard library due to a type mismatch.
Adopting the same convention as in https://github.com/rust-lang/rust/blob/1b29cfdbee8ee37333f4b24afb936350eb57e705/library/std/src/sys/net/connection/socket/solid.rs#L151 fixes the issue, supporting 64 bit time on 32 bit arm platforms.
Another option would be using cfg attributes for this but from what I can tell there are no existing such attributes for time bits in the std and they would essentially duplicate the ones already present in the libc crate https://github.com/rust-lang/libc/blob/e27c7f1e2b281d7c551e6b394b897b4ff0a230e6/build.rs#L16
pullBot pushed a commit to LeeeeeeM/miri that referenced this pull request Aug 9, 2026
…uwer
Rollup of 12 pull requests
Successful merges:
- rust-lang/rust#160336 (Move attributes out of rustc_hir)
- rust-lang/rust#160715 (ignore tests with the GCC backend if we can't find `libgccjit.so` for the target)
- rust-lang/rust#157609 (fix: build-std on 32 bit arm with 64 bit time)
- rust-lang/rust#160613 (Add regression test for unsized non-last struct field with overlapping impls)
- rust-lang/rust#160658 (miri: implement more restrictive trivial-ABI checks)
- rust-lang/rust#160704 (sort lint names in lint pass declarations)
- rust-lang/rust#160707 (Add regression test for higher ranked fn pointer impl not general enough)
- rust-lang/rust#160713 (Add regression test for rust-lang/rust#135287)
- rust-lang/rust#160720 (triagebot: add ubiratan to infra-ci)
- rust-lang/rust#160747 (rustc_errors: remove unused code)
- rust-lang/rust#160751 (Add regression test for incremental borrowck ICE with generic const exprs)
- rust-lang/rust#160753 (rustc_lint: remove unused rustc_attrs feature)
Failed merges:
- rust-lang/rust#158835 (rustc_passes: lint unused `#[path]` attributes on inline modules)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-libsRelevant to the library team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@guoxe@rustbot@jhpratt@Mark-Simulacrum@sertonix
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

fix: build-std on 32 bit arm with 64 bit time - #157609

Merged
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
guoxe:fix_build_std_arm32_gnu_time_bits64
Aug 8, 2026
Merged

fix: build-std on 32 bit arm with 64 bit time#157609
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
guoxe:fix_build_std_arm32_gnu_time_bits64

Conversation

@guoxe

@guoxeguoxe commented Jun 8, 2026

Copy link
Copy Markdown
Contributor

Infer target type of tv_usec.

The libc crate has support for building with 64 bit time on 32 bit
platforms, configurable currently via environment variable or cfg directives.
When building using 64 bit time, the tv_usec field will be aliased to __suseconds64_t instead of suseconds_t causing the build-std feature to not be able to build the standard library due to a type mismatch.
Adopting the same convention as in

letmut timeout = netc::timeval{tv_sec: secs,tv_usec: timeout.subsec_micros()as_};
fixes the issue, supporting 64 bit time on 32 bit arm platforms.

Another option would be using cfg attributes for this but from what I can tell there are no existing such attributes for time bits in the std and they would essentially duplicate the ones already present in the libc crate https://github.com/rust-lang/libc/blob/e27c7f1e2b281d7c551e6b394b897b4ff0a230e6/build.rs#L16

@rustbotrustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Jun 8, 2026
tv_usec: dur.subsec_micros() as libc::suseconds_t,
// If building 32 bit GNU platforms with 64 bit time, we need to call into here
// since `tv_usec` will in that case be an i64 aliased to __suseconds64_t
tv_usec: (dur.subsec_micros() as libc::suseconds_t).into(),

@sertonixsertonixJun 25, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

There is no reason to use as libc::suseconds_t if we ignore it anyways

Suggested change
tv_usec:(dur.subsec_micros()as libc::suseconds_t).into(),
tv_usec: dur.subsec_micros().into(),

View changes since the review

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

We can not use .into() directly here since subsec_micros returns an unsigned integer.

@guoxe
guoxeforce-pushed the fix_build_std_arm32_gnu_time_bits64 branch from dacadfc to 538573aCompareAugust 5, 2026 12:56
@guoxe
guoxe marked this pull request as ready for review August 5, 2026 14:12
@rustbotrustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 5, 2026
@rustbotrustbot removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Aug 5, 2026
@rustbot

Copy link
Copy Markdown
Collaborator

Thanks for the pull request, and welcome! The Rust Project is excited to review your changes, and you should hear from @jhpratt (or someone else) some time within the next two weeks.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

  • @rustbot author: the review is finished, PR author should check the comments and take action accordingly
  • @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue
Why was this reviewer chosen?

The reviewer was selected based on:

  • Owners of files modified in this PR: @ChrisDenton, libs
  • @ChrisDenton, libs expanded to 13 candidates
  • Random selection from JohnTitor, Mark-Simulacrum, clarfonthey, jhpratt, nia-e

@jhpratt

Copy link
Copy Markdown
Member

Stepping away from reviews temporarily.

@rustbot reroll

@Mark-Simulacrum

Copy link
Copy Markdown
Member

@bors squash

@rust-bors

This comment has been minimized.

* fix: build-std on 32 bit arm with 64 bit time
The libc crate has support for building with 64 bit time on 32 bit
platforms using the `RUST_LIBC_UNSTABLE_GNU_TIME_BITS` environment
variable.
Convert the tv_usec field to i64 via `into` in this case since
`suseconds_t` is still defined as an i32 when this environment variable
is set.
* Use placeholder as target type
This allows us to rely on the compiler to infer the correct target type,
mirroring the approach used in `sys/net/connection/socket/solid.rs`.
@rust-bors

rust-borsBot commented Aug 8, 2026

Copy link
Copy Markdown
Contributor

🔨 2 commits were squashed into f846f11.

@rust-bors
rust-borsBotforce-pushed the fix_build_std_arm32_gnu_time_bits64 branch from 538573a to f846f11CompareAugust 8, 2026 13:50
@Mark-Simulacrum

Copy link
Copy Markdown
Member

@bors r+ rollup

@rust-bors

rust-borsBot commented Aug 8, 2026

Copy link
Copy Markdown
Contributor

📌 Commit f846f11 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@rust-borsrust-borsBot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 8, 2026
rust-borsBot pushed a commit that referenced this pull request Aug 8, 2026
…uwer
Rollup of 12 pull requests
Successful merges:
- #160336 (Move attributes out of rustc_hir)
- #160715 (ignore tests with the GCC backend if we can't find `libgccjit.so` for the target)
- #157609 (fix: build-std on 32 bit arm with 64 bit time)
- #160613 (Add regression test for unsized non-last struct field with overlapping impls)
- #160658 (miri: implement more restrictive trivial-ABI checks)
- #160704 (sort lint names in lint pass declarations)
- #160707 (Add regression test for higher ranked fn pointer impl not general enough)
- #160713 (Add regression test for #135287)
- #160720 (triagebot: add ubiratan to infra-ci)
- #160747 (rustc_errors: remove unused code)
- #160751 (Add regression test for incremental borrowck ICE with generic const exprs)
- #160753 (rustc_lint: remove unused rustc_attrs feature)
Failed merges:
- #158835 (rustc_passes: lint unused `#[path]` attributes on inline modules)
@rust-bors
rust-borsBot merged commit 473809d into rust-lang:mainAug 8, 2026
13 checks passed
@rustbotrustbot added this to the 1.99.0 milestone Aug 8, 2026
rust-timer added a commit that referenced this pull request Aug 8, 2026
Rollup merge of #157609 - guoxe:fix_build_std_arm32_gnu_time_bits64, r=Mark-Simulacrum
fix: build-std on 32 bit arm with 64 bit time
Infer target type of `tv_usec`.
The libc crate has support for building with 64 bit time on 32 bit
platforms, configurable currently via environment variable or cfg directives.
When building using 64 bit time, the tv_usec field will be aliased to `__suseconds64_t` instead of `suseconds_t` causing the `build-std` feature to not be able to build the standard library due to a type mismatch.
Adopting the same convention as in https://github.com/rust-lang/rust/blob/1b29cfdbee8ee37333f4b24afb936350eb57e705/library/std/src/sys/net/connection/socket/solid.rs#L151 fixes the issue, supporting 64 bit time on 32 bit arm platforms.
Another option would be using cfg attributes for this but from what I can tell there are no existing such attributes for time bits in the std and they would essentially duplicate the ones already present in the libc crate https://github.com/rust-lang/libc/blob/e27c7f1e2b281d7c551e6b394b897b4ff0a230e6/build.rs#L16
pullBot pushed a commit to LeeeeeeM/miri that referenced this pull request Aug 9, 2026
…uwer
Rollup of 12 pull requests
Successful merges:
- rust-lang/rust#160336 (Move attributes out of rustc_hir)
- rust-lang/rust#160715 (ignore tests with the GCC backend if we can't find `libgccjit.so` for the target)
- rust-lang/rust#157609 (fix: build-std on 32 bit arm with 64 bit time)
- rust-lang/rust#160613 (Add regression test for unsized non-last struct field with overlapping impls)
- rust-lang/rust#160658 (miri: implement more restrictive trivial-ABI checks)
- rust-lang/rust#160704 (sort lint names in lint pass declarations)
- rust-lang/rust#160707 (Add regression test for higher ranked fn pointer impl not general enough)
- rust-lang/rust#160713 (Add regression test for rust-lang/rust#135287)
- rust-lang/rust#160720 (triagebot: add ubiratan to infra-ci)
- rust-lang/rust#160747 (rustc_errors: remove unused code)
- rust-lang/rust#160751 (Add regression test for incremental borrowck ICE with generic const exprs)
- rust-lang/rust#160753 (rustc_lint: remove unused rustc_attrs feature)
Failed merges:
- rust-lang/rust#158835 (rustc_passes: lint unused `#[path]` attributes on inline modules)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-libsRelevant to the library team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@guoxe@rustbot@jhpratt@Mark-Simulacrum@sertonix
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

fix: build-std on 32 bit arm with 64 bit time - #157609

Merged
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
guoxe:fix_build_std_arm32_gnu_time_bits64
Aug 8, 2026
Merged

fix: build-std on 32 bit arm with 64 bit time#157609
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
guoxe:fix_build_std_arm32_gnu_time_bits64

Conversation

@guoxe

@guoxeguoxe commented Jun 8, 2026

Copy link
Copy Markdown
Contributor

Infer target type of tv_usec.

The libc crate has support for building with 64 bit time on 32 bit
platforms, configurable currently via environment variable or cfg directives.
When building using 64 bit time, the tv_usec field will be aliased to __suseconds64_t instead of suseconds_t causing the build-std feature to not be able to build the standard library due to a type mismatch.
Adopting the same convention as in

letmut timeout = netc::timeval{tv_sec: secs,tv_usec: timeout.subsec_micros()as_};
fixes the issue, supporting 64 bit time on 32 bit arm platforms.

Another option would be using cfg attributes for this but from what I can tell there are no existing such attributes for time bits in the std and they would essentially duplicate the ones already present in the libc crate https://github.com/rust-lang/libc/blob/e27c7f1e2b281d7c551e6b394b897b4ff0a230e6/build.rs#L16

@rustbotrustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Jun 8, 2026
tv_usec: dur.subsec_micros() as libc::suseconds_t,
// If building 32 bit GNU platforms with 64 bit time, we need to call into here
// since `tv_usec` will in that case be an i64 aliased to __suseconds64_t
tv_usec: (dur.subsec_micros() as libc::suseconds_t).into(),

@sertonixsertonixJun 25, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

There is no reason to use as libc::suseconds_t if we ignore it anyways

Suggested change
tv_usec:(dur.subsec_micros()as libc::suseconds_t).into(),
tv_usec: dur.subsec_micros().into(),

View changes since the review

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

We can not use .into() directly here since subsec_micros returns an unsigned integer.

@guoxe
guoxeforce-pushed the fix_build_std_arm32_gnu_time_bits64 branch from dacadfc to 538573aCompareAugust 5, 2026 12:56
@guoxe
guoxe marked this pull request as ready for review August 5, 2026 14:12
@rustbotrustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 5, 2026
@rustbotrustbot removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Aug 5, 2026
@rustbot

Copy link
Copy Markdown
Collaborator

Thanks for the pull request, and welcome! The Rust Project is excited to review your changes, and you should hear from @jhpratt (or someone else) some time within the next two weeks.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

  • @rustbot author: the review is finished, PR author should check the comments and take action accordingly
  • @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue
Why was this reviewer chosen?

The reviewer was selected based on:

  • Owners of files modified in this PR: @ChrisDenton, libs
  • @ChrisDenton, libs expanded to 13 candidates
  • Random selection from JohnTitor, Mark-Simulacrum, clarfonthey, jhpratt, nia-e

@jhpratt

Copy link
Copy Markdown
Member

Stepping away from reviews temporarily.

@rustbot reroll

@Mark-Simulacrum

Copy link
Copy Markdown
Member

@bors squash

@rust-bors

This comment has been minimized.

* fix: build-std on 32 bit arm with 64 bit time
The libc crate has support for building with 64 bit time on 32 bit
platforms using the `RUST_LIBC_UNSTABLE_GNU_TIME_BITS` environment
variable.
Convert the tv_usec field to i64 via `into` in this case since
`suseconds_t` is still defined as an i32 when this environment variable
is set.
* Use placeholder as target type
This allows us to rely on the compiler to infer the correct target type,
mirroring the approach used in `sys/net/connection/socket/solid.rs`.
@rust-bors

rust-borsBot commented Aug 8, 2026

Copy link
Copy Markdown
Contributor

🔨 2 commits were squashed into f846f11.

@rust-bors
rust-borsBotforce-pushed the fix_build_std_arm32_gnu_time_bits64 branch from 538573a to f846f11CompareAugust 8, 2026 13:50
@Mark-Simulacrum

Copy link
Copy Markdown
Member

@bors r+ rollup

@rust-bors

rust-borsBot commented Aug 8, 2026

Copy link
Copy Markdown
Contributor

📌 Commit f846f11 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@rust-borsrust-borsBot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 8, 2026
rust-borsBot pushed a commit that referenced this pull request Aug 8, 2026
…uwer
Rollup of 12 pull requests
Successful merges:
- #160336 (Move attributes out of rustc_hir)
- #160715 (ignore tests with the GCC backend if we can't find `libgccjit.so` for the target)
- #157609 (fix: build-std on 32 bit arm with 64 bit time)
- #160613 (Add regression test for unsized non-last struct field with overlapping impls)
- #160658 (miri: implement more restrictive trivial-ABI checks)
- #160704 (sort lint names in lint pass declarations)
- #160707 (Add regression test for higher ranked fn pointer impl not general enough)
- #160713 (Add regression test for #135287)
- #160720 (triagebot: add ubiratan to infra-ci)
- #160747 (rustc_errors: remove unused code)
- #160751 (Add regression test for incremental borrowck ICE with generic const exprs)
- #160753 (rustc_lint: remove unused rustc_attrs feature)
Failed merges:
- #158835 (rustc_passes: lint unused `#[path]` attributes on inline modules)
@rust-bors
rust-borsBot merged commit 473809d into rust-lang:mainAug 8, 2026
13 checks passed
@rustbotrustbot added this to the 1.99.0 milestone Aug 8, 2026
rust-timer added a commit that referenced this pull request Aug 8, 2026
Rollup merge of #157609 - guoxe:fix_build_std_arm32_gnu_time_bits64, r=Mark-Simulacrum
fix: build-std on 32 bit arm with 64 bit time
Infer target type of `tv_usec`.
The libc crate has support for building with 64 bit time on 32 bit
platforms, configurable currently via environment variable or cfg directives.
When building using 64 bit time, the tv_usec field will be aliased to `__suseconds64_t` instead of `suseconds_t` causing the `build-std` feature to not be able to build the standard library due to a type mismatch.
Adopting the same convention as in https://github.com/rust-lang/rust/blob/1b29cfdbee8ee37333f4b24afb936350eb57e705/library/std/src/sys/net/connection/socket/solid.rs#L151 fixes the issue, supporting 64 bit time on 32 bit arm platforms.
Another option would be using cfg attributes for this but from what I can tell there are no existing such attributes for time bits in the std and they would essentially duplicate the ones already present in the libc crate https://github.com/rust-lang/libc/blob/e27c7f1e2b281d7c551e6b394b897b4ff0a230e6/build.rs#L16
pullBot pushed a commit to LeeeeeeM/miri that referenced this pull request Aug 9, 2026
…uwer
Rollup of 12 pull requests
Successful merges:
- rust-lang/rust#160336 (Move attributes out of rustc_hir)
- rust-lang/rust#160715 (ignore tests with the GCC backend if we can't find `libgccjit.so` for the target)
- rust-lang/rust#157609 (fix: build-std on 32 bit arm with 64 bit time)
- rust-lang/rust#160613 (Add regression test for unsized non-last struct field with overlapping impls)
- rust-lang/rust#160658 (miri: implement more restrictive trivial-ABI checks)
- rust-lang/rust#160704 (sort lint names in lint pass declarations)
- rust-lang/rust#160707 (Add regression test for higher ranked fn pointer impl not general enough)
- rust-lang/rust#160713 (Add regression test for rust-lang/rust#135287)
- rust-lang/rust#160720 (triagebot: add ubiratan to infra-ci)
- rust-lang/rust#160747 (rustc_errors: remove unused code)
- rust-lang/rust#160751 (Add regression test for incremental borrowck ICE with generic const exprs)
- rust-lang/rust#160753 (rustc_lint: remove unused rustc_attrs feature)
Failed merges:
- rust-lang/rust#158835 (rustc_passes: lint unused `#[path]` attributes on inline modules)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-libsRelevant to the library team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@guoxe@rustbot@jhpratt@Mark-Simulacrum@sertonix
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

fix: build-std on 32 bit arm with 64 bit time - #157609

Merged
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
guoxe:fix_build_std_arm32_gnu_time_bits64
Aug 8, 2026
Merged

fix: build-std on 32 bit arm with 64 bit time#157609
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
guoxe:fix_build_std_arm32_gnu_time_bits64

Conversation

@guoxe

@guoxeguoxe commented Jun 8, 2026

Copy link
Copy Markdown
Contributor

Infer target type of tv_usec.

The libc crate has support for building with 64 bit time on 32 bit
platforms, configurable currently via environment variable or cfg directives.
When building using 64 bit time, the tv_usec field will be aliased to __suseconds64_t instead of suseconds_t causing the build-std feature to not be able to build the standard library due to a type mismatch.
Adopting the same convention as in

letmut timeout = netc::timeval{tv_sec: secs,tv_usec: timeout.subsec_micros()as_};
fixes the issue, supporting 64 bit time on 32 bit arm platforms.

Another option would be using cfg attributes for this but from what I can tell there are no existing such attributes for time bits in the std and they would essentially duplicate the ones already present in the libc crate https://github.com/rust-lang/libc/blob/e27c7f1e2b281d7c551e6b394b897b4ff0a230e6/build.rs#L16

@rustbotrustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Jun 8, 2026
tv_usec: dur.subsec_micros() as libc::suseconds_t,
// If building 32 bit GNU platforms with 64 bit time, we need to call into here
// since `tv_usec` will in that case be an i64 aliased to __suseconds64_t
tv_usec: (dur.subsec_micros() as libc::suseconds_t).into(),

@sertonixsertonixJun 25, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

There is no reason to use as libc::suseconds_t if we ignore it anyways

Suggested change
tv_usec:(dur.subsec_micros()as libc::suseconds_t).into(),
tv_usec: dur.subsec_micros().into(),

View changes since the review

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

We can not use .into() directly here since subsec_micros returns an unsigned integer.

@guoxe
guoxeforce-pushed the fix_build_std_arm32_gnu_time_bits64 branch from dacadfc to 538573aCompareAugust 5, 2026 12:56
@guoxe
guoxe marked this pull request as ready for review August 5, 2026 14:12
@rustbotrustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 5, 2026
@rustbotrustbot removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Aug 5, 2026
@rustbot

Copy link
Copy Markdown
Collaborator

Thanks for the pull request, and welcome! The Rust Project is excited to review your changes, and you should hear from @jhpratt (or someone else) some time within the next two weeks.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

  • @rustbot author: the review is finished, PR author should check the comments and take action accordingly
  • @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue
Why was this reviewer chosen?

The reviewer was selected based on:

  • Owners of files modified in this PR: @ChrisDenton, libs
  • @ChrisDenton, libs expanded to 13 candidates
  • Random selection from JohnTitor, Mark-Simulacrum, clarfonthey, jhpratt, nia-e

@jhpratt

Copy link
Copy Markdown
Member

Stepping away from reviews temporarily.

@rustbot reroll

@Mark-Simulacrum

Copy link
Copy Markdown
Member

@bors squash

@rust-bors

This comment has been minimized.

* fix: build-std on 32 bit arm with 64 bit time
The libc crate has support for building with 64 bit time on 32 bit
platforms using the `RUST_LIBC_UNSTABLE_GNU_TIME_BITS` environment
variable.
Convert the tv_usec field to i64 via `into` in this case since
`suseconds_t` is still defined as an i32 when this environment variable
is set.
* Use placeholder as target type
This allows us to rely on the compiler to infer the correct target type,
mirroring the approach used in `sys/net/connection/socket/solid.rs`.
@rust-bors

rust-borsBot commented Aug 8, 2026

Copy link
Copy Markdown
Contributor

🔨 2 commits were squashed into f846f11.

@rust-bors
rust-borsBotforce-pushed the fix_build_std_arm32_gnu_time_bits64 branch from 538573a to f846f11CompareAugust 8, 2026 13:50
@Mark-Simulacrum

Copy link
Copy Markdown
Member

@bors r+ rollup

@rust-bors

rust-borsBot commented Aug 8, 2026

Copy link
Copy Markdown
Contributor

📌 Commit f846f11 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@rust-borsrust-borsBot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 8, 2026
rust-borsBot pushed a commit that referenced this pull request Aug 8, 2026
…uwer
Rollup of 12 pull requests
Successful merges:
- #160336 (Move attributes out of rustc_hir)
- #160715 (ignore tests with the GCC backend if we can't find `libgccjit.so` for the target)
- #157609 (fix: build-std on 32 bit arm with 64 bit time)
- #160613 (Add regression test for unsized non-last struct field with overlapping impls)
- #160658 (miri: implement more restrictive trivial-ABI checks)
- #160704 (sort lint names in lint pass declarations)
- #160707 (Add regression test for higher ranked fn pointer impl not general enough)
- #160713 (Add regression test for #135287)
- #160720 (triagebot: add ubiratan to infra-ci)
- #160747 (rustc_errors: remove unused code)
- #160751 (Add regression test for incremental borrowck ICE with generic const exprs)
- #160753 (rustc_lint: remove unused rustc_attrs feature)
Failed merges:
- #158835 (rustc_passes: lint unused `#[path]` attributes on inline modules)
@rust-bors
rust-borsBot merged commit 473809d into rust-lang:mainAug 8, 2026
13 checks passed
@rustbotrustbot added this to the 1.99.0 milestone Aug 8, 2026
rust-timer added a commit that referenced this pull request Aug 8, 2026
Rollup merge of #157609 - guoxe:fix_build_std_arm32_gnu_time_bits64, r=Mark-Simulacrum
fix: build-std on 32 bit arm with 64 bit time
Infer target type of `tv_usec`.
The libc crate has support for building with 64 bit time on 32 bit
platforms, configurable currently via environment variable or cfg directives.
When building using 64 bit time, the tv_usec field will be aliased to `__suseconds64_t` instead of `suseconds_t` causing the `build-std` feature to not be able to build the standard library due to a type mismatch.
Adopting the same convention as in https://github.com/rust-lang/rust/blob/1b29cfdbee8ee37333f4b24afb936350eb57e705/library/std/src/sys/net/connection/socket/solid.rs#L151 fixes the issue, supporting 64 bit time on 32 bit arm platforms.
Another option would be using cfg attributes for this but from what I can tell there are no existing such attributes for time bits in the std and they would essentially duplicate the ones already present in the libc crate https://github.com/rust-lang/libc/blob/e27c7f1e2b281d7c551e6b394b897b4ff0a230e6/build.rs#L16
pullBot pushed a commit to LeeeeeeM/miri that referenced this pull request Aug 9, 2026
…uwer
Rollup of 12 pull requests
Successful merges:
- rust-lang/rust#160336 (Move attributes out of rustc_hir)
- rust-lang/rust#160715 (ignore tests with the GCC backend if we can't find `libgccjit.so` for the target)
- rust-lang/rust#157609 (fix: build-std on 32 bit arm with 64 bit time)
- rust-lang/rust#160613 (Add regression test for unsized non-last struct field with overlapping impls)
- rust-lang/rust#160658 (miri: implement more restrictive trivial-ABI checks)
- rust-lang/rust#160704 (sort lint names in lint pass declarations)
- rust-lang/rust#160707 (Add regression test for higher ranked fn pointer impl not general enough)
- rust-lang/rust#160713 (Add regression test for rust-lang/rust#135287)
- rust-lang/rust#160720 (triagebot: add ubiratan to infra-ci)
- rust-lang/rust#160747 (rustc_errors: remove unused code)
- rust-lang/rust#160751 (Add regression test for incremental borrowck ICE with generic const exprs)
- rust-lang/rust#160753 (rustc_lint: remove unused rustc_attrs feature)
Failed merges:
- rust-lang/rust#158835 (rustc_passes: lint unused `#[path]` attributes on inline modules)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-libsRelevant to the library team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@guoxe@rustbot@jhpratt@Mark-Simulacrum@sertonix
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

fix: build-std on 32 bit arm with 64 bit time - #157609

Merged
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
guoxe:fix_build_std_arm32_gnu_time_bits64
Aug 8, 2026
Merged

fix: build-std on 32 bit arm with 64 bit time#157609
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
guoxe:fix_build_std_arm32_gnu_time_bits64

Conversation

@guoxe

@guoxeguoxe commented Jun 8, 2026

Copy link
Copy Markdown
Contributor

Infer target type of tv_usec.

The libc crate has support for building with 64 bit time on 32 bit
platforms, configurable currently via environment variable or cfg directives.
When building using 64 bit time, the tv_usec field will be aliased to __suseconds64_t instead of suseconds_t causing the build-std feature to not be able to build the standard library due to a type mismatch.
Adopting the same convention as in

letmut timeout = netc::timeval{tv_sec: secs,tv_usec: timeout.subsec_micros()as_};
fixes the issue, supporting 64 bit time on 32 bit arm platforms.

Another option would be using cfg attributes for this but from what I can tell there are no existing such attributes for time bits in the std and they would essentially duplicate the ones already present in the libc crate https://github.com/rust-lang/libc/blob/e27c7f1e2b281d7c551e6b394b897b4ff0a230e6/build.rs#L16

@rustbotrustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Jun 8, 2026
tv_usec: dur.subsec_micros() as libc::suseconds_t,
// If building 32 bit GNU platforms with 64 bit time, we need to call into here
// since `tv_usec` will in that case be an i64 aliased to __suseconds64_t
tv_usec: (dur.subsec_micros() as libc::suseconds_t).into(),

@sertonixsertonixJun 25, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

There is no reason to use as libc::suseconds_t if we ignore it anyways

Suggested change
tv_usec:(dur.subsec_micros()as libc::suseconds_t).into(),
tv_usec: dur.subsec_micros().into(),

View changes since the review

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

We can not use .into() directly here since subsec_micros returns an unsigned integer.

@guoxe
guoxeforce-pushed the fix_build_std_arm32_gnu_time_bits64 branch from dacadfc to 538573aCompareAugust 5, 2026 12:56
@guoxe
guoxe marked this pull request as ready for review August 5, 2026 14:12
@rustbotrustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 5, 2026
@rustbotrustbot removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Aug 5, 2026
@rustbot

Copy link
Copy Markdown
Collaborator

Thanks for the pull request, and welcome! The Rust Project is excited to review your changes, and you should hear from @jhpratt (or someone else) some time within the next two weeks.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

  • @rustbot author: the review is finished, PR author should check the comments and take action accordingly
  • @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue
Why was this reviewer chosen?

The reviewer was selected based on:

  • Owners of files modified in this PR: @ChrisDenton, libs
  • @ChrisDenton, libs expanded to 13 candidates
  • Random selection from JohnTitor, Mark-Simulacrum, clarfonthey, jhpratt, nia-e

@jhpratt

Copy link
Copy Markdown
Member

Stepping away from reviews temporarily.

@rustbot reroll

@Mark-Simulacrum

Copy link
Copy Markdown
Member

@bors squash

@rust-bors

This comment has been minimized.

* fix: build-std on 32 bit arm with 64 bit time
The libc crate has support for building with 64 bit time on 32 bit
platforms using the `RUST_LIBC_UNSTABLE_GNU_TIME_BITS` environment
variable.
Convert the tv_usec field to i64 via `into` in this case since
`suseconds_t` is still defined as an i32 when this environment variable
is set.
* Use placeholder as target type
This allows us to rely on the compiler to infer the correct target type,
mirroring the approach used in `sys/net/connection/socket/solid.rs`.
@rust-bors

rust-borsBot commented Aug 8, 2026

Copy link
Copy Markdown
Contributor

🔨 2 commits were squashed into f846f11.

@rust-bors
rust-borsBotforce-pushed the fix_build_std_arm32_gnu_time_bits64 branch from 538573a to f846f11CompareAugust 8, 2026 13:50
@Mark-Simulacrum

Copy link
Copy Markdown
Member

@bors r+ rollup

@rust-bors

rust-borsBot commented Aug 8, 2026

Copy link
Copy Markdown
Contributor

📌 Commit f846f11 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@rust-borsrust-borsBot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 8, 2026
rust-borsBot pushed a commit that referenced this pull request Aug 8, 2026
…uwer
Rollup of 12 pull requests
Successful merges:
- #160336 (Move attributes out of rustc_hir)
- #160715 (ignore tests with the GCC backend if we can't find `libgccjit.so` for the target)
- #157609 (fix: build-std on 32 bit arm with 64 bit time)
- #160613 (Add regression test for unsized non-last struct field with overlapping impls)
- #160658 (miri: implement more restrictive trivial-ABI checks)
- #160704 (sort lint names in lint pass declarations)
- #160707 (Add regression test for higher ranked fn pointer impl not general enough)
- #160713 (Add regression test for #135287)
- #160720 (triagebot: add ubiratan to infra-ci)
- #160747 (rustc_errors: remove unused code)
- #160751 (Add regression test for incremental borrowck ICE with generic const exprs)
- #160753 (rustc_lint: remove unused rustc_attrs feature)
Failed merges:
- #158835 (rustc_passes: lint unused `#[path]` attributes on inline modules)
@rust-bors
rust-borsBot merged commit 473809d into rust-lang:mainAug 8, 2026
13 checks passed
@rustbotrustbot added this to the 1.99.0 milestone Aug 8, 2026
rust-timer added a commit that referenced this pull request Aug 8, 2026
Rollup merge of #157609 - guoxe:fix_build_std_arm32_gnu_time_bits64, r=Mark-Simulacrum
fix: build-std on 32 bit arm with 64 bit time
Infer target type of `tv_usec`.
The libc crate has support for building with 64 bit time on 32 bit
platforms, configurable currently via environment variable or cfg directives.
When building using 64 bit time, the tv_usec field will be aliased to `__suseconds64_t` instead of `suseconds_t` causing the `build-std` feature to not be able to build the standard library due to a type mismatch.
Adopting the same convention as in https://github.com/rust-lang/rust/blob/1b29cfdbee8ee37333f4b24afb936350eb57e705/library/std/src/sys/net/connection/socket/solid.rs#L151 fixes the issue, supporting 64 bit time on 32 bit arm platforms.
Another option would be using cfg attributes for this but from what I can tell there are no existing such attributes for time bits in the std and they would essentially duplicate the ones already present in the libc crate https://github.com/rust-lang/libc/blob/e27c7f1e2b281d7c551e6b394b897b4ff0a230e6/build.rs#L16
pullBot pushed a commit to LeeeeeeM/miri that referenced this pull request Aug 9, 2026
…uwer
Rollup of 12 pull requests
Successful merges:
- rust-lang/rust#160336 (Move attributes out of rustc_hir)
- rust-lang/rust#160715 (ignore tests with the GCC backend if we can't find `libgccjit.so` for the target)
- rust-lang/rust#157609 (fix: build-std on 32 bit arm with 64 bit time)
- rust-lang/rust#160613 (Add regression test for unsized non-last struct field with overlapping impls)
- rust-lang/rust#160658 (miri: implement more restrictive trivial-ABI checks)
- rust-lang/rust#160704 (sort lint names in lint pass declarations)
- rust-lang/rust#160707 (Add regression test for higher ranked fn pointer impl not general enough)
- rust-lang/rust#160713 (Add regression test for rust-lang/rust#135287)
- rust-lang/rust#160720 (triagebot: add ubiratan to infra-ci)
- rust-lang/rust#160747 (rustc_errors: remove unused code)
- rust-lang/rust#160751 (Add regression test for incremental borrowck ICE with generic const exprs)
- rust-lang/rust#160753 (rustc_lint: remove unused rustc_attrs feature)
Failed merges:
- rust-lang/rust#158835 (rustc_passes: lint unused `#[path]` attributes on inline modules)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-libsRelevant to the library team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@guoxe@rustbot@jhpratt@Mark-Simulacrum@sertonix
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

fix: build-std on 32 bit arm with 64 bit time - #157609

Merged
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
guoxe:fix_build_std_arm32_gnu_time_bits64
Aug 8, 2026
Merged

fix: build-std on 32 bit arm with 64 bit time#157609
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
guoxe:fix_build_std_arm32_gnu_time_bits64

Conversation

@guoxe

@guoxeguoxe commented Jun 8, 2026

Copy link
Copy Markdown
Contributor

Infer target type of tv_usec.

The libc crate has support for building with 64 bit time on 32 bit
platforms, configurable currently via environment variable or cfg directives.
When building using 64 bit time, the tv_usec field will be aliased to __suseconds64_t instead of suseconds_t causing the build-std feature to not be able to build the standard library due to a type mismatch.
Adopting the same convention as in

letmut timeout = netc::timeval{tv_sec: secs,tv_usec: timeout.subsec_micros()as_};
fixes the issue, supporting 64 bit time on 32 bit arm platforms.

Another option would be using cfg attributes for this but from what I can tell there are no existing such attributes for time bits in the std and they would essentially duplicate the ones already present in the libc crate https://github.com/rust-lang/libc/blob/e27c7f1e2b281d7c551e6b394b897b4ff0a230e6/build.rs#L16

@rustbotrustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Jun 8, 2026
tv_usec: dur.subsec_micros() as libc::suseconds_t,
// If building 32 bit GNU platforms with 64 bit time, we need to call into here
// since `tv_usec` will in that case be an i64 aliased to __suseconds64_t
tv_usec: (dur.subsec_micros() as libc::suseconds_t).into(),

@sertonixsertonixJun 25, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

There is no reason to use as libc::suseconds_t if we ignore it anyways

Suggested change
tv_usec:(dur.subsec_micros()as libc::suseconds_t).into(),
tv_usec: dur.subsec_micros().into(),

View changes since the review

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

We can not use .into() directly here since subsec_micros returns an unsigned integer.

@guoxe
guoxeforce-pushed the fix_build_std_arm32_gnu_time_bits64 branch from dacadfc to 538573aCompareAugust 5, 2026 12:56
@guoxe
guoxe marked this pull request as ready for review August 5, 2026 14:12
@rustbotrustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 5, 2026
@rustbotrustbot removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Aug 5, 2026
@rustbot

Copy link
Copy Markdown
Collaborator

Thanks for the pull request, and welcome! The Rust Project is excited to review your changes, and you should hear from @jhpratt (or someone else) some time within the next two weeks.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

  • @rustbot author: the review is finished, PR author should check the comments and take action accordingly
  • @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue
Why was this reviewer chosen?

The reviewer was selected based on:

  • Owners of files modified in this PR: @ChrisDenton, libs
  • @ChrisDenton, libs expanded to 13 candidates
  • Random selection from JohnTitor, Mark-Simulacrum, clarfonthey, jhpratt, nia-e

@jhpratt

Copy link
Copy Markdown
Member

Stepping away from reviews temporarily.

@rustbot reroll

@Mark-Simulacrum

Copy link
Copy Markdown
Member

@bors squash

@rust-bors

This comment has been minimized.

* fix: build-std on 32 bit arm with 64 bit time
The libc crate has support for building with 64 bit time on 32 bit
platforms using the `RUST_LIBC_UNSTABLE_GNU_TIME_BITS` environment
variable.
Convert the tv_usec field to i64 via `into` in this case since
`suseconds_t` is still defined as an i32 when this environment variable
is set.
* Use placeholder as target type
This allows us to rely on the compiler to infer the correct target type,
mirroring the approach used in `sys/net/connection/socket/solid.rs`.
@rust-bors

rust-borsBot commented Aug 8, 2026

Copy link
Copy Markdown
Contributor

🔨 2 commits were squashed into f846f11.

@rust-bors
rust-borsBotforce-pushed the fix_build_std_arm32_gnu_time_bits64 branch from 538573a to f846f11CompareAugust 8, 2026 13:50
@Mark-Simulacrum

Copy link
Copy Markdown
Member

@bors r+ rollup

@rust-bors

rust-borsBot commented Aug 8, 2026

Copy link
Copy Markdown
Contributor

📌 Commit f846f11 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@rust-borsrust-borsBot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 8, 2026
rust-borsBot pushed a commit that referenced this pull request Aug 8, 2026
…uwer
Rollup of 12 pull requests
Successful merges:
- #160336 (Move attributes out of rustc_hir)
- #160715 (ignore tests with the GCC backend if we can't find `libgccjit.so` for the target)
- #157609 (fix: build-std on 32 bit arm with 64 bit time)
- #160613 (Add regression test for unsized non-last struct field with overlapping impls)
- #160658 (miri: implement more restrictive trivial-ABI checks)
- #160704 (sort lint names in lint pass declarations)
- #160707 (Add regression test for higher ranked fn pointer impl not general enough)
- #160713 (Add regression test for #135287)
- #160720 (triagebot: add ubiratan to infra-ci)
- #160747 (rustc_errors: remove unused code)
- #160751 (Add regression test for incremental borrowck ICE with generic const exprs)
- #160753 (rustc_lint: remove unused rustc_attrs feature)
Failed merges:
- #158835 (rustc_passes: lint unused `#[path]` attributes on inline modules)
@rust-bors
rust-borsBot merged commit 473809d into rust-lang:mainAug 8, 2026
13 checks passed
@rustbotrustbot added this to the 1.99.0 milestone Aug 8, 2026
rust-timer added a commit that referenced this pull request Aug 8, 2026
Rollup merge of #157609 - guoxe:fix_build_std_arm32_gnu_time_bits64, r=Mark-Simulacrum
fix: build-std on 32 bit arm with 64 bit time
Infer target type of `tv_usec`.
The libc crate has support for building with 64 bit time on 32 bit
platforms, configurable currently via environment variable or cfg directives.
When building using 64 bit time, the tv_usec field will be aliased to `__suseconds64_t` instead of `suseconds_t` causing the `build-std` feature to not be able to build the standard library due to a type mismatch.
Adopting the same convention as in https://github.com/rust-lang/rust/blob/1b29cfdbee8ee37333f4b24afb936350eb57e705/library/std/src/sys/net/connection/socket/solid.rs#L151 fixes the issue, supporting 64 bit time on 32 bit arm platforms.
Another option would be using cfg attributes for this but from what I can tell there are no existing such attributes for time bits in the std and they would essentially duplicate the ones already present in the libc crate https://github.com/rust-lang/libc/blob/e27c7f1e2b281d7c551e6b394b897b4ff0a230e6/build.rs#L16
pullBot pushed a commit to LeeeeeeM/miri that referenced this pull request Aug 9, 2026
…uwer
Rollup of 12 pull requests
Successful merges:
- rust-lang/rust#160336 (Move attributes out of rustc_hir)
- rust-lang/rust#160715 (ignore tests with the GCC backend if we can't find `libgccjit.so` for the target)
- rust-lang/rust#157609 (fix: build-std on 32 bit arm with 64 bit time)
- rust-lang/rust#160613 (Add regression test for unsized non-last struct field with overlapping impls)
- rust-lang/rust#160658 (miri: implement more restrictive trivial-ABI checks)
- rust-lang/rust#160704 (sort lint names in lint pass declarations)
- rust-lang/rust#160707 (Add regression test for higher ranked fn pointer impl not general enough)
- rust-lang/rust#160713 (Add regression test for rust-lang/rust#135287)
- rust-lang/rust#160720 (triagebot: add ubiratan to infra-ci)
- rust-lang/rust#160747 (rustc_errors: remove unused code)
- rust-lang/rust#160751 (Add regression test for incremental borrowck ICE with generic const exprs)
- rust-lang/rust#160753 (rustc_lint: remove unused rustc_attrs feature)
Failed merges:
- rust-lang/rust#158835 (rustc_passes: lint unused `#[path]` attributes on inline modules)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-libsRelevant to the library team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@guoxe@rustbot@jhpratt@Mark-Simulacrum@sertonix