about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2014-09-19 10:00:45 -0700
committerAlex Crichton <alex@alexcrichton.com>2014-09-19 10:00:45 -0700
commit0e18c0634ebc2d47a4acf217f7ad3a8b9c9306fc (patch)
tree24c6b7c33be10bc72cf748f4a79e9fc86563596e /src/libstd
parent859407e1ef38792b17883e5052e42828cb6b9e65 (diff)
parent0d70d57617ba4567d8398c5f8916fc35e9eb67ac (diff)
downloadrust-0e18c0634ebc2d47a4acf217f7ad3a8b9c9306fc.tar.gz
rust-0e18c0634ebc2d47a4acf217f7ad3a8b9c9306fc.zip
rollup merge of #17370 : klutzy/win64-backtrace
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/rt/backtrace.rs4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/libstd/rt/backtrace.rs b/src/libstd/rt/backtrace.rs
index 5557ef9943b..f4887a143d1 100644
--- a/src/libstd/rt/backtrace.rs
+++ b/src/libstd/rt/backtrace.rs
@@ -831,9 +831,11 @@ mod imp {
     mod arch {
         use libc::{c_longlong, c_ulonglong};
         use libc::types::os::arch::extra::{WORD, DWORD, DWORDLONG};
+        use simd;
 
         #[repr(C)]
         pub struct CONTEXT {
+            _align_hack: [simd::u64x2, ..0], // FIXME align on 16-byte
             P1Home: DWORDLONG,
             P2Home: DWORDLONG,
             P3Home: DWORDLONG,
@@ -892,12 +894,14 @@ mod imp {
 
         #[repr(C)]
         pub struct M128A {
+            _align_hack: [simd::u64x2, ..0], // FIXME align on 16-byte
             Low:  c_ulonglong,
             High: c_longlong
         }
 
         #[repr(C)]
         pub struct FLOATING_SAVE_AREA {
+            _align_hack: [simd::u64x2, ..0], // FIXME align on 16-byte
             _Dummy: [u8, ..512] // FIXME: Fill this out
         }