Skip to content

rustc_target: Avoid an inappropriate use of post_link_objects - #72304

Merged
bors merged 1 commit into
rust-lang:masterfrom
petrochenkov:sgxunwind
May 22, 2020
Merged

rustc_target: Avoid an inappropriate use of post_link_objects#72304
bors merged 1 commit into
rust-lang:masterfrom
petrochenkov:sgxunwind

Conversation

@petrochenkov

@petrochenkovpetrochenkov commented May 17, 2020

Copy link
Copy Markdown
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

rust-highfive commented May 17, 2020

Copy link
Copy Markdown
Contributor

r? @nikomatsakis

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

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 17, 2020
@jethrogb

jethrogb commented May 18, 2020

Copy link
Copy Markdown
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
Comment threadsrc/libunwind/lib.rs Outdated
@jethrogb

jethrogb commented May 18, 2020

Copy link
Copy Markdown
Contributor

Related rust-lang/llvm-project#57

@nikomatsakis

nikomatsakis commented May 18, 2020

Copy link
Copy Markdown
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

@dingelishdingelish left a comment •
edited
Loading

Copy link
Copy Markdown
Contributor

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

Comment threadsrc/libunwind/lib.rs Outdated
@petrochenkovpetrochenkov 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

bors commented May 20, 2020

Copy link
Copy Markdown
Collaborator

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

@petrochenkov

petrochenkov commented May 20, 2020

Copy link
Copy Markdown
ContributorAuthor

@bors r=nikomatsakis,jethrogb,dingelish

@bors

bors commented May 20, 2020

Copy link
Copy Markdown
Collaborator

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

@bors

bors commented May 20, 2020

Copy link
Copy Markdown
Collaborator

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

@borsbors 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
@RalfJungRalfJung 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 ofrust-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:masterMay 22, 2020
@petrochenkov
petrochenkov deleted the sgxunwind branch February 22, 2025 18:41
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

2 more reviewers
@jethrogbjethrogbjethrogb left review comments
@dingelishdingelishdingelish left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@nikomatsakisnikomatsakis

Labels

S-waiting-on-borsStatus: 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