Skip to content

Commit 2c1c523

Browse files
authored
Merge pull request #4811 from embassy-rs/fix-trace
executor: fix build with 'trace' on.
2 parents bc8ba64 + d8d2536 commit 2c1c523

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

embassy-executor/Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,15 @@ build = [
3030
{target = "thumbv7em-none-eabi", features = ["arch-cortex-m", "executor-interrupt", "executor-thread", "embassy-time-driver", "scheduler-deadline"]},
3131
{target = "thumbv7em-none-eabi", features = ["arch-cortex-m", "executor-interrupt", "executor-thread", "scheduler-priority", "scheduler-deadline"]},
3232
{target = "thumbv7em-none-eabi", features = ["arch-cortex-m", "executor-interrupt", "executor-thread", "scheduler-deadline"]},
33+
{target = "thumbv7em-none-eabi", features = ["arch-cortex-m", "executor-interrupt", "executor-thread", "embassy-time-driver", "scheduler-priority", "scheduler-deadline", "trace"]},
3334
{target = "thumbv7em-none-eabi", features = ["arch-spin"]},
3435
{target = "thumbv7em-none-eabi", features = ["arch-spin", "scheduler-deadline"]},
3536
{target = "armv7a-none-eabi", features = ["arch-cortex-ar", "executor-thread"]},
3637
{target = "armv7r-none-eabi", features = ["arch-cortex-ar", "executor-thread"]},
3738
{target = "armv7r-none-eabihf", features = ["arch-cortex-ar", "executor-thread"]},
3839
{target = "riscv32imac-unknown-none-elf", features = ["arch-riscv32"]},
3940
{target = "riscv32imac-unknown-none-elf", features = ["arch-riscv32", "executor-thread"]},
41+
{target = "riscv32imac-unknown-none-elf", features = ["arch-riscv32", "executor-thread", "trace"]},
4042
# Nightly builds
4143
{group = "nightly", target = "thumbv7em-none-eabi", features = ["nightly"]},
4244
{group = "nightly", target = "thumbv7em-none-eabi", features = ["nightly", "log"]},

embassy-executor/src/raw/trace.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ impl TaskTracker {
169169
}
170170

171171
#[cfg(feature = "trace")]
172-
extern "Rust" {
172+
unsafe extern "Rust" {
173173
/// This callback is called when the executor begins polling. This will always
174174
/// be paired with a later call to `_embassy_trace_executor_idle`.
175175
///

0 commit comments

Comments
 (0)