Merge pull request #37 from pftbest/master

japaric · web-flow · commit b9685034bde1 · 2017-10-13T10:20:25.000+02:00
Put global asm behind target cfg
diff --git a/cortex-m-rt/src/lib.rs b/cortex-m-rt/src/lib.rs
@@ -372,6 +372,7 @@ unsafe extern "C" fn reset_handler() -> ! {
     }
 }
 
+#[cfg(target_arch = "arm")]
 global_asm!(r#"
 .weak NMI
 NMI = DEFAULT_HANDLER

Original file line number	Diff line number	Diff line change
`@@ -372,6 +372,7 @@ unsafe extern "C" fn reset_handler() -> ! {`
`372`	`372`	`}`
`373`	`373`	`}`
`374`	`374`
	`375`	`+#[cfg(target_arch = "arm")]`
`375`	`376`	`global_asm!(r#"`
`376`	`377`	`.weak NMI`
`377`	`378`	`NMI = DEFAULT_HANDLER`