Skip to content

Update the wasi toolchain. #96907

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
Merged
merged 2 commits into from
May 17, 2022
Merged

Update the wasi toolchain. #96907

merged 2 commits into from
May 17, 2022

Conversation

sunfishcode
Copy link
Member

Update the WASI build to LLVM 14.0 and the wasi-libc version from wasi-sdk-15.

This will require a ci-mirrors.rust-lang.org file load. Specifically, we
need this LLVM release tarball uploaded to be downloadable from
this URL.

@sunfishcode
Update the wasi toolchain.
e8af822 
Update the WASI build to LLVM 14.0 and the wasi-libc version from wasi-sdk-15.

This will require a ci-mirrors.rust-lang.org file load. Specifically, we
need [this LLVM release tarball] uploaded to be downloadable from
[this URL].

[this LLVM release tarball]: https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.0/clang+llvm-14.0.0-x86_64-linux-gnu-ubuntu-18.04.tar.xz
[this URL]: https://ci-mirrors.rust-lang.org/rustc/2022-05-10-clang%2Bllvm-14.0.0-x86_64-linux-gnu-ubuntu-18.04.tar.xz
@rust-highfive
Copy link
Contributor

r? @Mark-Simulacrum

(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 May 10, 2022
@Mark-Simulacrum
Copy link
Member

I uploaded the file to our mirror bucket, so modulo comment r=me presuming 18.04 is OK.

@Mark-Simulacrum
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented May 15, 2022

📌 Commit e8af822 has been approved by Mark-Simulacrum

@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 15, 2022
@bors
Copy link
Collaborator

bors commented May 15, 2022

⌛ Testing commit e8af822 with merge 3009b4ca39d1328384ffd6268c0f5472d4d07e6c...

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Collaborator

bors commented May 16, 2022

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 16, 2022
@sunfishcode
Update how CC etc. are set in the wasi-libc Makefile.
4cc0cc7 
wasi-libc's Makefile changed how it detects the compiler to use; update
Rust's script to set `CC` directly to the compiler it installs.
@sunfishcode
Copy link
Member Author

The test failure was due to a change in how wasi-libc's Makefile picks up the CC to build with. I've now fixed this.

@Mark-Simulacrum
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented May 16, 2022

📌 Commit 4cc0cc7 has been approved by Mark-Simulacrum

@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 16, 2022
@bors
Copy link
Collaborator

bors commented May 16, 2022

⌛ Testing commit 4cc0cc7 with merge d5ab7be34ebfc59abc33f7201a41668f20c4b991...

@Mark-Simulacrum
Copy link
Member

@bors retry apple builder hanging

@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

@bors
Copy link
Collaborator

bors commented May 17, 2022

⌛ Testing commit 4cc0cc7 with merge 1e8cd63...

@bors
Copy link
Collaborator

bors commented May 17, 2022

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 1e8cd63 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 17, 2022
@bors bors merged commit 1e8cd63 into rust-lang:master May 17, 2022
@rustbot rustbot added this to the 1.63.0 milestone May 17, 2022
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (1e8cd63): comparison url.

Summary: This benchmark run did not return any relevant results.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

@sunfishcode sunfishcode deleted the sunfishcode/update-wasi branch May 22, 2022 15:19
@jonhoo
Copy link
Contributor

jonhoo commented Sep 23, 2022

I know I'm late to the game here, but I'm curious what the policy is on updating the specific commit of wasi-libc — does Rust give any guarantees about which version is used? If not, should it? Could totally be that the answer to both is "no", I just wanted to check :)

@sunfishcode
Copy link
Member Author

I don't believe Rust currently makes any guarantees about the specific commit of wasi-libc. wasi-libc currently attempts to preserve ABI compatibility.

In the future, wasi-libc may want to make some ABI-incompatible changes. When we reach that point, we'll coordinate that with other toolchains and figure out how to commincate it with users.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mark-Simulacrum Mark-Simulacrum Mark-Simulacrum left review comments

@bjorn3 bjorn3 bjorn3 left review comments

Assignees

@Mark-Simulacrum Mark-Simulacrum

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
1.63.0
Development

Successfully merging this pull request may close these issues.
9 participants
@sunfishcode @rust-highfive @Mark-Simulacrum @bors @rust-log-analyzer @rust-timer @jonhoo @bjorn3 @rustbot