---

yaml
---
r: 219498
b: refs/heads/snap-stage3
c: a8dbb92
h: refs/heads/master
v: v3

Author: geofft

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: c044791d80ea0dc5c4b57b6030a67b69f8510239
-refs/heads/snap-stage3: cae005162d1d7aea6cffdc299fedf0d2bb2a4b28
+refs/heads/snap-stage3: a8dbb92b471cae1d3f8225857f5553311dd8aeb3
 refs/heads/try: b53c0f93eedcdedd4fd89bccc5a3a09d1c5cd23e
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/snap-stage3/src/libstd/sys/unix/c.rs

@@ -135,7 +135,9 @@ extern {
     pub fn sigaltstack(ss: *const sigaltstack,
                        oss: *mut sigaltstack) -> libc::c_int;
 
+    #[cfg(not(target_os = "android"))]
     pub fn sigemptyset(set: *mut sigset_t) -> libc::c_int;
+
     pub fn pthread_sigmask(how: libc::c_int, set: *const sigset_t,
                            oldset: *mut sigset_t) -> libc::c_int;
 
@@ -155,6 +157,14 @@ extern {
                     -> *mut libc::c_char;
 }
 
+// Ugh. This is only available as an inline until Android API 21.
+#[cfg(target_os = "android")]
+pub unsafe fn sigemptyset(set: *mut sigset_t) -> libc::c_int {
+    use intrinsics;
+    intrinsics::write_bytes(set, 0, 1);
+    return 0;
+}
+
 #[cfg(any(target_os = "linux",
           target_os = "android"))]
 mod signal_os {

branches/snap-stage3/src/libstd/sys/unix/process.rs

@@ -446,12 +446,22 @@ mod tests {
     use mem;
     use ptr;
     use libc;
+    use slice;
     use sys::{self, c, cvt, pipe};
 
+    #[cfg(not(target_os = "android"))]
     extern {
         fn sigaddset(set: *mut c::sigset_t, signum: libc::c_int) -> libc::c_int;
     }
 
+    #[cfg(target_os = "android")]
+    unsafe fn sigaddset(set: *mut c::sigset_t, signum: libc::c_int) -> libc::c_int {
+        let raw = slice::from_raw_parts_mut(set as *mut u8, mem::size_of::<c::sigset_t>());
+        let bit = (signum - 1) as usize;
+        raw[bit / 8] |= 1 << (bit % 8);
+        return 0;
+    }
+
     #[test]
     fn test_process_mask() {
         unsafe {