Resolve https://github.com/rust-lang/rust/pull/74419#issuecomment-660518936

1 files changed, 1 insertions, 14 deletions

diff --git a/src/librustc_target/spec/thumbv4t_none_eabi.rs b/src/librustc_target/spec/thumbv4t_none_eabi.rs
index 04a272cb4ae..1e55efbb59f 100644
--- a/src/librustc_target/spec/thumbv4t_none_eabi.rs
+++ b/src/librustc_target/spec/thumbv4t_none_eabi.rs
@@ -48,10 +48,6 @@ pub fn target() -> TargetResult {
             // minimum extra features, these cannot be disabled via -C
             features: "+soft-float,+strict-align".to_string(),
 
-            executables: true,
-
-            relocation_model: RelocModel::Static,
-
             main_needs_argc_argv: false,
 
             // No thread-local storage (just use a static Cell)
@@ -60,16 +56,7 @@ pub fn target() -> TargetResult {
             // don't have atomic compare-and-swap
             atomic_cas: false,
 
-            // always just abort
-            panic_strategy: PanicStrategy::Abort,
-
-            // ABIs to not use
-            unsupported_abis: super::arm_base::unsupported_abis(),
-
-            // this is turned off just like in the `thumb_base` module
-            emit_debug_gdb_scripts: false,
-
-            ..TargetOptions::default()
+            ..super::thumb_base::opts()
         },
     })
 }