Skip to content

Revert ebb326a and dcc45fa #178

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

Merged
merged 2 commits into from
Oct 9, 2024

Conversation

dianqk
Copy link
Member

@dianqk dianqk commented Oct 8, 2024

Fixes rust-lang/rust#131164.

This PR reverts llvm@ebb326a and llvm@dcc45fa.

The next stable (1.83.0) version of Rust will be October 17, 2024, and our beta backport decision is October 10, 2024. The next LLVM backport is likely to happen after this date. I think reverting this commit would be a better approach. At the same time, I've seen multiple regressions on llvm#87530.

I encountered some conflicts at lld/ELF/Driver.cpp and lld/ELF/LinkerScript.h. Please review carefully. :>

I have already run ninja -C build check-lld locally.

@dianqk dianqk requested review from a team, nikic and cuviper October 8, 2024 13:18
@dianqk
Copy link
Member Author

dianqk commented Oct 9, 2024

@cuviper Do you have time to review this PR? I'd like to nominate backport.

Copy link

@nikic nikic left a comment

Choose a reason for hiding this comment

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

A very tentative LGTM. The issue being fixed does not look important to me, and I'm not familiar enough with LLD to evaluate the risk of this change, especially so late in the release cycle. I can only hope that a revert is relatively safe...

@dianqk
Copy link
Member Author

dianqk commented Oct 9, 2024

Blessing. Considering that this is unrelated to the target, it may still have some potential impact, though I am not sure how many applications are using the linker script. Anyway, I think we can still decide during the final backport.

@dianqk dianqk merged commit 3a17f74 into rust-lang:rustc/19.1-2024-09-17 Oct 9, 2024
@dianqk dianqk deleted the revert-ebb326a branch October 9, 2024 13:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants