Skip to content

Commit 4cd2895

Browse files
authored
Rollup merge of #133420 - thesummer:rtems-unwind, r=workingjubilee
Switch rtems target to panic unwind Switch the RTEMS target to `panic_unwind`. Relates to rust-lang/backtrace-rs#682
2 parents 3f43b1a + 3f94047 commit 4cd2895

File tree

4 files changed

+3
-4
lines changed

4 files changed

+3
-4
lines changed

compiler/rustc_target/src/spec/targets/armv7_rtems_eabihf.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ pub(crate) fn target() -> Target {
2323
linker_flavor: LinkerFlavor::Gnu(Cc::Yes, Lld::No),
2424
linker: None,
2525
relocation_model: RelocModel::Static,
26-
panic_strategy: PanicStrategy::Abort,
26+
panic_strategy: PanicStrategy::Unwind,
2727
features: "+thumb2,+neon,+vfp3".into(),
2828
max_atomic_width: Some(64),
2929
emit_debug_gdb_scripts: false,

library/panic_unwind/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ cfg_if::cfg_if! {
4646
target_os = "psp",
4747
target_os = "xous",
4848
target_os = "solid_asp3",
49-
all(target_family = "unix", not(any(target_os = "espidf", target_os = "rtems", target_os = "nuttx"))),
49+
all(target_family = "unix", not(any(target_os = "espidf", target_os = "nuttx"))),
5050
all(target_vendor = "fortanix", target_env = "sgx"),
5151
target_family = "wasm",
5252
))] {

library/std/src/sys/personality/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ cfg_if::cfg_if! {
3131
target_os = "psp",
3232
target_os = "xous",
3333
target_os = "solid_asp3",
34-
all(target_family = "unix", not(target_os = "espidf"), not(target_os = "l4re"), not(target_os = "rtems"), not(target_os = "nuttx")),
34+
all(target_family = "unix", not(target_os = "espidf"), not(target_os = "l4re"), not(target_os = "nuttx")),
3535
all(target_vendor = "fortanix", target_env = "sgx"),
3636
))] {
3737
mod gcc;

library/unwind/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ cfg_if::cfg_if! {
2020
target_os = "l4re",
2121
target_os = "none",
2222
target_os = "espidf",
23-
target_os = "rtems",
2423
target_os = "nuttx",
2524
))] {
2625
// These "unix" family members do not have unwinder.

0 commit comments

Comments
 (0)