diff options
| author | kennytm <kennytm@gmail.com> | 2018-01-09 01:58:49 +0800 |
|---|---|---|
| committer | kennytm <kennytm@gmail.com> | 2018-01-09 03:37:12 +0800 |
| commit | 4c0823a6707a9c26539c7f071ca646098eb05c40 (patch) | |
| tree | ff10c153d36d6be43742c780964661a799680373 /src/libstd/sys | |
| parent | 9214e9b0ae77803cc8e5becd869681b9a3f17dcb (diff) | |
| parent | 9e4a692e5665737c080a451d6f6dba622dafb299 (diff) | |
| download | rust-4c0823a6707a9c26539c7f071ca646098eb05c40.tar.gz rust-4c0823a6707a9c26539c7f071ca646098eb05c40.zip | |
Rollup merge of #47254 - rkruppe:no-more-align-hack, r=alexcrichton
Replace empty array hack with repr(align) As a side effect, this fixes the warning about repr(C, simd) that has been reported during x86_64 windows builds since #47111 (see also: #47103) r? @alexcrichton
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/windows/c.rs | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/libstd/sys/windows/c.rs b/src/libstd/sys/windows/c.rs index 6e0cccff001..66b44f1402f 100644 --- a/src/libstd/sys/windows/c.rs +++ b/src/libstd/sys/windows/c.rs @@ -20,11 +20,6 @@ use os::raw::c_ulonglong; use libc::{wchar_t, size_t, c_void}; use ptr; -#[repr(simd)] -#[repr(C)] -#[cfg(target_arch = "x86_64")] -struct u64x2(u64, u64); - pub use self::FILE_INFO_BY_HANDLE_CLASS::*; pub use self::EXCEPTION_DISPOSITION::*; @@ -700,9 +695,8 @@ pub struct FLOATING_SAVE_AREA { } #[cfg(target_arch = "x86_64")] -#[repr(C)] +#[repr(C, align(16))] pub struct CONTEXT { - _align_hack: [u64x2; 0], // FIXME align on 16-byte pub P1Home: DWORDLONG, pub P2Home: DWORDLONG, pub P3Home: DWORDLONG, @@ -760,17 +754,15 @@ pub struct CONTEXT { } #[cfg(target_arch = "x86_64")] -#[repr(C)] +#[repr(C, align(16))] pub struct M128A { - _align_hack: [u64x2; 0], // FIXME align on 16-byte pub Low: c_ulonglong, pub High: c_longlong } #[cfg(target_arch = "x86_64")] -#[repr(C)] +#[repr(C, align(16))] pub struct FLOATING_SAVE_AREA { - _align_hack: [u64x2; 0], // FIXME align on 16-byte _Dummy: [u8; 512] // FIXME: Fill this out } |