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.

Sign up for GitHub

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

Jump to bottom

Simplify implementation of -Z gcc-ld #97375

Merged
merged 1 commit into from
May 26, 2022
Merged

Simplify implementation of -Z gcc-ld #97375

merged 1 commit into from
May 26, 2022

Conversation

petrochenkov
Copy link
Contributor

@petrochenkov petrochenkov commented May 24, 2022 •
edited
Loading

  • The logic is now unified for all targets (wasm targets should also be supported now)
  • Additional "symlink" files like ld64 are eliminated
  • lld-wrapper is used for propagating the correct lld flavor
  • Cleanup "unwrap or exit" logic in lld-wrapper

cc #97352
r? @bjorn3

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label May 24, 2022
@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 24, 2022
@petrochenkov petrochenkov mentioned this pull request May 24, 2022
Closed
@bjorn3
Copy link
Member

bjorn3 commented May 25, 2022

r=me with or without the assertion I mentioned in #97375 (comment) added.

@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 May 25, 2022
@petrochenkov petrochenkov mentioned this pull request May 25, 2022
Closed
@petrochenkov
Simplify implementation of -Z gcc-ld
2984bf6 
- The logic is now unified for all targets (wasm targets should also be supported now)
- Additional "symlink" files like `ld64` are eliminated
- lld-wrapper is used for propagating the correct lld flavor
- Cleanup "unwrap or exit" logic in lld-wrapper
@petrochenkov
Copy link
Contributor Author

Updated, I've also cleaned up the "unwrap or exit" traits in lld-wrapper.
@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 25, 2022
@bjorn3
Copy link
Member

bjorn3 commented May 25, 2022

@bors r+

@bors
Copy link
Contributor

bors commented May 25, 2022

📌 Commit 2984bf6 has been approved by bjorn3

@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 May 25, 2022
@GuillaumeGomez GuillaumeGomez mentioned this pull request May 25, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request May 25, 2022
@bors
Auto merge of rust-lang#97409 - GuillaumeGomez:rollup-808v9ge, r=Guil…
464ec64 
…laumeGomez

Rollup of 4 pull requests

Successful merges:

 - rust-lang#97317 (Allow to click on setting text)
 - rust-lang#97375 (Simplify implementation of `-Z gcc-ld`)
 - rust-lang#97394 (Add more eslint rules)
 - rust-lang#97407 (Update books)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit b792741 into rust-lang:master May 26, 2022
@rustbot rustbot added this to the 1.63.0 milestone May 26, 2022
This was referenced May 31, 2022
Closed
Closed
@petrochenkov petrochenkov mentioned this pull request Aug 6, 2022
Merged
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Sep 1, 2022
@matthiaskrgr
Rollup merge of rust-lang#100200 - petrochenkov:zgccld2, r=lqd,Mark-S…
6c60a4a 
…imulacrum

Change implementation of `-Z gcc-ld` and `lld-wrapper` again

This PR partially reverts rust-lang#97375 and uses the strategy described in rust-lang#97402 (comment) instead, thus fixes rust-lang#97755.
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Sep 1, 2022
@Dylan-DPC
Rollup merge of rust-lang#100200 - petrochenkov:zgccld2, r=lqd,Mark-S…
07af938 
…imulacrum

Change implementation of `-Z gcc-ld` and `lld-wrapper` again

This PR partially reverts rust-lang#97375 and uses the strategy described in rust-lang#97402 (comment) instead, thus fixes rust-lang#97755.
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Sep 1, 2022
@Dylan-DPC
Rollup merge of rust-lang#100200 - petrochenkov:zgccld2, r=lqd,Mark-S…
2e4b24e 
…imulacrum

Change implementation of `-Z gcc-ld` and `lld-wrapper` again

This PR partially reverts rust-lang#97375 and uses the strategy described in rust-lang#97402 (comment) instead, thus fixes rust-lang#97755.
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Sep 1, 2022
@Dylan-DPC
Rollup merge of rust-lang#100200 - petrochenkov:zgccld2, r=lqd,Mark-S…
211a525 
…imulacrum

Change implementation of `-Z gcc-ld` and `lld-wrapper` again

This PR partially reverts rust-lang#97375 and uses the strategy described in rust-lang#97402 (comment) instead, thus fixes rust-lang#97755.
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Sep 2, 2022
@Dylan-DPC
Rollup merge of rust-lang#100200 - petrochenkov:zgccld2, r=lqd,Mark-S…
c772bbf 
…imulacrum

Change implementation of `-Z gcc-ld` and `lld-wrapper` again

This PR partially reverts rust-lang#97375 and uses the strategy described in rust-lang#97402 (comment) instead, thus fixes rust-lang#97755.
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Sep 2, 2022
@Dylan-DPC
Rollup merge of rust-lang#100200 - petrochenkov:zgccld2, r=lqd,Mark-S…
8434dc4 
…imulacrum

Change implementation of `-Z gcc-ld` and `lld-wrapper` again

This PR partially reverts rust-lang#97375 and uses the strategy described in rust-lang#97402 (comment) instead, thus fixes rust-lang#97755.
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Sep 2, 2022
@Dylan-DPC
Rollup merge of rust-lang#100200 - petrochenkov:zgccld2, r=lqd,Mark-S…
b15dd6e 
…imulacrum

Change implementation of `-Z gcc-ld` and `lld-wrapper` again

This PR partially reverts rust-lang#97375 and uses the strategy described in rust-lang#97402 (comment) instead, thus fixes rust-lang#97755.
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Sep 2, 2022
@Dylan-DPC
Rollup merge of rust-lang#100200 - petrochenkov:zgccld2, r=lqd,Mark-S…
d9f11d2 
…imulacrum

Change implementation of `-Z gcc-ld` and `lld-wrapper` again

This PR partially reverts rust-lang#97375 and uses the strategy described in rust-lang#97402 (comment) instead, thus fixes rust-lang#97755.
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Sep 2, 2022
@matthiaskrgr
Rollup merge of rust-lang#100200 - petrochenkov:zgccld2, r=lqd,Mark-S…
9ec4dc6 
…imulacrum

Change implementation of `-Z gcc-ld` and `lld-wrapper` again

This PR partially reverts rust-lang#97375 and uses the strategy described in rust-lang#97402 (comment) instead, thus fixes rust-lang#97755.
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Sep 2, 2022
@Dylan-DPC
Rollup merge of rust-lang#100200 - petrochenkov:zgccld2, r=lqd,Mark-S…
7853752 
…imulacrum

Change implementation of `-Z gcc-ld` and `lld-wrapper` again

This PR partially reverts rust-lang#97375 and uses the strategy described in rust-lang#97402 (comment) instead, thus fixes rust-lang#97755.
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Sep 2, 2022
@Dylan-DPC
Rollup merge of rust-lang#100200 - petrochenkov:zgccld2, r=lqd,Mark-S…
2297274 
…imulacrum

Change implementation of `-Z gcc-ld` and `lld-wrapper` again

This PR partially reverts rust-lang#97375 and uses the strategy described in rust-lang#97402 (comment) instead, thus fixes rust-lang#97755.
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Sep 2, 2022
@matthiaskrgr
Rollup merge of rust-lang#100200 - petrochenkov:zgccld2, r=lqd,Mark-S…
ed37111 
…imulacrum

Change implementation of `-Z gcc-ld` and `lld-wrapper` again

This PR partially reverts rust-lang#97375 and uses the strategy described in rust-lang#97402 (comment) instead, thus fixes rust-lang#97755.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bjorn3 bjorn3 bjorn3 requested changes

@hkratz hkratz hkratz left review comments

Assignees

@bjorn3 bjorn3

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
Milestone
1.63.0
Development

Successfully merging this pull request may close these issues.
6 participants
@petrochenkov @rust-highfive @bjorn3 @bors @hkratz @rustbot