Skip to content

[LLVM] Fix an assertion when a weak symbol is defined in global_asm. - #43313

Merged
bors merged 1 commit into
rust-lang:masterfrom
pftbest:fix_asm
Jul 21, 2017
Merged

[LLVM] Fix an assertion when a weak symbol is defined in global_asm.#43313
bors merged 1 commit into
rust-lang:masterfrom
pftbest:fix_asm

Conversation

@pftbest

@pftbestpftbest commented Jul 18, 2017

Copy link
Copy Markdown
Contributor

This change will fix the issue from
rust-embedded/svd2rust#130

cc @japaric
r? @alexcrichton

@rust-highfive

rust-highfive commented Jul 18, 2017

Copy link
Copy Markdown
Contributor

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

alexcrichton commented Jul 18, 2017

Copy link
Copy Markdown
Member

@bors: r+

@bors

bors commented Jul 18, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 9b8c223 has been approved by alexcrichton

@japaric

japaric commented Jul 18, 2017

Copy link
Copy Markdown
Contributor

Wow, that was fast. ❤️ @pftbest

@japaricjaparic mentioned this pull request Jul 18, 2017
Merged
@arielb1arielb1 added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jul 18, 2017
@bors

bors commented Jul 19, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 9b8c223 with merge 174ba0164f5bbf38964d11454517800640313b59...

@bors

bors commented Jul 19, 2017

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-appveyor

@pftbest

pftbest commented Jul 19, 2017

Copy link
Copy Markdown
ContributorAuthor

SSL connect error?

@alexcrichton

alexcrichton commented Jul 19, 2017 via email

Copy link
Copy Markdown
Member

@japaricjaparic mentioned this pull request Jul 20, 2017
Closed
@bors

bors commented Jul 20, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 9b8c223 with merge 2d30351020147725bd5bc81d9478e744a2c70869...

@bors

bors commented Jul 20, 2017

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

@TimNN

TimNN commented Jul 21, 2017

Copy link
Copy Markdown
Contributor

@bors retry

  • Mac Builder did not start.

TimNN added a commit to TimNN/rust that referenced this pull request Jul 21, 2017
@TimNN
Rollup merge ofrust-lang#43313- pftbest:fix_asm, r=alexcrichton
e6ef4b9
[LLVM] Fix an assertion when a weak symbol is defined in global_asm.
This change will fix the issue from
rust-embedded/svd2rust#130
cc @japaric
r? @alexcrichton
@TimNNTimNN mentioned this pull request Jul 21, 2017
Closed
bors added a commit that referenced this pull request Jul 21, 2017
@bors
Auto merge of#43388- TimNN:rollup, r=TimNN
bf51b85
Rollup of 8 pull requests
- Successful merges: #43046, #43256, #43280, #43297, #43313, #43319, #43322, #43343
- Failed merges:
@bors

bors commented Jul 21, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 9b8c223 with merge 6c94965...

bors added a commit that referenced this pull request Jul 21, 2017
@bors
Auto merge of#43313- pftbest:fix_asm, r=alexcrichton
6c94965
[LLVM] Fix an assertion when a weak symbol is defined in global_asm.
This change will fix the issue from
rust-embedded/svd2rust#130
cc @japaric
r? @alexcrichton
@bors

bors commented Jul 21, 2017

Copy link
Copy Markdown
Collaborator

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

@bors
bors merged commit 9b8c223 into rust-lang:masterJul 21, 2017
@pftbest
pftbest deleted the fix_asm branch July 23, 2019 21:50
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@alexcrichtonalexcrichton

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.

7 participants

@pftbest@rust-highfive@alexcrichton@bors@japaric@TimNN@arielb1