diff options
| author | bors <bors@rust-lang.org> | 2022-07-23 22:41:48 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-07-23 22:41:48 +0000 |
| commit | fcad91868a515c51d0762bf6c7af2bedc11cc348 (patch) | |
| tree | 682cb7ebef5a5f140298da02fa295e9e90707c37 /compiler/rustc_target/src | |
| parent | 93ffde6f04d3d24327a4e17a2a2bf4f63c246235 (diff) | |
| parent | d87a13fe0de0c0fae61c289a249f8556d3243b5a (diff) | |
| download | rust-fcad91868a515c51d0762bf6c7af2bedc11cc348.tar.gz rust-fcad91868a515c51d0762bf6c7af2bedc11cc348.zip | |
Auto merge of #99652 - GuillaumeGomez:rollup-38v0x7y, r=GuillaumeGomez
Rollup of 6 pull requests Successful merges: - #99298 (Make `ui-fulldeps/gated-plugins` and `ui-fulldeps/multiple-plugins` tests stage 2 only) - #99396 (Add some additional double-adjustment regression tests) - #99449 (Do not resolve associated const when there is no provided value) - #99595 (Mark atomics as unsupported on thumbv6m) - #99627 (Lock stdout once when listing tests) - #99638 (Remove Clean trait implementation for hir::Ty and middle::Ty) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_target/src')
| -rw-r--r-- | compiler/rustc_target/src/spec/thumbv6m_none_eabi.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/rustc_target/src/spec/thumbv6m_none_eabi.rs b/compiler/rustc_target/src/spec/thumbv6m_none_eabi.rs index 2546ab9b7e6..dffa19ae55c 100644 --- a/compiler/rustc_target/src/spec/thumbv6m_none_eabi.rs +++ b/compiler/rustc_target/src/spec/thumbv6m_none_eabi.rs @@ -14,8 +14,9 @@ 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 CAS instructions available in the instruction set of the ARMv6-M + // There are no atomic instructions available in the instruction set of the ARMv6-M // architecture + max_atomic_width: Some(0), atomic_cas: false, ..super::thumb_base::opts() }, |