Skip to content

Commit aab5597

Browse files
authored
Rollup merge of rust-lang#94019 - hermitcore:target, r=Mark-Simulacrum
removing architecture requirements for RustyHermit RustHermit and HermitCore is able to run on aarch64 and x86_64. In the future these operating systems will also support RISC-V. Consequently, the dependency to a specific target should be removed. The build process of `hermit-abi` fails if the architecture isn't supported.
2 parents a7061fb + 91681c9 commit aab5597

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

std/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ dlmalloc = { version = "0.2.3", features = ['rustc-dep-of-std'] }
4141
[target.x86_64-fortanix-unknown-sgx.dependencies]
4242
fortanix-sgx-abi = { version = "0.3.2", features = ['rustc-dep-of-std'] }
4343

44-
[target.'cfg(all(any(target_arch = "x86_64", target_arch = "aarch64"), target_os = "hermit"))'.dependencies]
45-
hermit-abi = { version = "0.1.19", features = ['rustc-dep-of-std'] }
44+
[target.'cfg(target_os = "hermit")'.dependencies]
45+
hermit-abi = { version = "0.2.0", features = ['rustc-dep-of-std'] }
4646

4747
[target.wasm32-wasi.dependencies]
4848
wasi = { version = "0.11.0", features = ['rustc-dep-of-std'], default-features = false }

std/src/sys/hermit/fd.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#![unstable(reason = "not public", issue = "none", feature = "fd")]
22

3-
use crate::io::{self, Read, ReadBuf};
3+
use crate::io::{self, Read};
44
use crate::mem;
55
use crate::sys::cvt;
66
use crate::sys::hermit::abi;

0 commit comments

Comments
 (0)