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.
matthiaskrgr · Nov 8, 2021 · 8cbe7a8 · 8cbe7a8
2 parents e4ce370 + d379147
commit 8cbe7a8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/compiler/rustc_target/src/spec/armv6k_nintendo_3ds.rs b/compiler/rustc_target/src/spec/armv6k_nintendo_3ds.rs
@@ -1,4 +1,4 @@
-use crate::spec::{LinkArgs, LinkerFlavor, PanicStrategy, RelocModel, Target, TargetOptions};
+use crate::spec::{LinkArgs, LinkerFlavor, RelocModel, Target, TargetOptions};
 
 /// A base target for Nintendo 3DS devices using the devkitARM toolchain.
 ///
@@ -36,7 +36,6 @@ pub fn target() -> Target {
  features: "+vfp2".to_string(),
  pre_link_args,
  exe_suffix: ".elf".to_string(),
- panic_strategy: PanicStrategy::Abort,
  ..Default::default()
  },
  }

diff --git a/library/backtrace b/library/backtrace