diff options
| author | Mara Bos <m-ou.se@m-ou.se> | 2021-03-09 09:05:24 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-09 09:05:24 +0000 |
| commit | bb9542b0161e950f22f9a9003bb4b4a3ff6fd3c6 (patch) | |
| tree | d3d10e415f5ae6add9734e0379dc24fd493d77c0 /compiler/rustc_errors | |
| parent | a3154427299d49e9d8ce6e8d740fb8ed6032ad8e (diff) | |
| parent | 95e096d6237298f523e5566be87684d208f7d128 (diff) | |
| download | rust-bb9542b0161e950f22f9a9003bb4b4a3ff6fd3c6.tar.gz rust-bb9542b0161e950f22f9a9003bb4b4a3ff6fd3c6.zip | |
Rollup merge of #82841 - hvdijk:x32, r=joshtriplett
Change x64 size checks to not apply to x32. Rust contains various size checks conditional on target_arch = "x86_64", but these checks were never intended to apply to x86_64-unknown-linux-gnux32. Add target_pointer_width = "64" to the conditions.
Diffstat (limited to 'compiler/rustc_errors')
| -rw-r--r-- | compiler/rustc_errors/src/lib.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_errors/src/lib.rs b/compiler/rustc_errors/src/lib.rs index a0be7442d59..1db39fbfba5 100644 --- a/compiler/rustc_errors/src/lib.rs +++ b/compiler/rustc_errors/src/lib.rs @@ -52,7 +52,7 @@ pub type PResult<'a, T> = Result<T, DiagnosticBuilder<'a>>; // `PResult` is used a lot. Make sure it doesn't unintentionally get bigger. // (See also the comment on `DiagnosticBuilderInner`.) -#[cfg(target_arch = "x86_64")] +#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))] rustc_data_structures::static_assert_size!(PResult<'_, bool>, 16); #[derive(Debug, PartialEq, Eq, Clone, Copy, Hash, Encodable, Decodable)] |