make compilable on stable

Author: japaric

Cargo.toml

@@ -7,13 +7,28 @@ keywords = ["arm", "cortex-m", "register", "peripheral"]
 license = "MIT OR Apache-2.0"
 name = "cortex-m"
 repository = "https://github.com/japaric/cortex-m"
-version = "0.4.3"
+version = "0.4.4"
+
+[build-dependencies]
+cc = "1.0.10"
 
 [dependencies]
-aligned = "0.1.1"
-bare-metal = "0.1.0"
 volatile-register = "0.2.0"
-untagged-option = "0.1.1"
+
+[dependencies.aligned]
+default-features = false
+version = "0.1.2"
+
+[dependencies.bare-metal]
+default-features = false
+version = "0.1.2"
+
+[dependencies.untagged-option]
+optional = true
+version = "0.1.1"
 
 [features]
 cm7-r0p1 = []
+default = ["inline-asm", "singleton"]
+inline-asm = []
+singleton = ["untagged-option"]

asm/basepri_max-cm7-r0p1.s

@@ -0,0 +1,12 @@
+;; fn __basepri_max(u8)
+;; executed in a critical section to work around a silicon erratum
+  .global __basepri_max
+__basepri_max:
+  mrs r1, PRIMASK
+  cpsid i
+  tst.w r1, #1
+  msr BASEPRI_MAX, r0
+  it ne
+  bxne lr
+  cpsie i
+  bx lr

asm/basepri_max.s

@@ -0,0 +1,4 @@
+  .global __basepri_max
+__basepri_max:
+  msr BASEPRI_MAX, r0
+  bx lr

asm/basepri_r.s

@@ -0,0 +1,4 @@
+  .global __basepri_r
+__basepri_r:
+  mrs r0, BASEPRI
+  bx lr

asm/basepri_w-cm7-r0p1.s

@@ -0,0 +1,12 @@
+;; fn __basepri_w(u8)
+;; executed in a critical section to work around a silicon erratum
+  .global __basepri_w
+__basepri_w:
+  mrs r1, PRIMASK
+  cpsid i
+  tst.w r1, #1
+  msr BASEPRI, r0
+  it ne
+  bxne lr
+  cpsie i
+  bx lr

asm/basepri_w.s

@@ -0,0 +1,4 @@
+  .global __basepri_w
+__basepri_w:
+  msr BASEPRI, r0
+  bx lr

asm/bkpt.s

@@ -0,0 +1,4 @@
+  .global __bkpt
+__bkpt:
+  bkpt
+  bx lr

asm/control.s

@@ -0,0 +1,4 @@
+  .global __control
+__control:
+  mrs r0, CONTROL
+  bx lr

asm/cpsid.s

@@ -0,0 +1,4 @@
+  .global __cpsid
+__cpsid:
+  cpsid i
+  bx lr

asm/cpsie.s

@@ -0,0 +1,4 @@
+  .global __cpsie
+__cpsie:
+  cpsie i
+  bx lr