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

Bump LLVM submodule to fix MSP430 AsmPrinter and assembler syntax mismatch. #60985

Merged
merged 1 commit into from
May 21, 2019
Merged

Bump LLVM submodule to fix MSP430 AsmPrinter and assembler syntax mismatch. #60985

merged 1 commit into from
May 21, 2019

Conversation

cr1901
Copy link
Contributor

@cr1901 cr1901 commented May 20, 2019

Moving on to steps 9 and 10 of the llvm bugfix guide, now that Rust's copy of LLVM was updated.

This PR closes issue #59077. Nightlies following this PR should have working msp430 codegen again :D.

Thanks for the prompt response even though it took me a while to get this "simple" PR done!

@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.

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 20, 2019
@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented May 20, 2019

📌 Commit a775d11 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 May 20, 2019
Centril added a commit to Centril/rust that referenced this pull request May 21, 2019
@Centril
Rollup merge of rust-lang#60985 - cr1901:msp430-fix, r=alexcrichton
62afa76 
Bump LLVM submodule to fix MSP430 AsmPrinter and assembler syntax mismatch.

Moving on to steps 9 and 10 of the llvm bugfix [guide](https://rust-lang.github.io/rustc-guide/codegen/updating-llvm.html#bugfix-updates), now that Rust's copy of LLVM was [updated](rust-lang/llvm-project#13).

This PR closes issue rust-lang#59077. Nightlies following this PR should have working msp430 codegen again :D.

Thanks for the prompt response even though it took me a while to get this "simple" PR done!
@Centril Centril mentioned this pull request May 21, 2019
Closed
@bors
Copy link
Contributor

bors commented May 21, 2019

⌛ Testing commit a775d11 with merge 2d7bfa706fd54ba5ce36f9c0ef6c453afc479032...

@Centril
Copy link
Contributor

Centril commented May 21, 2019

@bors retry

@rust-highfive
Copy link
Collaborator

Your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log. 
Cloning into 'rust-lang/rust'...
travis_time:end:09908b50:start=1558399396066118869,finish=1558399401547924085,duration=5481805216
$ cd rust-lang/rust
$ git checkout -qf 2d7bfa706fd54ba5ce36f9c0ef6c453afc479032
fatal: reference is not a tree: 2d7bfa706fd54ba5ce36f9c0ef6c453afc479032
The command "git checkout -qf 2d7bfa706fd54ba5ce36f9c0ef6c453afc479032" failed and exited with 128 during .
Your build has been stopped.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@bors
Copy link
Contributor

bors commented May 21, 2019

⌛ Testing commit a775d11 with merge b7f6b8a...

bors added a commit that referenced this pull request May 21, 2019
@bors
Auto merge of #60985 - cr1901:msp430-fix, r=alexcrichton
b7f6b8a 
Bump LLVM submodule to fix MSP430 AsmPrinter and assembler syntax mismatch.

Moving on to steps 9 and 10 of the llvm bugfix [guide](https://rust-lang.github.io/rustc-guide/codegen/updating-llvm.html#bugfix-updates), now that Rust's copy of LLVM was [updated](rust-lang/llvm-project#13).

This PR closes issue #59077. Nightlies following this PR should have working msp430 codegen again :D.

Thanks for the prompt response even though it took me a while to get this "simple" PR done!
@bors
Copy link
Contributor

bors commented May 21, 2019

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 21, 2019
@bors bors merged commit a775d11 into rust-lang:master May 21, 2019
@cr1901 cr1901 mentioned this pull request Nov 27, 2019
Closed
@cr1901 cr1901 mentioned this pull request Mar 22, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@alexcrichton alexcrichton

Labels
merged-by-bors This PR was explicitly merged by bors. 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.
5 participants
@cr1901 @rust-highfive @alexcrichton @bors @Centril