Merge pull request #216 from alexcrichton/merge

Merging more PRs in the queue

src/unix/mod.rs

@@ -139,7 +139,8 @@ cfg_if! {
     if #[cfg(not(stdbuild))] {
         // cargo build, don't pull in anything extra as the libstd  dep
         // already pulls in all libs.
-    } else if #[cfg(all(target_env = "musl", not(target_arch = "mips")))] {
+    } else if #[cfg(all(target_env = "musl", not(any(target_arch = "mips",
+                                                     target_arch = "arm"))))] {
         #[link(name = "c", kind = "static")]
         extern {}
     } else if #[cfg(target_os = "emscripten")] {

src/unix/notbsd/android/b32.rs

@@ -9,4 +9,4 @@ s! {
     }
 }
 
-pub const SYS_gettid: ::c_int = 224;
+pub const SYS_gettid: ::c_long = 224;

src/unix/notbsd/android/b64.rs

@@ -9,4 +9,4 @@ s! {
     }
 }
 
-pub const SYS_gettid: ::c_int = 178;
+pub const SYS_gettid: ::c_long = 178;

src/unix/notbsd/linux/mips.rs

@@ -472,7 +472,7 @@ pub const RTLD_DEEPBIND: ::c_int = 0x10;
 pub const RTLD_GLOBAL: ::c_int = 0x4;
 pub const RTLD_NOLOAD: ::c_int = 0x8;
 
-pub const SYS_gettid: ::c_int = 4222;   // Valid for O32
+pub const SYS_gettid: ::c_long = 4222;   // Valid for O32
 
 extern {
     pub fn sysctl(name: *mut ::c_int,

src/unix/notbsd/linux/musl/b32/arm.rs

@@ -303,4 +303,4 @@ pub const TIOCMSET: ::c_ulong = 0x5418;
 pub const FIONREAD: ::c_ulong = 0x541B;
 pub const TIOCCONS: ::c_ulong = 0x541D;
 
-pub const SYS_gettid: ::c_int = 224;
+pub const SYS_gettid: ::c_long = 224;

src/unix/notbsd/linux/musl/b32/asmjs.rs

@@ -303,4 +303,4 @@ pub const TIOCMSET: ::c_ulong = 0x5418;
 pub const FIONREAD: ::c_ulong = 0x541B;
 pub const TIOCCONS: ::c_ulong = 0x541D;
 
-pub const SYS_gettid: ::c_int = 224; // Valid for arm (32-bit) and x86 (32-bit)
+pub const SYS_gettid: ::c_long = 224; // Valid for arm (32-bit) and x86 (32-bit)

src/unix/notbsd/linux/musl/b32/mips.rs

@@ -302,4 +302,4 @@ pub const TIOCMSET: ::c_ulong = 0x741D;
 pub const FIONREAD: ::c_ulong = 0x467F;
 pub const TIOCCONS: ::c_ulong = 0x80047478;
 
-pub const SYS_gettid: ::c_int = 4222;   // Valid for O32
+pub const SYS_gettid: ::c_long = 4222;   // Valid for O32

src/unix/notbsd/linux/musl/b32/x86.rs

@@ -304,4 +304,4 @@ pub const TIOCMSET: ::c_ulong = 0x5418;
 pub const FIONREAD: ::c_ulong = 0x541B;
 pub const TIOCCONS: ::c_ulong = 0x541D;
 
-pub const SYS_gettid: ::c_int = 224;
+pub const SYS_gettid: ::c_long = 224;

src/unix/notbsd/linux/musl/b64/mod.rs

@@ -325,4 +325,4 @@ pub const TIOCMSET: ::c_ulong = 0x5418;
 pub const FIONREAD: ::c_ulong = 0x541B;
 pub const TIOCCONS: ::c_ulong = 0x541D;
 
-pub const SYS_gettid: ::c_int = 186;    // Valid for x86_64
+pub const SYS_gettid: ::c_long = 186;    // Valid for x86_64

src/unix/notbsd/linux/other/b32/arm.rs

@@ -19,4 +19,4 @@ pub const SO_SNDTIMEO: ::c_int = 21;
 pub const FIOCLEX: ::c_ulong = 0x5451;
 pub const FIONBIO: ::c_ulong = 0x5421;
 
-pub const SYS_gettid: ::c_int = 224;
+pub const SYS_gettid: ::c_long = 224;

src/unix/notbsd/linux/other/b32/powerpc.rs

@@ -19,4 +19,4 @@ pub const SO_SNDTIMEO: ::c_int = 19;
 pub const FIOCLEX: ::c_ulong = 0x20006601;
 pub const FIONBIO: ::c_ulong = 0x8004667e;
 
-pub const SYS_gettid: ::c_int = 207;
+pub const SYS_gettid: ::c_long = 207;

src/unix/notbsd/linux/other/b32/x86.rs

@@ -35,7 +35,7 @@ pub const SO_SNDTIMEO: ::c_int = 21;
 pub const FIOCLEX: ::c_ulong = 0x5451;
 pub const FIONBIO: ::c_ulong = 0x5421;
 
-pub const SYS_gettid: ::c_int = 224;
+pub const SYS_gettid: ::c_long = 224;
 
 extern {
     pub fn getcontext(ucp: *mut ucontext_t) -> ::c_int;

src/unix/notbsd/linux/other/b64/aarch64.rs

@@ -76,4 +76,4 @@ pub const SO_SNDTIMEO: ::c_int = 21;
 pub const FIOCLEX: ::c_ulong = 0x5451;
 pub const FIONBIO: ::c_ulong = 0x5421;
 
-pub const SYS_gettid: ::c_int = 178;
+pub const SYS_gettid: ::c_long = 178;

src/unix/notbsd/linux/other/b64/powerpc64.rs

@@ -74,4 +74,4 @@ pub const SO_SNDTIMEO: ::c_int = 19;
 pub const FIOCLEX: ::c_ulong = 0x20006601;
 pub const FIONBIO: ::c_ulong = 0x8004667e;
 
-pub const SYS_gettid: ::c_int = 207;
+pub const SYS_gettid: ::c_long = 207;

src/unix/notbsd/linux/other/b64/x86_64.rs

@@ -95,7 +95,7 @@ pub const PTRACE_SETFPXREGS: ::c_uint = 19;
 pub const PTRACE_GETREGS: ::c_uint = 12;
 pub const PTRACE_SETREGS: ::c_uint = 13;
 
-pub const SYS_gettid: ::c_int = 186;
+pub const SYS_gettid: ::c_long = 186;
 
 extern {
     pub fn getcontext(ucp: *mut ucontext_t) -> ::c_int;

src/unix/notbsd/mod.rs

@@ -548,6 +548,9 @@ pub const POSIX_FADV_WILLNEED: ::c_int = 3;
 pub const POSIX_FADV_DONTNEED: ::c_int = 4;
 pub const POSIX_FADV_NOREUSE: ::c_int = 5;
 
+pub const AT_FDCWD: ::c_int = -100;
+pub const AT_SYMLINK_NOFOLLOW: ::c_int = 0x100;
+
 f! {
     pub fn FD_CLR(fd: ::c_int, set: *mut fd_set) -> () {
         let fd = fd as usize;
@@ -664,6 +667,8 @@ extern {
     pub fn posix_fadvise(fd: ::c_int, offset: ::off_t, len: ::off_t,
                          advise: ::c_int) -> ::c_int;
     pub fn futimens(fd: ::c_int, times: *const ::timespec) -> ::c_int;
+    pub fn utimensat(dirfd: ::c_int, path: *const ::c_char,
+                     times: *const ::timespec, flag: ::c_int) -> ::c_int;
 }
 
 cfg_if! {