Skip to content

Commit

Permalink
Auto merge of #3348 - mkroening:rm-unix-hermit, r=JohnTitor
Browse files Browse the repository at this point in the history
Hermit updates

This PR does three things related to the Hermit target:

1.  Close #3318.

    Non-unix Hermit has been supported since #1292 and unix Hermit does not exist anymore.

2.  Update Hermit docs.

    [HermitCore/RustyHermit has been renamed to just Hermit.](https://rust-osdev.com/this-month/2023-08/#hermit-os-kernel)
    I took the chance to simplify the Hermit module's docs.

3.  Add the `riscv64gc-unknown-hermit` target to docs and CI (rust-lang/rust#114004).
  • Loading branch information
bors committed Sep 21, 2023
2 parents e3e237d + 54f63b7 commit 6f31de3
Show file tree
Hide file tree
Showing 7 changed files with 3 additions and 1,039 deletions.
1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ targets = [
"riscv32imac-unknown-none-elf",
"riscv32imc-unknown-none-elf",
"riscv64gc-unknown-freebsd",
"riscv64gc-unknown-hermit",
"riscv64gc-unknown-linux-gnu",
"riscv64gc-unknown-linux-musl",
"riscv64gc-unknown-none-elf",
Expand Down
1 change: 1 addition & 0 deletions ci/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,7 @@ riscv32imac-unknown-none-elf \
riscv32imc-unknown-none-elf \
riscv32gc-unknown-linux-gnu \
riscv64gc-unknown-freebsd \
riscv64gc-unknown-hermit \
riscv64gc-unknown-linux-musl \
riscv64gc-unknown-none-elf \
riscv64imac-unknown-none-elf \
Expand Down
5 changes: 1 addition & 4 deletions src/hermit/mod.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
// libc port for HermitCore (https://hermitcore.org)
//
// Ported by Colin Fink <[email protected]>
// and Stefan Lankes <[email protected]>
//! Hermit C types definition
pub type c_schar = i8;
pub type c_uchar = u8;
Expand Down
2 changes: 0 additions & 2 deletions src/unix/hermit/aarch64.rs

This file was deleted.

Loading

0 comments on commit 6f31de3

Please sign in to comment.