auto merge of #16647 : vhbit/rust/ios-build-fixes, r=alexcrichton

src/librustrt/unwind.rs

@@ -333,7 +333,10 @@ pub mod eabi {
             uw::_URC_HANDLER_FOUND // catch!
         }
         else { // cleanup phase
-            uw::_URC_INSTALL_CONTEXT
+            unsafe {
+                __gcc_personality_sj0(_version, actions, _exception_class, _ue_header,
+                                      _context)
+            }
         }
     }
 }

src/libstd/rt/backtrace.rs

@@ -273,9 +273,9 @@ mod imp {
 
         try!(writeln!(w, "stack backtrace:"));
         // 100 lines should be enough
-        static SIZE: libc::c_int = 100;
+        static SIZE: uint = 100;
         let mut buf: [*mut libc::c_void, ..SIZE] = unsafe {mem::zeroed()};
-        let cnt = unsafe { backtrace(buf.as_mut_ptr(), SIZE) as uint};
+        let cnt = unsafe { backtrace(buf.as_mut_ptr(), SIZE as libc::c_int) as uint};
 
         // skipping the first one as it is write itself
         result::fold_(range(1, cnt).map(|i| {