From 918f9c3f13a75d6d01f283702353ebc31bf36c69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= <henrik@tjaders.com>
Date: Sun, 23 Jun 2024 08:45:49 +0200
Subject: Breaking change: portable-atomic (#922)

* Atomics: Replace polyfill with portable-atomic

* Update Cargo.lock for examples

* RTIC: portable-atomic: Update changelog

* rtic-monotonics: portable-atomic: Update changelog

* lm3s6965: enable critical-section when testing

* xtask: Enable portable-atomic/critical-section

When dealing with rtic-monotonics

* rtic-monotonics: portable-atomics: Do not disable the ability to fallback

---------

Co-authored-by: Emil Fresk <emil.fresk@gmail.com>
---
 examples/lm3s6965/Cargo.lock | 16 +++++-----------
 examples/lm3s6965/Cargo.toml |  5 ++++-
 2 files changed, 9 insertions(+), 12 deletions(-)

(limited to 'examples/lm3s6965')

diff --git a/examples/lm3s6965/Cargo.lock b/examples/lm3s6965/Cargo.lock
index 848a06f..d7537dc 100644
--- a/examples/lm3s6965/Cargo.lock
+++ b/examples/lm3s6965/Cargo.lock
@@ -2,15 +2,6 @@
 # It is not intended for manual editing.
 version = 3
 
-[[package]]
-name = "atomic-polyfill"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cf2bce30dfe09ef0bfaef228b9d414faaf7e563035494d7fe092dba54b300f4"
-dependencies = [
- "critical-section",
-]
-
 [[package]]
 name = "bare-metal"
 version = "0.2.5"
@@ -309,6 +300,9 @@ name = "portable-atomic"
 version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0"
+dependencies = [
+ "critical-section",
+]
 
 [[package]]
 name = "proc-macro-error"
@@ -356,10 +350,10 @@ dependencies = [
 name = "rtic"
 version = "2.1.1"
 dependencies = [
- "atomic-polyfill",
  "bare-metal 1.0.0",
  "cortex-m",
  "critical-section",
+ "portable-atomic",
  "rtic-core",
  "rtic-macros",
 ]
@@ -393,10 +387,10 @@ dependencies = [
 name = "rtic-monotonics"
 version = "2.0.0"
 dependencies = [
- "atomic-polyfill",
  "cfg-if",
  "cortex-m",
  "fugit",
+ "portable-atomic",
  "rtic-time",
 ]
 
diff --git a/examples/lm3s6965/Cargo.toml b/examples/lm3s6965/Cargo.toml
index bfa4b29..5e2cc50 100644
--- a/examples/lm3s6965/Cargo.toml
+++ b/examples/lm3s6965/Cargo.toml
@@ -30,7 +30,10 @@ features = ["exit"]
 version = "0.6.0"
 
 [features]
-test-critical-section = ["rtic/test-critical-section"]
+test-critical-section = [
+  "rtic/test-critical-section",
+  "cortex-m/critical-section-single-core",
+]
 thumbv6-backend = ["rtic/thumbv6-backend"]
 thumbv7-backend = ["rtic/thumbv7-backend"]
 thumbv8base-backend = ["rtic/thumbv8base-backend"]
-- 
cgit v1.2.3