Rollup merge of rust-lang#40317 - malbarbo:update-libc, r=alexcrichton

Update libc to 0.2.21 Update to include android aarch64 and x86 improvements.
frewsxcv · Mar 17, 2017 · 374dd2a · 374dd2a
2 parents 0aeb9c1 + 184b9c2
commit 374dd2a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/liblibc b/src/liblibc
diff --git a/src/libstd/os/raw.rs b/src/libstd/os/raw.rs
@@ -14,22 +14,24 @@
 
 use fmt;
 
-#[cfg(any(target_os = "android",
-          target_os = "emscripten",
+#[cfg(any(target_os = "emscripten",
           all(target_os = "linux", any(target_arch = "aarch64",
                                        target_arch = "arm",
                                        target_arch = "powerpc",
                                        target_arch = "powerpc64",
                                        target_arch = "s390x")),
+          all(target_os = "android", any(target_arch = "aarch64",
+                                         target_arch = "arm")),
           all(target_os = "fuchsia", target_arch = "aarch64")))]
 #[stable(feature = "raw_os", since = "1.1.0")] pub type c_char = u8;
-#[cfg(not(any(target_os = "android",
-              target_os = "emscripten",
+#[cfg(not(any(target_os = "emscripten",
               all(target_os = "linux", any(target_arch = "aarch64",
                                            target_arch = "arm",
                                            target_arch = "powerpc",
                                            target_arch = "powerpc64",
                                            target_arch = "s390x")),
+              all(target_os = "android", any(target_arch = "aarch64",
+                                             target_arch = "arm")),
               all(target_os = "fuchsia", target_arch = "aarch64"))))]
 #[stable(feature = "raw_os", since = "1.1.0")] pub type c_char = i8;
 #[stable(feature = "raw_os", since = "1.1.0")] pub type c_schar = i8;
+6 −0		.travis.yml
+2 −2		Cargo.lock
+1 −1		Cargo.toml
+0 −0		ci/android-accept-licenses.sh
+17 −2		ci/android-install-ndk.sh
+28 −8		ci/android-install-sdk.sh
+32 −0		ci/docker/aarch64-linux-android/Dockerfile
+9 −11		ci/docker/arm-linux-androideabi/Dockerfile
+32 −0		ci/docker/i686-linux-android/Dockerfile
+2 −1		ci/run-docker.sh
+9 −4		ci/run.sh
+7 −3		libc-test/build.rs
+142 −10		src/unix/bsd/apple/mod.rs
+28 −2		src/unix/bsd/freebsdlike/dragonfly/mod.rs
+46 −1		src/unix/bsd/freebsdlike/freebsd/mod.rs
+121 −1		src/unix/bsd/freebsdlike/mod.rs
+72 −1		src/unix/bsd/mod.rs
+97 −1		src/unix/bsd/netbsdlike/mod.rs
+42 −0		src/unix/bsd/netbsdlike/netbsd/mod.rs
+44 −0		src/unix/bsd/netbsdlike/openbsdlike/mod.rs
+44 −1		src/unix/haiku/mod.rs
+17 −75		src/unix/mod.rs
+6 −0		src/unix/notbsd/android/b32/arm.rs
+45 −0		src/unix/notbsd/android/b32/mod.rs
+6 −0		src/unix/notbsd/android/b32/x86.rs
+42 −1		src/unix/notbsd/android/b64/mod.rs
+69 −79		src/unix/notbsd/android/mod.rs
+90 −16		src/unix/notbsd/linux/mips/mod.rs
+57 −1		src/unix/notbsd/linux/mod.rs
+9 −0		src/unix/notbsd/linux/musl/b32/arm.rs
+16 −7		src/unix/notbsd/linux/musl/b32/mips.rs
+9 −0		src/unix/notbsd/linux/musl/b32/x86.rs
+9 −0		src/unix/notbsd/linux/musl/b64/mod.rs
+34 −0		src/unix/notbsd/linux/musl/mod.rs
+34 −0		src/unix/notbsd/linux/other/b32/arm.rs
+42 −1		src/unix/notbsd/linux/other/b32/powerpc.rs
+40 −0		src/unix/notbsd/linux/other/b32/x86.rs
+77 −6		src/unix/notbsd/linux/other/b64/aarch64.rs
+78 −6		src/unix/notbsd/linux/other/b64/powerpc64.rs
+77 −6		src/unix/notbsd/linux/other/b64/x86_64.rs
+12 −0		src/unix/notbsd/linux/other/mod.rs
+124 −6		src/unix/notbsd/mod.rs
+45 −1		src/unix/solaris/mod.rs