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

LLVM: Update submodule to include SRet support patch for MSP430. #40257

Merged
merged 1 commit into from
Mar 12, 2017

Conversation

pftbest
Copy link
Contributor

@pftbest pftbest commented Mar 4, 2017

This patch is needed to fix #38824 on MSP430.
I know that LLVM 4 is coming soon, but it would be great to have at least one working nightly before the update.

cc @awygle
r? @alexcrichton

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @alexcrichton (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@alexcrichton
Copy link
Member

@bors: r+

Thanks!

@bors
Copy link
Contributor

bors commented Mar 6, 2017

📌 Commit 08d1c80 has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Mar 9, 2017

🔒 Merge conflict

@pftbest
Copy link
Contributor Author

pftbest commented Mar 9, 2017

Why does it say merge conflict?

@arielb1
Copy link
Contributor

arielb1 commented Mar 9, 2017

Not sure

@bors r=alexcrichton

@bors
Copy link
Contributor

bors commented Mar 9, 2017

💡 This pull request was already approved, no need to approve it again.

  • This pull request previously failed. You should add more commits to fix the bug, or use retry to trigger a build again.

@bors
Copy link
Contributor

bors commented Mar 9, 2017

📌 Commit 08d1c80 has been approved by alexcrichton

@arielb1
Copy link
Contributor

arielb1 commented Mar 9, 2017

@bors retry

@bors
Copy link
Contributor

bors commented Mar 9, 2017

🔒 Merge conflict

@alexcrichton
Copy link
Member

@bors: retry

alexcrichton added a commit to alexcrichton/rust that referenced this pull request Mar 10, 2017
LLVM: Update submodule to include SRet support patch for MSP430.

This patch is needed to fix rust-lang#38824 on MSP430.
I know that LLVM 4 is coming soon, but it would be great to have at least one working nightly before the update.

cc @awygle
r? @alexcrichton
@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Mar 10, 2017

📌 Commit 1c5584d has been approved by alexcrichton

alexcrichton added a commit to alexcrichton/rust that referenced this pull request Mar 10, 2017
LLVM: Update submodule to include SRet support patch for MSP430.

This patch is needed to fix rust-lang#38824 on MSP430.
I know that LLVM 4 is coming soon, but it would be great to have at least one working nightly before the update.

cc @awygle
r? @alexcrichton
@bors
Copy link
Contributor

bors commented Mar 11, 2017

⌛ Testing commit 1c5584d with merge 8a520f2...

@bors
Copy link
Contributor

bors commented Mar 11, 2017

💔 Test failed - status-travis

@alexcrichton
Copy link
Member

alexcrichton commented Mar 11, 2017 via email

@bors
Copy link
Contributor

bors commented Mar 12, 2017

⌛ Testing commit 1c5584d with merge f84a517...

bors added a commit that referenced this pull request Mar 12, 2017
LLVM: Update submodule to include SRet support patch for MSP430.

This patch is needed to fix #38824 on MSP430.
I know that LLVM 4 is coming soon, but it would be great to have at least one working nightly before the update.

cc @awygle
r? @alexcrichton
@bors
Copy link
Contributor

bors commented Mar 12, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing f84a517 to master...

@bors bors merged commit 1c5584d into rust-lang:master Mar 12, 2017
@pftbest pftbest deleted the sret_msp430 branch March 12, 2017 11:17
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.

LLVM assertion when using i128 with the NVPTX
5 participants