Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

kmc-solid: Avoid the use of asm_const #90690

Merged
merged 1 commit into from
Nov 10, 2021

Conversation

kawadakk
Copy link
Contributor

@kawadakk kawadakk commented Nov 8, 2021

This PR removes the use of the now-separated-out asm_const compiler feature in std::sys::solid to fix the *-kmc-solid_* Tier 3 targets.

@rust-highfive
Copy link
Contributor

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 8, 2021
@Mark-Simulacrum
Copy link
Member

Out of interest, why this choice over enabling the relevant feature gate for std?

@kawadakk
Copy link
Contributor Author

Similar to #90348 (comment) - with the stage0 compiler not knowing about asm_const and the stage1 compiler requiring asm_const, there's no trivial way to use asm_const. Using a hard-coded constant is consistent with std::sys::windows::abort_internal as well.

@Mark-Simulacrum
Copy link
Member

Seems ok. I would've expected a cfg_attr(not(bootstrap), feature(asm_const)) to work, but I may be missing something. This also seems fine in the meantime anyway.

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Nov 10, 2021

📌 Commit f170770 has been approved by Mark-Simulacrum

@bors bors 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 Nov 10, 2021
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Nov 10, 2021
…=Mark-Simulacrum

kmc-solid: Avoid the use of `asm_const`

This PR removes the use of [the now-separated-out `asm_const` compiler feature][1] in `std::sys::solid` to fix the [`*-kmc-solid_*`](https://doc.rust-lang.org/nightly/rustc/platform-support/kmc-solid.html) Tier 3 targets.

[1]: rust-lang#90348
This was referenced Nov 10, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 10, 2021
…askrgr

Rollup of 3 pull requests

Successful merges:

 - rust-lang#90690 (kmc-solid: Avoid the use of `asm_const`)
 - rust-lang#90748 (Add a real tracking issue for `CommandExt::groups`)
 - rust-lang#90751 (Update books)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 5bc0936 into rust-lang:master Nov 10, 2021
@rustbot rustbot added this to the 1.58.0 milestone Nov 10, 2021
yanok pushed a commit to yanok/rust that referenced this pull request Nov 10, 2021
…askrgr

Rollup of 3 pull requests

Successful merges:

 - rust-lang#90690 (kmc-solid: Avoid the use of `asm_const`)
 - rust-lang#90748 (Add a real tracking issue for `CommandExt::groups`)
 - rust-lang#90751 (Update books)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@kawadakk kawadakk deleted the fix-kmc-solid-asm-const branch November 16, 2021 06:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants