Auto merge of rust-lang#710 - marmistrz:android, r=alexcrichton

Port rust-lang#672 and rust-lang#686 to Android. I'd rather avoid the duplication, but this is discussed in rust-lang#707.
keeperofdakeys · Aug 4, 2017 · ecd468e · ecd468e
2 parents 3c2bd77 + 4702102
commit ecd468e
Show file tree

Hide file tree

Showing 4 changed files with 775 additions and 3 deletions.
diff --git a/libc-test/build.rs b/libc-test/build.rs
@@ -119,6 +119,9 @@ fn main() {
         cfg.header("arpa/inet.h");
         cfg.header("xlocale.h");
         cfg.header("utmp.h");
+        if i686 || x86_64 {
+            cfg.header("sys/reg.h");
+        }
     } else if !windows {
         cfg.header("glob.h");
         cfg.header("ifaddrs.h");

diff --git a/src/unix/notbsd/android/b32/mod.rs b/src/unix/notbsd/android/b32/mod.rs
@@ -141,7 +141,6 @@ pub const PTRACE_SETFPREGS: ::c_int = 15;
 pub const PTRACE_GETREGS: ::c_int = 12;
 pub const PTRACE_SETREGS: ::c_int = 13;
 
-pub const SYS_gettid: ::c_long = 224;
 pub const PTHREAD_MUTEX_INITIALIZER: pthread_mutex_t = pthread_mutex_t {
     value: 0,
 };