diff options
| author | bors <bors@rust-lang.org> | 2014-01-30 23:51:28 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-01-30 23:51:28 -0800 |
| commit | f910a977db8fb425f9dfbfcf01438adf2a134670 (patch) | |
| tree | a3da4c794703a9e09a2d9d279542b06268f6c29c /src/libstd | |
| parent | b7f673a627c674b289721ee339fd2980919c6afd (diff) | |
| parent | 51b90004d9670e454dc6e4e841721b052ed0ea25 (diff) | |
| download | rust-f910a977db8fb425f9dfbfcf01438adf2a134670.tar.gz rust-f910a977db8fb425f9dfbfcf01438adf2a134670.zip | |
auto merge of #11947 : alexcrichton/rust/osx-unwind, r=brson
On OSX 32-bit, the private fields are 5 words long, not 2. I found this segfaulting before this change, and after this change it no longer segfaulted.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/rt/unwind.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/libstd/rt/unwind.rs b/src/libstd/rt/unwind.rs index 88c6b52ec23..16126ea1447 100644 --- a/src/libstd/rt/unwind.rs +++ b/src/libstd/rt/unwind.rs @@ -122,7 +122,10 @@ mod libunwind { pub type _Unwind_Word = uintptr_t; - #[cfg(not(target_arch = "arm"))] + #[cfg(target_arch = "x86")] + pub static unwinder_private_data_size: int = 5; + + #[cfg(target_arch = "x86_64")] pub static unwinder_private_data_size: int = 2; #[cfg(target_arch = "arm")] |