Skip to content

Commit 8cbe7a8

Browse files
authored
Rollup merge of rust-lang#90494 - Meziu:armv6k-3ds-target, r=sanxiyn
ARMv6K Horizon OS panic change After a small change to `backtrace-rs` ([rust-lang#448](rust-lang/backtrace-rs#448)), `PanicStrategy::Unwind` is now fully supported.
2 parents e4ce370 + d379147 commit 8cbe7a8

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

compiler/rustc_target/src/spec/armv6k_nintendo_3ds.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::spec::{LinkArgs, LinkerFlavor, PanicStrategy, RelocModel, Target, TargetOptions};
1+
use crate::spec::{LinkArgs, LinkerFlavor, RelocModel, Target, TargetOptions};
22

33
/// A base target for Nintendo 3DS devices using the devkitARM toolchain.
44
///
@@ -36,7 +36,6 @@ pub fn target() -> Target {
3636
features: "+vfp2".to_string(),
3737
pre_link_args,
3838
exe_suffix: ".elf".to_string(),
39-
panic_strategy: PanicStrategy::Abort,
4039
..Default::default()
4140
},
4241
}

0 commit comments

Comments
 (0)