diff options
| author |  Jorge Aparicio <jorge@japaric.io>
| 2017-12-29 21:43:39 +0100 |
|---|---|---|
| committer | Jorge Aparicio <jorge@japaric.io>
| 2017-12-29 21:43:39 +0100 |
| commit | 018d54639de034b127b2396c0aef4467f9c3b7c9 (patch) | |
| tree | d162c9cfe25c78b49682f4d9b180fc9087f15907 /cortex-m-rt/src/lib.rs | |
| parent | 6082bc6e4bb52a5f6f71ae10f083c9852f359d1f (diff) | |
| download | cortex-m-018d54639de034b127b2396c0aef4467f9c3b7c9.tar.gz cortex-m-018d54639de034b127b2396c0aef4467f9c3b7c9.tar.zst cortex-m-018d54639de034b127b2396c0aef4467f9c3b7c9.zip | |
adapt to changes in the `start` lang item
Diffstat (limited to 'cortex-m-rt/src/lib.rs')
| -rw-r--r-- | cortex-m-rt/src/lib.rs | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/cortex-m-rt/src/lib.rs b/cortex-m-rt/src/lib.rs index df6640f..9c5e7bf 100644 --- a/cortex-m-rt/src/lib.rs +++ b/cortex-m-rt/src/lib.rs @@ -278,8 +278,7 @@ //! } //! ``` -#![cfg_attr(any(target_arch = "arm", feature = "abort-on-panic"), - feature(core_intrinsics))] +#![cfg_attr(any(target_arch = "arm", feature = "abort-on-panic"), feature(core_intrinsics))] #![deny(missing_docs)] #![deny(warnings)] #![feature(asm)] @@ -291,8 +290,8 @@ #![feature(used)] #![no_std] -extern crate cortex_m; extern crate compiler_builtins; +extern crate cortex_m; extern crate r0; #[cfg(not(test))] @@ -374,7 +373,8 @@ unsafe extern "C" fn reset_handler() -> ! { } #[cfg(target_arch = "arm")] -global_asm!(r#" +global_asm!( + r#" .weak NMI NMI = DEFAULT_HANDLER @@ -398,13 +398,16 @@ PENDSV = DEFAULT_HANDLER .weak SYS_TICK SYS_TICK = DEFAULT_HANDLER -"#); +"# +); #[cfg(not(armv6m))] -global_asm!(r#" +global_asm!( + r#" .weak DEBUG_MONITOR DEBUG_MONITOR = DEFAULT_HANDLER -"#); +"# +); #[cfg(target_arch = "arm")] extern "C" { |