diff options
| author | bors <bors@rust-lang.org> | 2018-01-09 04:22:50 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-01-09 04:22:50 +0000 |
| commit | 74966b5cb84934737d21bd9001db07bd93fa5d64 (patch) | |
| tree | 91adae4383a3e9a5dcbd68543a78ef9adcda5b29 /src/libstd/sys | |
| parent | b5392f54503fdaf04df4b9578510b2baa944f4af (diff) | |
| parent | 9ef98545c9d55e109242b6b3489060ebc690ab05 (diff) | |
| download | rust-74966b5cb84934737d21bd9001db07bd93fa5d64.tar.gz rust-74966b5cb84934737d21bd9001db07bd93fa5d64.zip | |
Auto merge of #47276 - kennytm:rollup, r=kennytm
Rollup of 10 pull requests - Successful merges: #47210, #47233, #47246, #47254, #47256, #47258, #47259, #47263, #47270, #47272 - Failed merges: #47248
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/wasm/mod.rs | 1 | ||||
| -rw-r--r-- | src/libstd/sys/windows/c.rs | 14 |
2 files changed, 4 insertions, 11 deletions
diff --git a/src/libstd/sys/wasm/mod.rs b/src/libstd/sys/wasm/mod.rs index b838dbafd6f..ba3d6a2813a 100644 --- a/src/libstd/sys/wasm/mod.rs +++ b/src/libstd/sys/wasm/mod.rs @@ -39,6 +39,7 @@ use os::raw::c_char; const DEBUG: bool = false; pub mod args; +#[cfg(feature = "backtrace")] pub mod backtrace; pub mod cmath; pub mod condvar; 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 } |