mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

auto merge of #11947 : alexcrichton/rust/osx-unwind, r=brson

Browse Source 
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.
This commit is contained in:
bors 2014-01-30 23:51:28 -08:00
commit f910a977db
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/libstd/rt/unwind.rs
View File

@ -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")]