bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Switch rtems target to panic unwind

Browse source
This commit is contained in:
Jan Sommer 2024-11-23 23:59:03 +01:00
parent e93e096cc8
commit 3f94047d8c
4 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_target/src/spec/targets/armv7_rtems_eabihf.rs
View file

@ -20,7 +20,7 @@ pub(crate) fn target() -> Target {
linker_flavor: LinkerFlavor::Gnu(Cc::Yes, Lld::No), linker_flavor: LinkerFlavor::Gnu(Cc::Yes, Lld::No),
linker: None, linker: None,
relocation_model: RelocModel::Static, relocation_model: RelocModel::Static,
panic_strategy: PanicStrategy::Abort, panic_strategy: PanicStrategy::Unwind,
features: "+thumb2,+neon,+vfp3".into(), features: "+thumb2,+neon,+vfp3".into(),
max_atomic_width: Some(64), max_atomic_width: Some(64),
emit_debug_gdb_scripts: false, emit_debug_gdb_scripts: false,

2
library/panic_unwind/src/lib.rs
View file

@ -46,7 +46,7 @@ cfg_if::cfg_if! {
target_os = "psp", target_os = "psp",
target_os = "xous", target_os = "xous",
target_os = "solid_asp3", target_os = "solid_asp3",
all(target_family = "unix", not(any(target_os = "espidf", target_os = "rtems", target_os = "nuttx"))), all(target_family = "unix", not(any(target_os = "espidf", target_os = "nuttx"))),
all(target_vendor = "fortanix", target_env = "sgx"), all(target_vendor = "fortanix", target_env = "sgx"),
target_family = "wasm", target_family = "wasm",
))] { ))] {

2
library/std/src/sys/personality/mod.rs
View file

@ -31,7 +31,7 @@ cfg_if::cfg_if! {
target_os = "psp", target_os = "psp",
target_os = "xous", target_os = "xous",
target_os = "solid_asp3", target_os = "solid_asp3",
all(target_family = "unix", not(target_os = "espidf"), not(target_os = "l4re"), not(target_os = "rtems"), not(target_os = "nuttx")), all(target_family = "unix", not(target_os = "espidf"), not(target_os = "l4re"), not(target_os = "nuttx")),
all(target_vendor = "fortanix", target_env = "sgx"), all(target_vendor = "fortanix", target_env = "sgx"),
))] { ))] {
mod gcc; mod gcc;

1
library/unwind/src/lib.rs
View file

@ -20,7 +20,6 @@ cfg_if::cfg_if! {
target_os = "l4re", target_os = "l4re",
target_os = "none", target_os = "none",
target_os = "espidf", target_os = "espidf",
target_os = "rtems",
target_os = "nuttx", target_os = "nuttx",
))] { ))] {
// These "unix" family members do not have unwinder. // These "unix" family members do not have unwinder.