From 46d7084dc08584ce12d5be28dd9288e65182058d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rom=C3=A1n=20C=C3=A1rdenas=20Rodr=C3=ADguez?=
 <rcardenas.rod@gmail.com>
Date: Tue, 28 Jan 2025 12:54:18 +0100
Subject: [PATCH] Configure CI for new backends

---
 .github/workflows/build.yml   | 14 ++------------
 rtic-macros/CHANGELOG.md      |  2 ++
 xtask/src/argument_parsing.rs |  9 ++-------
 3 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8364683ec2a6..42092d825108 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -155,7 +155,7 @@ jobs:
       matrix:
         backend:
           - riscv32-imc-clint
-          - riscv32-imac-clint
+          - riscv32-imc-mecall
         toolchain:
           - stable
     steps:
@@ -175,13 +175,8 @@ jobs:
         uses: Swatinem/rust-cache@v2
       
       - name: Check the examples
-        if: ${{ matrix.backend == 'riscv32-imc-clint' }}
         run: cargo xtask --platform hifive1 --backend ${{ matrix.backend }} --exampleexclude static example-check
 
-      - name: Check the examples
-        if: ${{ matrix.backend != 'riscv32-imc-clint' }}
-        run: cargo xtask --platform hifive1 --backend ${{ matrix.backend }} example-check
-
   # Platform esp32c3: verify all examples, checks
   checkexamplesesp32c3:
     name: check examples (esp32c3)
@@ -341,7 +336,7 @@ jobs:
       matrix:
         backend:
           - riscv32-imc-clint
-          - riscv32-imac-clint
+          - riscv32-imc-mecall
         toolchain:
           - stable
     steps:
@@ -389,13 +384,8 @@ jobs:
           which qemu-system-riscv32
       
       - name: Run-pass tests
-        if: ${{ matrix.backend == 'riscv32-imc-clint' }}
         run: cargo xtask --deny-warnings --platform hifive1 --backend ${{ matrix.backend }} --exampleexclude static qemu
 
-      - name: Run-pass tests
-        if: ${{ matrix.backend != 'riscv32-imc-clint' }}
-        run: cargo xtask --deny-warnings --platform hifive1 --backend ${{ matrix.backend }} qemu
-
   # Platform esp32c3: verify the example output with run-pass tests
   testexamplesesp32c3:
     name: QEMU run (esp32c3)
diff --git a/rtic-macros/CHANGELOG.md b/rtic-macros/CHANGELOG.md
index 86b051b695fc..7f5cd807a0da 100644
--- a/rtic-macros/CHANGELOG.md
+++ b/rtic-macros/CHANGELOG.md
@@ -7,6 +7,8 @@ For each category, *Added*, *Changed*, *Fixed* add new entries at the top!
 
 ## [Unreleased]
 
+- Adapt `slic` backends to new version with `mecall`
+
 ## [v2.1.1] - 2024-12-06
 
 ### Changed
diff --git a/xtask/src/argument_parsing.rs b/xtask/src/argument_parsing.rs
index f50e2851fd99..13ae6df47198 100644
--- a/xtask/src/argument_parsing.rs
+++ b/xtask/src/argument_parsing.rs
@@ -252,12 +252,7 @@ impl Platforms {
         let c = "-C".to_string();
         match self {
             Platforms::Esp32C3 => vec![c, "link-arg=-Tlinkall.x".to_string()],
-            Platforms::Hifive1 => vec![
-                c.clone(),
-                "link-arg=-Thifive1-link.x".to_string(),
-                c,
-                "portable_atomic_target_feature=\"zaamo\"".to_string(),
-            ],
+            Platforms::Hifive1 => vec![c, "link-arg=-Thifive1-link.x".to_string()],
             Platforms::Lm3s6965 => vec![c, "link-arg=-Tlink.x".to_string()],
             Platforms::Nrf52840 => vec![
                 c.clone(),
@@ -315,7 +310,7 @@ impl Platforms {
                 _ => Err(()),
             },
             Platforms::Hifive1 => match backend.to_target() {
-                RISCV32IMC | RISCV32IMAC => Ok(None),
+                RISCV32IMC => Ok(None),
                 _ => Err(()),
             },
             Platforms::Lm3s6965 => match backend.to_target() {