Merge #61

61: Prepare for v0.3.6 r=thalesfragoso a=adamgreig

This prepares for a 0.3.6 which supports cortex-m 0.7. The only cortex-m features we use here are `interrupt::free` which is unchanged in 0.7.

This PR is made on this (previously archived) repository as we can't generate a 0.3 series cortex-m-semihosting crate from the cortex-m repository without the inline asm machinery that's in this repository. Once this is merged and released, I plan to re-archive this repository, and update the c-m-sh CHANGELOG in the cortex-m repository to reflect this release. I expect this is the final 0.3 series release, and I'll try and get a working 0.4 release which depends on cortex-m 0.7.1 out after this (details tbc...).

I'll also tag 0.3.6; it looks like we missed tags for 0.3.4 and 0.3.5.

The only other change is I noticed the `no-semihosting` feature was merged after 0.3.5, so it's included in this release too.

Co-authored-by: Adam Greig <[email protected]>

Author: bors[bot]

CHANGELOG.md

@@ -5,6 +5,13 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [v0.3.6] - 2020-12-01
+
+### Added
+
+- Update cortex-m dependency to support version 0.7.
+- Add `no-semihosting` feature to disable all semihosting calls.
+
 ## [v0.3.5] - 2019-08-29
 
 ### Added
@@ -109,7 +116,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 - Initial release
 
-[Unreleased]: https://github.com/rust-embedded/cortex-m-semihosting/compare/v0.3.5...HEAD
+[Unreleased]: https://github.com/rust-embedded/cortex-m-semihosting/compare/v0.3.6...HEAD
+[v0.3.6]: https://github.com/rust-embedded/cortex-m-semihosting/compare/v0.3.5...v0.3.6
 [v0.3.5]: https://github.com/rust-embedded/cortex-m-semihosting/compare/v0.3.4...v0.3.5
 [v0.3.4]: https://github.com/rust-embedded/cortex-m-semihosting/compare/v0.3.3...v0.3.4
 [v0.3.3]: https://github.com/rust-embedded/cortex-m-semihosting/compare/v0.3.2...v0.3.3

Cargo.toml

@@ -10,7 +10,7 @@ license = "MIT OR Apache-2.0"
 name = "cortex-m-semihosting"
 readme = "README.md"
 repository = "https://github.com/rust-embedded/cortex-m-semihosting"
-version = "0.3.5"
+version = "0.3.6"
 edition = "2018"
 
 [features]
@@ -19,4 +19,4 @@ jlink-quirks = []
 no-semihosting = []
 
 [dependencies]
-cortex-m = ">= 0.5.8, < 0.7"
+cortex-m = ">= 0.5.8, < 0.8"

asm.s

@@ -1,6 +1,6 @@
-  .section .text.__syscall
-  .global __syscall
+  .section .text.__c_m_sh_syscall
+  .global __c_m_sh_syscall
   .thumb_func
-__syscall:
+__c_m_sh_syscall:
   bkpt 0xAB
   bx lr

bin/thumbv6m-none-eabi.a

@@ -198,7 +198,7 @@ pub mod nr;
 
 #[cfg(all(thumb, not(feature = "inline-asm")))]
 extern "C" {
-    fn __syscall(nr: usize, arg: usize) -> usize;
+    fn __c_m_sh_syscall(nr: usize, arg: usize) -> usize;
 }
 
 /// Performs a semihosting operation, takes a pointer to an argument block
@@ -212,7 +212,7 @@ pub unsafe fn syscall<T>(nr: usize, arg: &T) -> usize {
 pub unsafe fn syscall1(_nr: usize, _arg: usize) -> usize {
     match () {
         #[cfg(all(thumb, not(feature = "inline-asm"), not(feature = "no-semihosting")))]
-        () => __syscall(_nr, _arg),
+        () => __c_m_sh_syscall(_nr, _arg),
 
         #[cfg(all(thumb, feature = "inline-asm", not(feature = "no-semihosting")))]
         () => {