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

Several changes to libunwind for SGX target #57803

Merged
merged 2 commits into from
Jan 25, 2019

Conversation

jethrogb
Copy link
Contributor

@jethrogb jethrogb commented Jan 21, 2019

Two fixes:

Upstream changes (fortanix/llvm-project#2, fortanix/llvm-project#3):

  • b7357de Avoid too new relocation types being emitted
  • 0feefe5 Use new symbol names to call Rust allocator

Fixes fortanix/rust-sgx#65

@rust-highfive
Copy link
Collaborator

r? @alexcrichton

(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 Jan 21, 2019
@jethrogb jethrogb changed the title Update libunwind for SGX target Several changes to libunwind for SGX target Jan 21, 2019
@jethrogb jethrogb changed the title Several changes to libunwind for SGX target [WIP] Several changes to libunwind for SGX target Jan 21, 2019
@jethrogb
Copy link
Contributor Author

WIP because I need to update the upstream git hash after fortanix/llvm-project#3 lands.

@jethrogb jethrogb changed the title [WIP] Several changes to libunwind for SGX target Several changes to libunwind for SGX target Jan 21, 2019
@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Jan 22, 2019

📌 Commit 6abba95 has been approved by alexcrichton

@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 Jan 22, 2019
Centril added a commit to Centril/rust that referenced this pull request Jan 24, 2019
…lexcrichton

Several changes to libunwind for SGX target

Two fixes:
* rust-lang#34978 bites again!
* __rust_alloc are actually private symbols. Add new public versions. Also, these ones are `extern "C"`.

Upstream changes (fortanix/llvm-project#2, fortanix/llvm-project#3):
* b7357de Avoid too new relocation types being emitted
* 0feefe5 Use new symbol names to call Rust allocator

Fixes fortanix/rust-sgx#65
bors added a commit that referenced this pull request Jan 24, 2019
Rollup of 9 pull requests

Successful merges:

 - #57380 (Fix Instant/Duration math precision & associativity on Windows)
 - #57606 (Get rid of the fake stack frame for reading from constants)
 - #57803 (Several changes to libunwind for SGX target)
 - #57846 (rustdoc: fix ICE from loading proc-macro stubs)
 - #57860 (Add os::fortanix_sgx::ffi module)
 - #57861 (Don't export table by default in wasm)
 - #57863 (Add suggestion for incorrect field syntax.)
 - #57867 (Fix std::future::from_generator documentation)
 - #57873 (Stabilize no_panic_pow)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Jan 25, 2019

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

@bors bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 25, 2019
@bors bors merged commit 6abba95 into rust-lang:master Jan 25, 2019
@workingjubilee workingjubilee added the O-SGX Target: SGX label Jul 30, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
O-SGX Target: SGX S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Issue linking libunwind in release mode when using LTO
5 participants