diff options
| author | bors <bors@rust-lang.org> | 2020-01-06 19:07:42 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-01-06 19:07:42 +0000 |
| commit | ef92009c1dbe2750f1d24a6619b827721fb49749 (patch) | |
| tree | 38bbc9fa9b06c7cf2d0101397b7b80ec40117fca /src/libstd | |
| parent | ebbb2bf37aedaaa64dfaa52ba337ca6efb6b9093 (diff) | |
| parent | d61e193cd0867da2fbe81fca349bd1c0afc36d08 (diff) | |
| download | rust-ef92009c1dbe2750f1d24a6619b827721fb49749.tar.gz rust-ef92009c1dbe2750f1d24a6619b827721fb49749.zip | |
Auto merge of #66899 - msizanoen1:riscv-std, r=alexcrichton
Standard library support for riscv64gc-unknown-linux-gnu Add std support for RISC-V 64-bit GNU/Linux and update libc for RISC-V support. r? @alexcrichton
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/env.rs | 6 | ||||
| -rw-r--r-- | src/libstd/os/linux/raw.rs | 7 | ||||
| -rw-r--r-- | src/libstd/os/raw/mod.rs | 6 | ||||
| -rw-r--r-- | src/libstd/sys/unix/fs.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sys_common/alloc.rs | 3 |
5 files changed, 20 insertions, 4 deletions
diff --git a/src/libstd/env.rs b/src/libstd/env.rs index 13fe3bda525..af35a5d9b7c 100644 --- a/src/libstd/env.rs +++ b/src/libstd/env.rs @@ -878,6 +878,7 @@ pub mod consts { /// - mips64 /// - powerpc /// - powerpc64 + /// - riscv64 /// - s390x /// - sparc64 #[stable(feature = "env", since = "1.0.0")] @@ -1035,6 +1036,11 @@ mod arch { pub const ARCH: &'static str = "hexagon"; } +#[cfg(target_arch = "riscv64")] +mod arch { + pub const ARCH: &'static str = "riscv64"; +} + #[cfg(test)] mod tests { use super::*; diff --git a/src/libstd/os/linux/raw.rs b/src/libstd/os/linux/raw.rs index d9b2236047b..0caec97bb7b 100644 --- a/src/libstd/os/linux/raw.rs +++ b/src/libstd/os/linux/raw.rs @@ -230,7 +230,12 @@ mod arch { } } -#[cfg(any(target_arch = "mips64", target_arch = "s390x", target_arch = "sparc64"))] +#[cfg(any( + target_arch = "mips64", + target_arch = "s390x", + target_arch = "sparc64", + target_arch = "riscv64" +))] mod arch { pub use libc::{blkcnt_t, blksize_t, ino_t, nlink_t, off_t, stat, time_t}; } diff --git a/src/libstd/os/raw/mod.rs b/src/libstd/os/raw/mod.rs index e09012007f2..47daf0cce1b 100644 --- a/src/libstd/os/raw/mod.rs +++ b/src/libstd/os/raw/mod.rs @@ -18,7 +18,8 @@ target_arch = "hexagon", target_arch = "powerpc", target_arch = "powerpc64", - target_arch = "s390x" + target_arch = "s390x", + target_arch = "riscv64" ) ), all(target_os = "android", any(target_arch = "aarch64", target_arch = "arm")), @@ -60,7 +61,8 @@ pub type c_char = u8; target_arch = "hexagon", target_arch = "powerpc", target_arch = "powerpc64", - target_arch = "s390x" + target_arch = "s390x", + target_arch = "riscv64" ) ), all(target_os = "android", any(target_arch = "aarch64", target_arch = "arm")), diff --git a/src/libstd/sys/unix/fs.rs b/src/libstd/sys/unix/fs.rs index 2a0519487c7..4fa9095c899 100644 --- a/src/libstd/sys/unix/fs.rs +++ b/src/libstd/sys/unix/fs.rs @@ -67,6 +67,7 @@ macro_rules! cfg_has_statx { // target_arch = "mips64", // target_arch = "s390x", target_arch = "sparc64", + target_arch = "riscv64", )))] { $($then_tt)* } else { @@ -86,6 +87,7 @@ macro_rules! cfg_has_statx { // target_arch = "mips64", // target_arch = "s390x", target_arch = "sparc64", + target_arch = "riscv64", )))] { $($block_inner)* diff --git a/src/libstd/sys_common/alloc.rs b/src/libstd/sys_common/alloc.rs index 713b9949f64..c6694100785 100644 --- a/src/libstd/sys_common/alloc.rs +++ b/src/libstd/sys_common/alloc.rs @@ -22,7 +22,8 @@ pub const MIN_ALIGN: usize = 8; target_arch = "aarch64", target_arch = "mips64", target_arch = "s390x", - target_arch = "sparc64" + target_arch = "sparc64", + target_arch = "riscv64" )))] pub const MIN_ALIGN: usize = 16; |