We are in a mess. This commit attempts to fix it.

The cortex-m crate in the master branch is 0.7.4 plus a bunch of fixes
that have never been released. Some of them are breaking changes and so
will never be released. We cannot 'just' release a cortex-m 0.8 with
them in because that is ecosystem shattering - the crate contains a
'links=' attribute, and a bunch of no_mangle functions, so you cannot
have two versions in the same dependency tree.

Instead, there is a 0.7.x branch. This was taken before the cortex-m-rt
crate move. It has cortex-m 0.7.7, which has been published.

This commit just deletes the cortex-m folder and replaces it with
the contents of the cortex-m crate as found on the the 0.7.x branch.

If you want to pick up the changes that have just been deleted, cherry-
pick them into a new branch and open a PR to merge them into here.
Breaking changes for cortex-m into master will no longer be accepted.
Sorry.

Author: thejpster

cortex-m/CHANGELOG.md

@@ -7,37 +7,29 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
-### Breaking changes
+## [v0.7.7] - 2023-01-03
 
-- `NVIC::request()` no longer requires `&mut self`.
-- `embedded-hal` version 0.2 delay implementations now required the `eh0` feature.
+- Add missing documentation for `critical-section-single-core` feature added
+  in v0.7.6.
 
-### Added
-- Updated `SCB.ICSR.VECTACTIVE`/`SCB::vect_active()` to be 9 bits instead of 8.
-  Also fixes `VectActive::from` to take a `u16` and subtract `16` for
-  `VectActive::Interrupt`s to match `SBC::vect_active()` (#373).
-- DWT: add `configure` API for address, cycle count comparison (#342, #367).
-- ITM: add `configure` API (#342).
-- TPIU: add API for *Formatter and Flush Control* (FFCR) and *Selected Pin Control* (SPPR) registers (#342).
-- TPIU: add `swo_supports` for checking what SWO configurations the target supports. (#381)
-- Add `std` and `serde` crate features for improved host-side ITM decode functionality when working with the downstream `itm`, `cargo-rtic-scope` crates (#363, #366).
-- Added the ability to name the statics generated by `singleton!()` for better debuggability (#364, #380).
-- Added `critical-section-single-core` feature which provides an implementation for the `critical_section` crate for single-core systems, based on disabling all interrupts. (#447)
-- Added support for `embedded-hal` version 1 delay traits, requiring rust 1.60.
-- `singleton!()` now forwards attributes (#522).
-- Added `set_sevonpend` and `clear_sevonpend` (#539).
+## [v0.7.6] - 2022-08-12
 
-### Fixed
-- Fixed `singleton!()` statics sometimes ending up in `.data` instead of `.bss` (#364, #380).
-- `interrupt::free` no longer hands out a `CriticalSection` token because it is unsound on multi-core. Use `critical_section::with` instead. (#447)
+- Added `critical-section-single-core` feature which provides an implementation for the `critical-section` crate for single-core systems, based on disabling all interrupts. (#448)
+
+## [v0.7.5] - 2022-05-15
+
+### Deprecated
+- the `ptr()` function on all peripherals register blocks in favor of
+  the associated constant `PTR` (#386).
 
 ### Changed
-- Inline assembly is now always used, requiring Rust 1.59.
-- Bumped MSRV to 1.61 for compatibility with syn versions >=2.0.68.
 
-### Removed
-- removed all peripherals `ptr()` functions in favor of the associated constant `PTR` (#385).
-- removed `inline-asm` feature which is now always enabled
+- The `inline-asm` feature no longer requires a nightly Rust compiler, but
+  does require Rust 1.59 or above.
+
+### Fixed
+- Fixed `singleton!()` statics sometimes ending up in `.data` instead of `.bss` (#364, #380).
+  (Backported from upcoming 0.8 release).
 
 ## [v0.7.4] - 2021-12-31
 
@@ -70,7 +62,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 [C-GETTER]: https://rust-lang.github.io/api-guidelines/naming.html#c-getter
 
-
 ## [v0.7.3] - 2021-07-03
 
 ### Fixed
@@ -764,7 +755,10 @@ fn main() {
 - Functions to get the vector table
 - Wrappers over miscellaneous instructions like `bkpt`
 
-[Unreleased]: https://github.com/rust-embedded/cortex-m/compare/v0.7.4...HEAD
+[Unreleased]: https://github.com/rust-embedded/cortex-m/compare/v0.7.7...HEAD
+[v0.7.7]: https://github.com/rust-embedded/cortex-m/compare/v0.7.6...v0.7.7
+[v0.7.6]: https://github.com/rust-embedded/cortex-m/compare/v0.7.5...v0.7.6
+[v0.7.5]: https://github.com/rust-embedded/cortex-m/compare/v0.7.4...v0.7.5
 [v0.7.4]: https://github.com/rust-embedded/cortex-m/compare/v0.7.3...v0.7.4
 [v0.7.3]: https://github.com/rust-embedded/cortex-m/compare/v0.7.2...v0.7.3
 [v0.7.2]: https://github.com/rust-embedded/cortex-m/compare/v0.7.1...v0.7.2

cortex-m/Cargo.toml

@@ -11,29 +11,33 @@ license = "MIT OR Apache-2.0"
 name = "cortex-m"
 readme = "README.md"
 repository = "https://github.com/rust-embedded/cortex-m"
-version = "0.7.4"
-edition = "2021"
-rust-version = "1.61"
+version = "0.7.7"
+edition = "2018"
 links = "cortex-m"  # prevent multiple versions of this crate to be linked together
 
 [dependencies]
-critical-section = "1.0.0"
-volatile-register = "0.2.2"
-bitfield = "0.15.0"
-eh0 = { package = "embedded-hal", version = "0.2.4", optional = true }
-eh1 = { package = "embedded-hal", version = "1.0.0" }
+bare-metal = { version = "0.2.4", features = ["const-fn"] }
+critical-section = { version = "1.0.0", optional = true }
+volatile-register = "0.2.0"
+bitfield = "0.13.2"
+embedded-hal = "0.2.4"
 
 [dependencies.serde]
 version = "1"
 features = [ "derive" ]
 optional = true
 
+[dependencies.serde_json]
+version = "1"
+optional = true
+
 [features]
 cm7 = []
 cm7-r0p1 = ["cm7"]
+inline-asm = []
 linker-plugin-lto = []
 std = []
-critical-section-single-core = ["critical-section/restore-state-u32"]
+critical-section-single-core = ["critical-section/restore-state-bool"]
 
 [package.metadata.docs.rs]
 targets = [

cortex-m/README.md

@@ -11,7 +11,7 @@ This project is developed and maintained by the [Cortex-M team][team].
 
 ## Minimum Supported Rust Version (MSRV)
 
-This crate is guaranteed to compile on stable Rust 1.61.0 and up. It might compile with older versions but that may change in any new patch release.
+This crate is guaranteed to compile on stable Rust 1.59 and up. It might compile with older versions but that may change in any new patch release.
 
 ## License
 

cortex-m/asm-toolchain

@@ -0,0 +1 @@
+nightly-2021-12-16