auto merge of rust-lang#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.
huonw · Jan 31, 2014 · f910a97 · f910a97
2 parents b7f673a + 51b9000
commit f910a97
Showing 1 changed file with 4 additions and 1 deletion.
diff --git 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")]