aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar bors[bot] <bors[bot]@users.noreply.github.com> 2018-08-26 23:57:12 +0000
committerGravatar bors[bot] <bors[bot]@users.noreply.github.com> 2018-08-26 23:57:12 +0000
commit478418c0eb38b9311e574d18d12cac69d3044e63 (patch)
tree0c3eed1a715253acf3378da4c731781fb72bd0e3 /src
parentdfd0349772763e07b16bcaa13f536bfa381044b8 (diff)
parent945e2683f89a031b44b65d25e1917f3157c49fa1 (diff)
downloadcortex-m-478418c0eb38b9311e574d18d12cac69d3044e63.tar.gz
cortex-m-478418c0eb38b9311e574d18d12cac69d3044e63.tar.zst
cortex-m-478418c0eb38b9311e574d18d12cac69d3044e63.zip
Merge #108
108: remove build dependency on arm-none-eabi-gcc r=adamgreig a=japaric by shipping pre-assembled object files. This is the same approach as the one used in rust-embedded/cortex-m#95 r? @rust-embedded/cortex-m (anyone) Co-authored-by: Jorge Aparicio <jorge@japaric.io>
Diffstat (limited to 'src')
-rw-r--r--src/register/basepri.rs21
-rw-r--r--src/register/basepri_max.rs21
2 files changed, 33 insertions, 9 deletions
diff --git a/src/register/basepri.rs b/src/register/basepri.rs
index c9f09cc..a9cd6ef 100644
--- a/src/register/basepri.rs
+++ b/src/register/basepri.rs
@@ -45,13 +45,24 @@ pub unsafe fn write(_basepri: u8) {
},
#[cfg(all(cortex_m, not(feature = "inline-asm")))]
- () => {
- extern "C" {
- fn __basepri_w(_: u8);
+ () => match () {
+ #[cfg(not(feature = "cm7-r0p1"))]
+ () => {
+ extern "C" {
+ fn __basepri_w(_: u8);
+ }
+
+ __basepri_w(_basepri);
}
+ #[cfg(feature = "cm7-r0p1")]
+ () => {
+ extern "C" {
+ fn __basepri_w_cm7_r0p1(_: u8);
+ }
- __basepri_w(_basepri);
- }
+ __basepri_w_cm7_r0p1(_basepri);
+ }
+ },
#[cfg(not(cortex_m))]
() => unimplemented!(),
diff --git a/src/register/basepri_max.rs b/src/register/basepri_max.rs
index 91698b6..59ddb44 100644
--- a/src/register/basepri_max.rs
+++ b/src/register/basepri_max.rs
@@ -24,11 +24,24 @@ pub fn write(_basepri: u8) {
#[cfg(all(cortex_m, not(feature = "inline-asm")))]
() => unsafe {
- extern "C" {
- fn __basepri_max(_: u8);
- }
+ match () {
+ #[cfg(not(feature = "cm7-r0p1"))]
+ () => {
+ extern "C" {
+ fn __basepri_max(_: u8);
+ }
- __basepri_max(_basepri)
+ __basepri_max(_basepri)
+ }
+ #[cfg(feature = "cm7-r0p1")]
+ () => {
+ extern "C" {
+ fn __basepri_max_cm7_r0p1(_: u8);
+ }
+
+ __basepri_max_cm7_r0p1(_basepri)
+ }
+ }
},
#[cfg(not(cortex_m))]