Add custom toolchains for powerpc* and s390x

Using Ubuntu's cross-toolchains meant these targets were depending on
glibc symbols from Ubuntu 16.04.  And if that host is ever updated to a
new release, the toolchains would raise the bar too.

This switches powerpc* and s390x to use crosstool-ng toolchains, with
the kernel and glibc configured approximately like RHEL7.  That should
also be compatible with Debian 8 (jessie) and Ubuntu 14.04 (trusty).

Author: cuviper

slaves/linux-cross/Dockerfile

@@ -7,10 +7,6 @@ RUN apt-get install -y --force-yes --no-install-recommends \
         zlib1g-dev \
         bzip2 xz-utils \
         g++ libc6-dev \
-        g++-powerpc-linux-gnu libc6-dev-powerpc-cross \
-        g++-5-powerpc64-linux-gnu libc6-dev-ppc64-powerpc-cross \
-        g++-powerpc64le-linux-gnu libc6-dev-ppc64el-cross \
-        g++-s390x-linux-gnu \
         bsdtar \
         cmake \
         g++-5-mips-linux-gnu libc6-dev-mips-cross \
@@ -60,6 +56,10 @@ COPY linux-cross/build_toolchain.sh \
     linux-cross/mipsel-linux-musl.config \
     linux-cross/armv7-linux-gnueabihf.config \
     linux-cross/armv7-linux-musleabihf.config \
+    linux-cross/powerpc-linux-gnu.config \
+    linux-cross/powerpc64-linux-gnu.config \
+    linux-cross/powerpc64le-linux-gnu.config \
+    linux-cross/s390x-linux-gnu.config \
     /build/
 USER rustbuild
 
@@ -108,11 +108,19 @@ RUN /bin/bash build_toolchain.sh arm-linux-musleabi
 RUN /bin/bash build_toolchain.sh arm-linux-musleabihf
 RUN /bin/bash build_toolchain.sh armv7-linux-musleabihf
 
+# Also build toolchains for {powerpc{,64{,le}},s390x}-unknown-linux-gnu,
+# primarily to support older glibc than found in the Ubuntu root.
+RUN /bin/bash build_toolchain.sh powerpc-linux-gnu
+RUN /bin/bash build_toolchain.sh powerpc64-linux-gnu
+RUN /bin/bash build_toolchain.sh powerpc64le-linux-gnu
+RUN /bin/bash build_toolchain.sh s390x-linux-gnu
+
 USER root
 
 # Rename all the compilers we just built into /usr/bin and also without
 # `-unknown-` in the name because it appears lots of other compilers in Ubuntu
 # don't have this name in the component by default either.
+# Also rename `-ibm-` out of the s390x compilers.
 # Also the aarch64 compiler is prefixed with `aarch64-unknown-linux-gnueabi`
 # by crosstool-ng, but Ubuntu just prefixes it with `aarch64-linux-gnu` so
 # we'll, additionally, strip the eabi part from its binaries.
@@ -121,6 +129,10 @@ RUN                                                                           \
     g=`basename $f`;                                                          \
     ln -vs $f /usr/bin/`echo $g | sed -e 's/-unknown//'`;                     \
   done && \
+  for f in `ls /x-tools/*-ibm-linux-*/bin/*-ibm-linux-*`; do                  \
+    g=`basename $f`;                                                          \
+    ln -vs $f /usr/bin/`echo $g | sed -e 's/-ibm//'`;                         \
+  done && \
   for f in `ls /usr/bin/aarch64-linux-gnueabi-*`; do                          \
     g=`basename $f`;                                                          \
     mv -v $f /usr/bin/`echo $g | sed -e 's/eabi//'`;                          \
@@ -184,8 +196,8 @@ ENV AR_armv7_unknown_linux_gnueabihf=armv7-linux-gnueabihf-ar \
     CC_mipsel_unknown_linux_musl=mipsel-linux-musl-gcc \
     CXX_mipsel_unknown_linux_musl=mipsel-linux-musl-g++ \
     AR_powerpc64_unknown_linux_gnu=powerpc64-linux-gnu-ar \
-    CC_powerpc64_unknown_linux_gnu=powerpc64-linux-gnu-gcc-5 \
-    CXX_powerpc64_unknown_linux_gnu=powerpc64-linux-gnu-g++-5 \
+    CC_powerpc64_unknown_linux_gnu=powerpc64-linux-gnu-gcc \
+    CXX_powerpc64_unknown_linux_gnu=powerpc64-linux-gnu-g++ \
     AR_powerpc64le_unknown_linux_gnu=powerpc64le-linux-gnu-ar \
     CC_powerpc64le_unknown_linux_gnu=powerpc64le-linux-gnu-gcc \
     CXX_powerpc64le_unknown_linux_gnu=powerpc64le-linux-gnu-g++ \

slaves/linux-cross/README.md

@@ -223,3 +223,56 @@ For targets: `mipsel-unknown-linux-musl`
 (+) These options have been selected to match the gcc flags we use to compile C
     libraries like jemalloc. See the mk/cfg/mips(el)-uknown-linux-musl.mk
     file in Rust's source code.
+
+## `powerpc-linux-gnu.config`
+
+For targets: `powerpc-unknown-linux-gnu`
+
+- Path and misc options > Prefix directory = /x-tools/${CT\_TARGET}
+- Target options > Target Architecture = powerpc
+- Operating System > Target OS = linux
+- Operating System > Linux kernel version = 3.10.93 -- ~RHEL7 kernel
+- C-library > glibc version = 2.17 -- ~RHEL7 glibc
+- C compiler > gcc version = 5.2
+- C compiler > C++ = ENABLE -- to cross compile LLVM
+
+## `powerpc64-linux-gnu.config`
+
+For targets: `powerpc64-unknown-linux-gnu`
+
+- Path and misc options > Prefix directory = /x-tools/${CT\_TARGET}
+- Target options > Target Architecture = powerpc
+- Target options > Bitness = 64-bit
+- Operating System > Target OS = linux
+- Operating System > Linux kernel version = 3.10.93 -- ~RHEL7 kernel
+- C-library > glibc version = 2.17 -- ~RHEL7 glibc
+- C compiler > gcc version = 5.2
+- C compiler > C++ = ENABLE -- to cross compile LLVM
+
+## `powerpc64le-linux-gnu.config`
+
+For targets: `powerpc64le-unknown-linux-gnu`
+
+- Path and misc options > Prefix directory = /x-tools/${CT\_TARGET}
+- Target options > Target Architecture = powerpc
+- Target options > Endianness = **Little** endian
+- Target options > Bitness = 64-bit
+- Target options > Emit assembly for CPU = power8
+- Operating System > Target OS = linux
+- Operating System > Linux kernel version = 3.14.57 -- ppc64le support was introduced in 3.13
+- C-library > glibc version = 2.19 -- ppc64le support was introduced in this version
+- C compiler > gcc version = 5.2.0
+- C compiler > C++ = ENABLE -- to cross compile LLVM
+
+## `s390x-linux-gnu.config`
+
+For targets: `s390x-unknown-linux-gnu`
+
+- Path and misc options > Prefix directory = /x-tools/${CT\_TARGET}
+- Target options > Target Architecture = s390
+- Target options > Bitness = 64-bit
+- Operating System > Target OS = linux
+- Operating System > Linux kernel version = 3.10.93 -- ~RHEL7 kernel
+- C-library > glibc version = 2.17 -- ~RHEL7 glibc
+- C compiler > gcc version = 5.2
+- C compiler > C++ = ENABLE -- to cross compile LLVM