Skip to content

Commit

Permalink
Merge #339
Browse files Browse the repository at this point in the history
339: Add polyfills for ESP32S2 r=korken89 a=Flole998



Co-authored-by: Flole998 <[email protected]>
  • Loading branch information
bors[bot] and Flole998 committed Jan 23, 2023
2 parents 217456a + 0293503 commit 644653b
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- Add `HistoryBuffer::as_slices()`
- Implemented `retain` for `IndexMap` and `IndexSet`.
- Recover `StableDeref` trait for `pool::object::Object` and `pool::boxed::Box`.
- Add polyfills for ESP32S2

### Changed

Expand Down
3 changes: 3 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ atomic-polyfill = { version = "1.0.1" }
[target.riscv32imc-unknown-none-elf.dependencies]
atomic-polyfill = { version = "1.0.1" }

[target.xtensa-esp32s2-none-elf.dependencies]
atomic-polyfill = { version = "1.0.1" }

[target.'cfg(target_arch = "avr")'.dependencies]
atomic-polyfill = { version = "1.0.1", optional = true }

Expand Down
4 changes: 3 additions & 1 deletion build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,9 @@ fn main() -> Result<(), Box<dyn Error>> {
println!("cargo:rustc-cfg=cas_atomic_polyfill");
} else {
match &target[..] {
"riscv32i-unknown-none-elf" | "riscv32imc-unknown-none-elf" => {
"riscv32i-unknown-none-elf"
| "riscv32imc-unknown-none-elf"
| "xtensa-esp32s2-none-elf" => {
println!("cargo:rustc-cfg=full_atomic_polyfill");
println!("cargo:rustc-cfg=cas_atomic_polyfill");
}
Expand Down

0 comments on commit 644653b

Please sign in to comment.