Skip to content

Commit e1baa3d

Browse files
authored
Rollup merge of rust-lang#93949 - glaubitz:m68k-unwind, r=Mark-Simulacrum
Add basic platform support to library/{panic_}unwind for m68k This PR adds basic platform support for m68k for library/{panic_}unwind for m68k. Register information for UNWIND_DATA_REG has been extracted from LLVM.
2 parents cdfdcfc + c26d5b3 commit e1baa3d

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

library/panic_unwind/src/gcc.rs

+3
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,9 @@ const UNWIND_DATA_REG: (i32, i32) = (0, 1); // RAX, RDX
105105
#[cfg(any(target_arch = "arm", target_arch = "aarch64"))]
106106
const UNWIND_DATA_REG: (i32, i32) = (0, 1); // R0, R1 / X0, X1
107107

108+
#[cfg(target_arch = "m68k")]
109+
const UNWIND_DATA_REG: (i32, i32) = (0, 1); // D0, D1
110+
108111
#[cfg(any(target_arch = "mips", target_arch = "mips64"))]
109112
const UNWIND_DATA_REG: (i32, i32) = (4, 5); // A0, A1
110113

library/unwind/src/libunwind.rs

+3
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ pub const unwinder_private_data_size: usize = 2;
4242
#[cfg(all(target_arch = "aarch64", target_pointer_width = "32"))]
4343
pub const unwinder_private_data_size: usize = 5;
4444

45+
#[cfg(target_arch = "m68k")]
46+
pub const unwinder_private_data_size: usize = 2;
47+
4548
#[cfg(target_arch = "mips")]
4649
pub const unwinder_private_data_size: usize = 2;
4750

0 commit comments

Comments
 (0)