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

Fix ntdll linkage issues on Windows UWP platforms #112484

Merged
merged 2 commits into from
Jun 11, 2023

Conversation

bdbai
Copy link
Contributor

@bdbai bdbai commented Jun 10, 2023

See discussion: #112265 (comment)

Static loading ntdll functions does not work for UWP programs, which will end up link errors complaining about missing symbols, or failure to pass the WACK tests. The breakage was introduced in #108262.

This PR basically reverts part of the changes in #108262 for UWP only, and fixes some lint suggestions.

@rustbot
Copy link
Collaborator

rustbot commented Jun 10, 2023

r? @ChrisDenton

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Jun 10, 2023
Copy link
Member

@ChrisDenton ChrisDenton left a comment

Choose a reason for hiding this comment

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

This looks good to me. I would just suggest a few very minor changes to update it to match the newer way of doing things.

@bdbai bdbai requested a review from ChrisDenton June 10, 2023 12:52
@ChrisDenton
Copy link
Member

Thanks!

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jun 10, 2023

📌 Commit cd523f2 has been approved by ChrisDenton

It is now in the queue for this repository.

@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 Jun 10, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 11, 2023
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#112475 (Fix issue for module name when surround the struct literal with parentheses)
 - rust-lang#112477 (Give more helpful progress messages in `Assemble`)
 - rust-lang#112484 (Fix ntdll linkage issues on Windows UWP platforms)
 - rust-lang#112492 (Migrate GUI colors test to original CSS color format)
 - rust-lang#112493 (iat selection: normalize self ty & completely erase bound vars)
 - rust-lang#112497 (abs_sub: fix typo 0[-:][+.]0)
 - rust-lang#112498 (Update links to Rust Reference in diagnostic)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit e4f6b3d into rust-lang:master Jun 11, 2023
@rustbot rustbot added this to the 1.72.0 milestone Jun 11, 2023
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. T-libs Relevant 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.

4 participants