Skip to content

Commit f50f1c8

Browse files
committed
Auto merge of #75280 - overdrivenpotato:psp-unwind, r=dtolnay
Add back unwinding support for Sony PSP This PR adds back unwinding support for the Sony PSP. The `mipsel-sony-psp` target works well with unwinding. In [rust-psp], we use the `panic_unwind` crate along with LLVM's libunwind to catch panics, run destructors, and print them to the debug screen without aborting all threads. [rust-psp]: https://github.com/overdrivenpotato/rust-psp
2 parents aced185 + 27fca58 commit f50f1c8

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

library/panic_unwind/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ cfg_if::cfg_if! {
5050
} else if #[cfg(any(
5151
all(target_family = "windows", target_env = "gnu"),
5252
target_os = "cloudabi",
53+
target_os = "psp",
5354
target_family = "unix",
5455
all(target_vendor = "fortanix", target_env = "sgx"),
5556
))] {
@@ -65,7 +66,6 @@ cfg_if::cfg_if! {
6566
// - os=uefi
6667
// - nvptx64-nvidia-cuda
6768
// - avr-unknown-unknown
68-
// - mipsel-sony-psp
6969
#[path = "dummy.rs"]
7070
mod real_imp;
7171
}

library/unwind/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ cfg_if::cfg_if! {
1919
} else if #[cfg(any(
2020
unix,
2121
windows,
22+
target_os = "psp",
2223
target_os = "cloudabi",
2324
all(target_vendor = "fortanix", target_env = "sgx"),
2425
))] {
@@ -32,7 +33,6 @@ cfg_if::cfg_if! {
3233
// - os=uefi
3334
// - os=cuda
3435
// - nvptx64-nvidia-cuda
35-
// - mipsel-sony-psp
3636
// - Any new targets not listed above.
3737
}
3838
}

0 commit comments

Comments
 (0)