bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #76798 - alistair23:alistair/rv32-linux, r=jyn514

Browse source 
Build fixes for RISC-V 32-bit Linux support

This fixes build issues with the 32-bit RISC-V port.
This commit is contained in:
Ralf Jung 2020-09-19 11:47:56 +02:00 • committed by GitHub
commit b4c3f409af
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
library/std/src/os/linux/raw.rs
View file

@ -234,7 +234,8 @@ mod arch {
target_arch = "mips64",
target_arch = "s390x",
target_arch = "sparc64",
target_arch = "riscv64"
target_arch = "riscv64",
target_arch = "riscv32"
))]
mod arch {
pub use libc::{blkcnt_t, blksize_t, ino_t, nlink_t, off_t, stat, time_t};

6
library/std/src/os/raw/mod.rs
View file

@ -22,7 +22,8 @@ mod tests;
target_arch = "powerpc",
target_arch = "powerpc64",
target_arch = "s390x",
target_arch = "riscv64"
target_arch = "riscv64",
target_arch = "riscv32"
)
),
all(target_os = "android", any(target_arch = "aarch64", target_arch = "arm")),
@ -65,7 +66,8 @@ pub type c_char = u8;
target_arch = "powerpc",
target_arch = "powerpc64",
target_arch = "s390x",
target_arch = "riscv64"
target_arch = "riscv64",
target_arch = "riscv32"
)
),
all(target_os = "android", any(target_arch = "aarch64", target_arch = "arm")),

3
library/std/src/sys_common/alloc.rs
View file

@ -14,7 +14,8 @@ use crate::ptr;
target_arch = "powerpc64",
target_arch = "asmjs",
target_arch = "wasm32",
target_arch = "hexagon"
target_arch = "hexagon",
target_arch = "riscv32"
)))]
pub const MIN_ALIGN: usize = 8;
#[cfg(all(any(