Skip to content

Conversation

nbdd0121
Copy link
Member

Fix #96498

This is based on top of #96444.

r? @petrochenkov

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Apr 28, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 28, 2022
@petrochenkov petrochenkov added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 28, 2022
@petrochenkov
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented Apr 28, 2022

📌 Commit 0fce0db has been approved by petrochenkov

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 28, 2022
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Apr 29, 2022
Add `@feat.00` symbol to symbols.o for COFF

Fix rust-lang#96498

This is based on top of rust-lang#96444.

r? `@petrochenkov`
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 29, 2022
Rollup of 5 pull requests

Successful merges:

 - rust-lang#96477 (Update data layout string for wasm64-unknown-unknown)
 - rust-lang#96481 (HashMap doc: Don't use monospace font for 'Entry Api')
 - rust-lang#96492 (Revert "Re-export core::ffi types from std::ffi")
 - rust-lang#96516 (Revert diagnostic duplication and accidental stabilization)
 - rust-lang#96523 (Add ``@feat.00`` symbol to symbols.o for COFF)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 48199e0 into rust-lang:master Apr 29, 2022
@rustbot rustbot added this to the 1.62.0 milestone Apr 29, 2022
@nbdd0121 nbdd0121 deleted the windows branch April 29, 2022 12:16
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-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

i686-unknown-uefi rust-lld error: symbols.o is not compatible with SEH
5 participants