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

rustc_target: Avoid an inappropriate use of post_link_objects #72304

Merged
merged 1 commit into from
May 22, 2020
Merged

rustc_target: Avoid an inappropriate use of post_link_objects #72304

merged 1 commit into from
May 22, 2020

Conversation

petrochenkov
Copy link
Contributor

It isn't supposed to be used for linking libraries.
Also linking libunwind unconditionally (and not together with the src/libunwind crate) is suspicious.

@jethrogb @VardhanThigle
Could you verify that it works as expected?

@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

(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 May 17, 2020
@jethrogb
Copy link
Contributor

./x.py test --stage=1 --target=x86_64-fortanix-unknown-sgx src/libstd --no-doc passes. This includes tests like:

test sync::once::tests::poison_bad ... ok

So I think this change is acceptable

jethrogb
jethrogb reviewed May 18, 2020
View reviewed changes
src/libunwind/lib.rs Outdated Show resolved Hide resolved
@jethrogb
Copy link
Contributor

Related rust-lang/llvm-project#57

@nikomatsakis
Copy link
Contributor

r=me presuming folks say this is works for them, I suppose, but the truth is I don't know anything about this target. Is there a better reviewer out there?

dingelish
dingelish reviewed May 18, 2020
View reviewed changes
Copy link
Contributor

@dingelish dingelish left a comment •
edited
Loading

Choose a reason for hiding this comment

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

r=me presuming folks say this is works for them, I suppose, but the truth is I don't know anything about this target. Is there a better reviewer out there?

could you please add target_vendor = "fortanix" along with the target_env check? thanks! background: #57231

src/libunwind/lib.rs Outdated Show resolved Hide resolved
@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 19, 2020
@bors
Copy link
Contributor

bors commented May 20, 2020

☔ The latest upstream changes (presumably #71769) made this pull request unmergeable. Please resolve the merge conflicts.

@petrochenkov
Copy link
Contributor Author

@bors r=nikomatsakis,jethrogb,dingelish

@bors
Copy link
Contributor

bors commented May 20, 2020

📌 Commit ed1297c has been approved by nikomatsakis,jethrogb,dingelish

@bors
Copy link
Contributor

bors commented May 20, 2020

🌲 The tree is currently closed for pull requests below priority 9000, this pull request will be tested once the tree is reopened

@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 May 20, 2020
@RalfJung RalfJung mentioned this pull request May 22, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request May 22, 2020
@bors
Auto merge of rust-lang#72458 - RalfJung:rollup-g1w1vws, r=RalfJung
de6060b 
Rollup of 6 pull requests

Successful merges:

 - rust-lang#71607 (clarify interaction of pin drop guarantee and panics)
 - rust-lang#72125 (remove broken link)
 - rust-lang#72133 (Add target thumbv7a-uwp-windows-msvc)
 - rust-lang#72304 (rustc_target: Avoid an inappropriate use of `post_link_objects`)
 - rust-lang#72309 (Some renaming and minor refactoring for `NativeLibraryKind`)
 - rust-lang#72438 (Enable ARM TME (Transactional Memory Extensions))

Failed merges:

r? @ghost
@bors bors merged commit 0eba152 into rust-lang:master May 22, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jethrogb jethrogb jethrogb left review comments

@dingelish dingelish dingelish left review comments

Assignees

@nikomatsakis nikomatsakis

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@petrochenkov @rust-highfive @jethrogb @nikomatsakis @bors @dingelish