Merge #321

321: Fix `Stim` reexport on thumbv8m.base r=adamgreig a=jonas-schievink



Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>

Author: bors[bot]

CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [v0.6.6] - 2021-01-26
+
+### Fixed
+
+- Fixed missing ITM reexport on `thumbv8m.base` targets.
+
 ## [v0.6.5] - 2021-01-24
 
 ### Changed
@@ -607,7 +613,9 @@ fn main() {
 - Functions to get the vector table
 - Wrappers over miscellaneous instructions like `bkpt`
 
-[Unreleased]: https://github.com/rust-embedded/cortex-m/compare/v0.6.4...HEAD
+[Unreleased]: https://github.com/rust-embedded/cortex-m/compare/v0.6.6...HEAD
+[v0.6.6]: https://github.com/rust-embedded/cortex-m/compare/v0.6.5...v0.6.6
+[v0.6.5]: https://github.com/rust-embedded/cortex-m/compare/v0.6.4...v0.6.5
 [v0.6.4]: https://github.com/rust-embedded/cortex-m/compare/v0.6.3...v0.6.4
 [v0.6.3]: https://github.com/rust-embedded/cortex-m/compare/v0.6.2...v0.6.3
 [v0.6.2]: https://github.com/rust-embedded/cortex-m/compare/v0.6.1...v0.6.2

Cargo.toml

@@ -11,7 +11,7 @@ license = "MIT OR Apache-2.0"
 name = "cortex-m"
 readme = "README.md"
 repository = "https://github.com/rust-embedded/cortex-m"
-version = "0.6.5"
+version = "0.6.6"
 edition = "2018"
 
 [dependencies]

src/itm.rs

@@ -6,9 +6,9 @@ use core::{fmt, mem, ptr, slice};
 
 use aligned::{Aligned, A4};
 
-#[cfg(thumbv8m_base)]
+#[cfg(armv8m_base)]
 use crate::peripheral::itm::Stim;
-#[cfg(not(thumbv8m_base))]
+#[cfg(not(armv8m_base))]
 use cortex_m_0_7::peripheral::itm::Stim;
 
 // NOTE assumes that `bytes` is 32-bit aligned