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.

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

LLD is not supported on Darwin #60003

Merged
merged 1 commit into from
Apr 17, 2019
Merged

Conversation

petrhosek
Copy link
Contributor

Don't enable LLD when LTO is enabled on Darwin.

Don't enable LLD when LTO is enabled on Darwin.
@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 Apr 15, 2019
@petrhosek
Copy link
Contributor Author

For more context, the LTO and LLD combination is explicitly unsupported in LLVM, but ld64 supports ThinLTO so we should just rely on that.

@cramertj
Copy link
Member

@bors r? @cramertj
@bors r+

cc @alexcrichton should we have tests covering this path on OS X?

Context: LLD does not support LTO on Darwin.

@bors
Copy link
Contributor

bors commented Apr 15, 2019

📌 Commit eb8e426 has been approved by cramertj

@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 Apr 15, 2019
@alexcrichton
Copy link
Member

Ah yeah this should be fine, IIRC this was just turned on to force usage of LLD on Linux to actually perform ThinLTO. Currently we only perform ThinLTO on our Linux builders, but it's just time budget reasons we haven't enabled it elsewhere. This'll be good to have for when we do it for OSX!

While we don't currently have tests we don't have it enabled, so I'm sure we would have run into this had we enabled it on OSX :)

@bors
Copy link
Contributor

bors commented Apr 17, 2019

⌛ Testing commit eb8e426 with merge 8ef58a209f41a286f8a5f4762bd0b3fec643072a...

@fortanix-bot
Copy link

Build failed for target x86_64-fortanix-unknown-sgx - status

cc @jethrogb

@bors
Copy link
Contributor

bors commented Apr 17, 2019

💔 Test failed - status-appveyor

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 17, 2019
@cramertj
Copy link
Member

@bors retry

@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 Apr 17, 2019
bors added a commit that referenced this pull request Apr 17, 2019
SGX target: change re-entry abort logic

Even though re-entry after exit is generally not acceptable, there is a race condition where the enclave thinks it's exited but userspace doesn't know that yet. An entry during that time will currently result in an enclave panic (see #59997 (comment), #60003 (comment)). Instead of panicking, just do a regular exit on re-entry.

cc @jseyfried
Centril added a commit to Centril/rust that referenced this pull request Apr 17, 2019
LLD is not supported on Darwin

Don't enable LLD when LTO is enabled on Darwin.
bors added a commit that referenced this pull request Apr 17, 2019
Rollup of 5 pull requests

Successful merges:

 - #59128 (Emit ansi color codes in the `rendered` field of json diagnostics)
 - #59646 (const fn: Improve wording)
 - #59986 (Miri: refactor new allocation tagging)
 - #60003 (LLD is not supported on Darwin)
 - #60018 (Miri now supports entropy, but is still slow)

Failed merges:

r? @ghost
@bors bors merged commit eb8e426 into rust-lang:master Apr 17, 2019
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants