Skip to content

Commit 1d5a865

Browse files
committed
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.
2 parents 96555ba + d25b036 commit 1d5a865

File tree

4 files changed

+4
-2
lines changed

4 files changed

+4
-2
lines changed

library/panic_unwind/src/gcc.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ const UNWIND_DATA_REG: (i32, i32) = (3, 4); // R3, R4 / X3, X4
114114
#[cfg(target_arch = "s390x")]
115115
const UNWIND_DATA_REG: (i32, i32) = (6, 7); // R6, R7
116116

117-
#[cfg(target_arch = "sparc64")]
117+
#[cfg(any(target_arch = "sparc", target_arch = "sparc64"))]
118118
const UNWIND_DATA_REG: (i32, i32) = (24, 25); // I0, I1
119119

120120
#[cfg(target_arch = "hexagon")]

library/std/src/os/linux/raw.rs

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ pub use self::arch::{blkcnt_t, blksize_t, ino_t, nlink_t, off_t, stat, time_t};
2929
target_arch = "x86",
3030
target_arch = "le32",
3131
target_arch = "powerpc",
32+
target_arch = "sparc",
3233
target_arch = "arm",
3334
target_arch = "asmjs",
3435
target_arch = "wasm32"

library/std/src/sys_common/alloc.rs

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ use crate::ptr;
1212
target_arch = "mips",
1313
target_arch = "powerpc",
1414
target_arch = "powerpc64",
15+
target_arch = "sparc",
1516
target_arch = "asmjs",
1617
target_arch = "wasm32",
1718
target_arch = "hexagon",

library/unwind/src/libunwind.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ pub const unwinder_private_data_size: usize = 2;
5151
#[cfg(target_arch = "s390x")]
5252
pub const unwinder_private_data_size: usize = 2;
5353

54-
#[cfg(target_arch = "sparc64")]
54+
#[cfg(any(target_arch = "sparc", target_arch = "sparc64"))]
5555
pub const unwinder_private_data_size: usize = 2;
5656

5757
#[cfg(any(target_arch = "riscv64", target_arch = "riscv32"))]

0 commit comments

Comments
 (0)