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

Upgrade to recent nightly channel #306

Merged
merged 4 commits into from
Dec 5, 2021
Merged

Conversation

mkroening
Copy link
Member

@mkroening mkroening commented Dec 1, 2021

Reopens #292.

Replaces #302.

See hermit-os/hermit-rs#169.

@mkroening mkroening self-assigned this Dec 1, 2021
@mkroening mkroening marked this pull request as draft December 1, 2021 21:41
@mkroening mkroening force-pushed the nightly branch 4 times, most recently from 564b76b to 4513578 Compare December 1, 2021 23:01
@mkroening mkroening force-pushed the nightly branch 2 times, most recently from 56d5540 to c68c598 Compare December 4, 2021 21:33
@mkroening
Copy link
Member Author

bors try

bors bot added a commit that referenced this pull request Dec 4, 2021
@bors
Copy link
Contributor

bors bot commented Dec 4, 2021

CI: Explicitly set build-std without std
Else, cargo unifies with rusty-hermit's outer .cargo/config.toml and
tries to build std for the kernel, which fails with:

error[E0432]: unresolved import `crate::sys::hermit::thread_local_dtor`
 --> /home/mkroening/.rustup/toolchains/nightly-2021-10-20-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/std/src/sys/hermit/thread.rs:9:25
  |
9 | use crate::sys::hermit::thread_local_dtor::run_dtors;
  |                         ^^^^^^^^^^^^^^^^^ could not find `thread_local_dtor` in `hermit`

error[E0432]: unresolved import `crate::sys::hermit::thread_local_dtor`
   --> /home/mkroening/.rustup/toolchains/nightly-2021-10-20-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/std/src/sys/hermit/mod.rs:122:29
    |
122 |     use crate::sys::hermit::thread_local_dtor::run_dtors;
    |                             ^^^^^^^^^^^^^^^^^ could not find `thread_local_dtor` in `hermit`
The kernel's target os was removed in rust-lang/rust#90404.
It is only used for x86_64 and not for aarch64.
Adjust filter on __rg_oom since the filter for `target_os = "hermit"` does not
work anymore for the kernel target: rust-lang/rust@bc6b2ac
Experimental features have been split off of the `asm` feature gate.
@mkroening
Copy link
Member Author

bors r+

@mkroening mkroening marked this pull request as ready for review December 5, 2021 00:22
bors bot added a commit that referenced this pull request Dec 5, 2021
306: Upgrade to recent nightly channel r=mkroening a=mkroening

Reopens #292.

Replaces #302.

See hermit-os/hermit-rs#169.

Co-authored-by: Martin Kröning <mkroening@posteo.net>
@mkroening
Copy link
Member Author

bors cancel

@bors
Copy link
Contributor

bors bot commented Dec 5, 2021

Canceled.

@mkroening
Copy link
Member Author

bors r+

bors bot added a commit that referenced this pull request Dec 5, 2021
306: Upgrade to recent nightly channel r=mkroening a=mkroening

Reopens #292.

Replaces #302.

See hermit-os/hermit-rs#169.

Co-authored-by: Martin Kröning <mkroening@posteo.net>
@bors
Copy link
Contributor

bors bot commented Dec 5, 2021

Build failed:

@mkroening
Copy link
Member Author

bors retry

bors bot added a commit that referenced this pull request Dec 5, 2021
306: Upgrade to recent nightly channel r=mkroening a=mkroening

Reopens #292.

Replaces #302.

See hermit-os/hermit-rs#169.

Co-authored-by: Martin Kröning <mkroening@posteo.net>
@bors
Copy link
Contributor

bors bot commented Dec 5, 2021

Build failed:

@mkroening
Copy link
Member Author

bors retry

bors bot added a commit that referenced this pull request Dec 5, 2021
306: Upgrade to recent nightly channel r=mkroening a=mkroening

Reopens #292.

Replaces #302.

See hermit-os/hermit-rs#169.

Co-authored-by: Martin Kröning <mkroening@posteo.net>
@bors
Copy link
Contributor

bors bot commented Dec 5, 2021

Build failed:

@stlankes
Copy link
Contributor

stlankes commented Dec 5, 2021

bors r+

@bors
Copy link
Contributor

bors bot commented Dec 5, 2021

@bors bors bot merged commit ce821ec into hermit-os:master Dec 5, 2021
@mkroening mkroening deleted the nightly branch December 5, 2021 06:02
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.

2 participants