Skip to content

Commit

Permalink
Auto merge of rust-lang#99670 - Amanieu:revert-99595, r=nikic
Browse files Browse the repository at this point in the history
Revert "Mark atomics as unsupported on thumbv6m"

This is a breaking change for the `thumbv6m` target. See rust-lang#99668 for discussion on how we can proceed forward from here.

This reverts commit 7514610.

cc `@nikic`
  • Loading branch information
bors committed Jul 24, 2022
2 parents b4151a4 + d931a58 commit c32dcbb
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions compiler/rustc_target/src/spec/thumbv6m_none_eabi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@ pub fn target() -> Target {
// The ARMv6-M architecture doesn't support unaligned loads/stores so we disable them
// with +strict-align.
features: "+strict-align".into(),
// There are no atomic instructions available in the instruction set of the ARMv6-M
// There are no atomic CAS instructions available in the instruction set of the ARMv6-M
// architecture
max_atomic_width: Some(0),
atomic_cas: false,
..super::thumb_base::opts()
},
Expand Down

0 comments on commit c32dcbb

Please sign in to comment.