diff options
| author | bors <bors@rust-lang.org> | 2022-07-24 13:46:15 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-07-24 13:46:15 +0000 |
| commit | c32dcbba187d1ee0dbe92dc152cb9c2f3f42900c (patch) | |
| tree | 1adc8cca0b2be37b119d6482649605cd23ea3325 | |
| parent | b4151a41a0b275dee59ffbbc115e7bfc5be8a8c3 (diff) | |
| parent | d931a587e68814de32b93a71d87bf3dfeb361455 (diff) | |
| download | rust-c32dcbba187d1ee0dbe92dc152cb9c2f3f42900c.tar.gz rust-c32dcbba187d1ee0dbe92dc152cb9c2f3f42900c.zip | |
Auto merge of #99670 - Amanieu:revert-99595, r=nikic
Revert "Mark atomics as unsupported on thumbv6m" This is a breaking change for the `thumbv6m` target. See #99668 for discussion on how we can proceed forward from here. This reverts commit 75146102197c7f35e6c38cb402b2bc1065858c54. cc `@nikic`
| -rw-r--r-- | compiler/rustc_target/src/spec/thumbv6m_none_eabi.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/compiler/rustc_target/src/spec/thumbv6m_none_eabi.rs b/compiler/rustc_target/src/spec/thumbv6m_none_eabi.rs index dffa19ae55c..2546ab9b7e6 100644 --- a/compiler/rustc_target/src/spec/thumbv6m_none_eabi.rs +++ b/compiler/rustc_target/src/spec/thumbv6m_none_eabi.rs @@ -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() }, |