diff options
| author | bors <bors@rust-lang.org> | 2020-09-28 10:37:41 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-09-28 10:37:41 +0000 |
| commit | 1d5a865b2f671189af8d7af6b2d8f3dfa2a6d425 (patch) | |
| tree | 0f3536046289820aa4644148a837d27690a19e43 | |
| parent | 96555ba608cff7c33ff6f0ea4a81ed34d5a5ea3b (diff) | |
| parent | d25b0364e11064089f30af74da18aae5896a72ea (diff) | |
| download | rust-1d5a865b2f671189af8d7af6b2d8f3dfa2a6d425.tar.gz rust-1d5a865b2f671189af8d7af6b2d8f3dfa2a6d425.zip | |
Auto merge of #77282 - glaubitz:sparc-linux, r=nagisa
Add missing definitions required by the sparc-unknown-linux-gnu target This PR adds a few missing definitions required by sparc-unknown-linux-target which were discovered during build tests.
| -rw-r--r-- | library/panic_unwind/src/gcc.rs | 2 | ||||
| -rw-r--r-- | library/std/src/os/linux/raw.rs | 1 | ||||
| -rw-r--r-- | library/std/src/sys_common/alloc.rs | 1 | ||||
| -rw-r--r-- | library/unwind/src/libunwind.rs | 2 |
4 files changed, 4 insertions, 2 deletions
diff --git a/library/panic_unwind/src/gcc.rs b/library/panic_unwind/src/gcc.rs index 1cfd527b584..6b88bab8277 100644 --- a/library/panic_unwind/src/gcc.rs +++ b/library/panic_unwind/src/gcc.rs @@ -114,7 +114,7 @@ const UNWIND_DATA_REG: (i32, i32) = (3, 4); // R3, R4 / X3, X4 #[cfg(target_arch = "s390x")] const UNWIND_DATA_REG: (i32, i32) = (6, 7); // R6, R7 -#[cfg(target_arch = "sparc64")] +#[cfg(any(target_arch = "sparc", target_arch = "sparc64"))] const UNWIND_DATA_REG: (i32, i32) = (24, 25); // I0, I1 #[cfg(target_arch = "hexagon")] diff --git a/library/std/src/os/linux/raw.rs b/library/std/src/os/linux/raw.rs index 4ff3a6e5789..617c4098aa9 100644 --- a/library/std/src/os/linux/raw.rs +++ b/library/std/src/os/linux/raw.rs @@ -29,6 +29,7 @@ pub use self::arch::{blkcnt_t, blksize_t, ino_t, nlink_t, off_t, stat, time_t}; target_arch = "x86", target_arch = "le32", target_arch = "powerpc", + target_arch = "sparc", target_arch = "arm", target_arch = "asmjs", target_arch = "wasm32" diff --git a/library/std/src/sys_common/alloc.rs b/library/std/src/sys_common/alloc.rs index f22476be325..6c1bc0d839a 100644 --- a/library/std/src/sys_common/alloc.rs +++ b/library/std/src/sys_common/alloc.rs @@ -12,6 +12,7 @@ use crate::ptr; target_arch = "mips", target_arch = "powerpc", target_arch = "powerpc64", + target_arch = "sparc", target_arch = "asmjs", target_arch = "wasm32", target_arch = "hexagon", diff --git a/library/unwind/src/libunwind.rs b/library/unwind/src/libunwind.rs index dcf4fcd4e5a..806df572cf9 100644 --- a/library/unwind/src/libunwind.rs +++ b/library/unwind/src/libunwind.rs @@ -51,7 +51,7 @@ pub const unwinder_private_data_size: usize = 2; #[cfg(target_arch = "s390x")] pub const unwinder_private_data_size: usize = 2; -#[cfg(target_arch = "sparc64")] +#[cfg(any(target_arch = "sparc", target_arch = "sparc64"))] pub const unwinder_private_data_size: usize = 2; #[cfg(any(target_arch = "riscv64", target_arch = "riscv32"))] |