Auto merge of #3201 - alexcrichton:more-cross, r=alexcrichton

Prepare for more cross-compiled Cargos

Update deps, add support, ensure everything compiles right.

Makefile.in

@@ -174,9 +174,12 @@ OPENSSL_OS_i686-unknown-freebsd := BSD-x86-elf
 OPENSSL_OS_i686-unknown-linux-gnu := linux-elf
 OPENSSL_OS_mips-unknown-linux-gnu := linux-mips32
 OPENSSL_OS_mipsel-unknown-linux-gnu := linux-mips32
+OPENSSL_OS_mips64-unknown-linux-gnuabi64 := linux64-mips64
+OPENSSL_OS_mips64el-unknown-linux-gnuabi64 := linux64-mips64
 OPENSSL_OS_powerpc-unknown-linux-gnu := linux-ppc
 OPENSSL_OS_powerpc64-unknown-linux-gnu := linux-ppc64
 OPENSSL_OS_powerpc64le-unknown-linux-gnu := linux-ppc64le
+OPENSSL_OS_s390x-unknown-linux-gnu := linux64-s390x
 OPENSSL_OS_x86_64-unknown-freebsd := BSD-x86_64
 OPENSSL_OS_x86_64-unknown-linux-gnu := linux-x86_64
 OPENSSL_OS_x86_64-unknown-linux-musl := linux-x86_64
@@ -189,10 +192,13 @@ OPENSSL_AR_armv7-unknown-linux-gnueabihf := armv7-linux-gnueabihf-ar
 OPENSSL_AR_i686-unknown-freebsd := i686-unknown-freebsd10-ar
 OPENSSL_AR_i686-unknown-linux-gnu := ar
 OPENSSL_AR_mips-unknown-linux-gnu := mips-linux-gnu-ar
+OPENSSL_AR_mips64-unknown-linux-gnuabi64 := mips64-linux-gnuabi64-ar
+OPENSSL_AR_mips64el-unknown-linux-gnuabi64 := mips64el-linux-gnuabi64-ar
 OPENSSL_AR_mipsel-unknown-linux-gnu := mipsel-linux-gnu-ar
 OPENSSL_AR_powerpc-unknown-linux-gnu := powerpc-linux-gnu-ar
 OPENSSL_AR_powerpc64-unknown-linux-gnu := powerpc64-linux-gnu-ar
 OPENSSL_AR_powerpc64le-unknown-linux-gnu := powerpc64le-linux-gnu-ar
+OPENSSL_AR_s390x-unknown-linux-gnu := s390x-linux-gnu-ar
 OPENSSL_AR_x86_64-unknown-freebsd := x86_64-unknown-freebsd10-ar
 OPENSSL_AR_x86_64-unknown-linux-gnu := ar
 OPENSSL_AR_x86_64-unknown-linux-musl := ar
@@ -204,10 +210,13 @@ OPENSSL_CC_armv7-unknown-linux-gnueabihf := armv7-linux-gnueabihf-gcc
 OPENSSL_CC_i686-unknown-freebsd := i686-unknown-freebsd10-gcc
 OPENSSL_CC_i686-unknown-linux-gnu := gcc
 OPENSSL_CC_mips-unknown-linux-gnu := mips-linux-gnu-gcc
+OPENSSL_CC_mips64-unknown-linux-gnuabi64 := mips64-linux-gnuabi64-gcc
+OPENSSL_CC_mips64el-unknown-linux-gnuabi64 := mips64el-linux-gnuabi64-gcc
 OPENSSL_CC_mipsel-unknown-linux-gnu := mipsel-linux-gnu-gcc
 OPENSSL_CC_powerpc-unknown-linux-gnu := powerpc-linux-gnu-gcc
-OPENSSL_CC_powerpc64-unknown-linux-gnu := powerpc64-linux-gnu-gcc
+OPENSSL_CC_powerpc64-unknown-linux-gnu := powerpc64-linux-gnu-gcc-5
 OPENSSL_CC_powerpc64le-unknown-linux-gnu := powerpc64le-linux-gnu-gcc
+OPENSSL_CC_s390x-unknown-linux-gnu := s390x-linux-gnu-gcc
 OPENSSL_CC_x86_64-unknown-freebsd := x86_64-unknown-freebsd10-gcc
 OPENSSL_CC_x86_64-unknown-linux-gnu := gcc
 OPENSSL_CC_x86_64-unknown-linux-musl := musl-gcc

configure

@@ -413,6 +413,22 @@ linker = "i686-unknown-freebsd10-gcc"
 linker = "x86_64-unknown-freebsd10-gcc"
 [target.x86_64-unknown-netbsd]
 linker = "x86_64-unknown-netbsd-gcc"
+[target.powerpc-unknown-linux-gnu]
+linker = "powerpc-linux-gnu-gcc"
+[target.powerpc64-unknown-linux-gnu]
+linker = "powerpc64-linux-gnu-gcc-5"
+[target.powerpc64le-unknown-linux-gnu]
+linker = "powerpc64le-linux-gnu-gcc"
+[target.mips-unknown-linux-gnu]
+linker = "mips-linux-gnu-gcc"
+[target.mipsel-unknown-linux-gnu]
+linker = "mipsel-linux-gnu-gcc"
+[target.mips64el-unknown-linux-gnuabi64]
+linker = "mips64el-linux-gnuabi64-gcc"
+[target.mips64-unknown-linux-gnuabi64]
+linker = "mips64-linux-gnuabi64-gcc"
+[target.s390x-unknown-linux-gnu]
+linker = "s390x-linux-gnu-gcc"
 EOF
  fi
 fi

src/cargo/util/flock.rs

@@ -306,7 +306,7 @@ fn acquire(config: &Config,
  let mut buf: libc::statfs = mem::zeroed();
  let r = libc::statfs(path.as_ptr(), &mut buf);
 
- r == 0 && buf.f_type == libc::NFS_SUPER_MAGIC
+ r == 0 && buf.f_type as u32 == libc::NFS_SUPER_MAGIC as u32
  }
  }