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

std: Upgrade compiler_builtins to fix wasi linkage #59643

Merged
merged 1 commit into from
Apr 5, 2019
Merged

std: Upgrade compiler_builtins to fix wasi linkage #59643

merged 1 commit into from
Apr 5, 2019

Conversation

alexcrichton
Copy link
Member

Turns out we needed to exclude a number of math functions on the
wasm32-unknown-wasi target, and this was fixed in 0.1.9 of
compiler-builtins and this is pulling in the fix to libstd's own build.

@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 2, 2019
@alexcrichton alexcrichton mentioned this pull request Apr 2, 2019
Closed
@sanxiyn
Copy link
Member

sanxiyn commented Apr 3, 2019

@bors r+

@bors
Copy link
Contributor

bors commented Apr 3, 2019

📌 Commit 7eb2efd has been approved by sanxiyn

@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 3, 2019
@mati865 mati865 mentioned this pull request Apr 3, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Apr 3, 2019
@Centril
Rollup merge of rust-lang#59643 - alexcrichton:wasi-symbols, r=sanxiyn
f35aed8 
std: Upgrade `compiler_builtins` to fix wasi linkage

Turns out we needed to exclude a number of math functions on the
`wasm32-unknown-wasi` target, and this was fixed in 0.1.9 of
compiler-builtins and this is pulling in the fix to libstd's own build.
@Centril Centril mentioned this pull request Apr 3, 2019
Closed
bors added a commit that referenced this pull request Apr 3, 2019
@bors
Auto merge of #59670 - Centril:rollup-bqa1xeq, r=Centril
487e71f 
Rollup of 5 pull requests

Successful merges:

 - #59076 (Include trailing comma in multiline Debug representation)
 - #59619 (wasi: Implement more of the standard library)
 - #59639 (Never return uninhabited values at all)
 - #59643 (std: Upgrade `compiler_builtins` to fix wasi linkage)
 - #59664 (Updated the documentation of spin_loop and spin_loop_hint)

Failed merges:

r? @ghost
Centril added a commit to Centril/rust that referenced this pull request Apr 3, 2019
@Centril
Rollup merge of rust-lang#59643 - alexcrichton:wasi-symbols, r=sanxiyn
0ea4e7b 
std: Upgrade `compiler_builtins` to fix wasi linkage

Turns out we needed to exclude a number of math functions on the
`wasm32-unknown-wasi` target, and this was fixed in 0.1.9 of
compiler-builtins and this is pulling in the fix to libstd's own build.
@Centril Centril mentioned this pull request Apr 3, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Apr 4, 2019
@Centril
Rollup merge of rust-lang#59643 - alexcrichton:wasi-symbols, r=sanxiyn
e75499d 
std: Upgrade `compiler_builtins` to fix wasi linkage

Turns out we needed to exclude a number of math functions on the
`wasm32-unknown-wasi` target, and this was fixed in 0.1.9 of
compiler-builtins and this is pulling in the fix to libstd's own build.
@Centril Centril mentioned this pull request Apr 4, 2019
Closed
@bors
Copy link
Contributor

bors commented Apr 4, 2019

☔ The latest upstream changes (presumably #59089) 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 Apr 4, 2019
@alexcrichton
Copy link
Member Author

@bors: r=sanxiyn

@bors
Copy link
Contributor

bors commented Apr 4, 2019

📌 Commit 822284d88b662b49a1553e04daa3c8d96323f0b7 has been approved by sanxiyn

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 4, 2019
@bors
Copy link
Contributor

bors commented Apr 4, 2019

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout wasi-symbols (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self wasi-symbols --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message 
warning: Cannot merge binary files: Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

@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 Apr 4, 2019
@alexcrichton
std: Upgrade compiler_builtins to fix wasi linkage
1bf04c9 
Turns out we needed to exclude a number of math functions on the
`wasm32-unknown-wasi` target, and this was fixed in 0.1.9 of
compiler-builtins and this is pulling in the fix to libstd's own build.
@alexcrichton
Copy link
Member Author

@bors: r=sanxiyn

@bors
Copy link
Contributor

bors commented Apr 4, 2019

📌 Commit 1bf04c9 has been approved by sanxiyn

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 4, 2019
Centril added a commit to Centril/rust that referenced this pull request Apr 5, 2019
@Centril
Rollup merge of rust-lang#59643 - alexcrichton:wasi-symbols, r=sanxiyn
1f05de7 
std: Upgrade `compiler_builtins` to fix wasi linkage

Turns out we needed to exclude a number of math functions on the
`wasm32-unknown-wasi` target, and this was fixed in 0.1.9 of
compiler-builtins and this is pulling in the fix to libstd's own build.
@Centril Centril mentioned this pull request Apr 5, 2019
Closed
@bors
Copy link
Contributor

bors commented Apr 5, 2019

⌛ Testing commit 1bf04c9 with merge a11083e...

bors added a commit that referenced this pull request Apr 5, 2019
@bors
Auto merge of #59643 - alexcrichton:wasi-symbols, r=sanxiyn
a11083e 
std: Upgrade `compiler_builtins` to fix wasi linkage

Turns out we needed to exclude a number of math functions on the
`wasm32-unknown-wasi` target, and this was fixed in 0.1.9 of
compiler-builtins and this is pulling in the fix to libstd's own build.
@bors
Copy link
Contributor

bors commented Apr 5, 2019

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 5, 2019
@bors bors merged commit 1bf04c9 into rust-lang:master Apr 5, 2019
@alexcrichton alexcrichton deleted the wasi-symbols branch May 1, 2019 17:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@nikomatsakis nikomatsakis

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
@alexcrichton @rust-highfive @sanxiyn @bors @nikomatsakis