From 4bfdccb630c3d535bd12404640b358195873faee Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Fri, 4 Nov 2016 19:20:20 -0700
Subject: [PATCH] Add mips and s390x builders

---
 .travis.yml      | 38 +++++++++++++++++++++++++++++---------
 ci/run-docker.sh | 25 +++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 52f31e2140c..9d34e157336 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,39 +19,59 @@ matrix:
     # bundle all the gcc cross compilers to enable us to build OpenSSL
     - os: linux
       env: TARGET=arm-unknown-linux-gnueabi
-           DOCKER=alexcrichton/rust-slave-linux-cross:2016-04-05
+           DOCKER=alexcrichton/rust-slave-linux-cross:2016-10-11c
            SKIP_TESTS=1
     - os: linux
       env: TARGET=arm-unknown-linux-gnueabihf
-           DOCKER=alexcrichton/rust-slave-linux-cross:2016-04-05
+           DOCKER=alexcrichton/rust-slave-linux-cross:2016-10-11c
            SKIP_TESTS=1
     - os: linux
       env: TARGET=armv7-unknown-linux-gnueabihf
-           DOCKER=alexcrichton/rust-slave-linux-cross:2016-04-05
+           DOCKER=alexcrichton/rust-slave-linux-cross:2016-10-11c
            SKIP_TESTS=1
     - os: linux
       env: TARGET=aarch64-unknown-linux-gnu
-           DOCKER=alexcrichton/rust-slave-linux-cross:2016-04-05
+           DOCKER=alexcrichton/rust-slave-linux-cross:2016-10-11c
            SKIP_TESTS=1
     - os: linux
       env: TARGET=x86_64-unknown-freebsd
-           DOCKER=alexcrichton/rust-slave-linux-cross:2016-04-05
+           DOCKER=alexcrichton/rust-slave-linux-cross:2016-10-11c
            SKIP_TESTS=1
     - os: linux
       env: TARGET=x86_64-unknown-netbsd
-           DOCKER=alexcrichton/rust-slave-linux-cross:2016-04-05
+           DOCKER=alexcrichton/rust-slave-linux-cross:2016-10-11c
            SKIP_TESTS=1
     - os: linux
       env: TARGET=powerpc-unknown-linux-gnu
-           DOCKER=alexcrichton/rust-slave-linux-cross:2016-04-05
+           DOCKER=alexcrichton/rust-slave-linux-cross:2016-10-11c
            SKIP_TESTS=1
     - os: linux
       env: TARGET=powerpc64-unknown-linux-gnu
-           DOCKER=alexcrichton/rust-slave-linux-cross:2016-04-05
+           DOCKER=alexcrichton/rust-slave-linux-cross:2016-10-11c
            SKIP_TESTS=1
     - os: linux
       env: TARGET=powerpc64le-unknown-linux-gnu
-           DOCKER=alexcrichton/rust-slave-linux-cross:2016-04-05
+           DOCKER=alexcrichton/rust-slave-linux-cross:2016-10-11c
+           SKIP_TESTS=1
+    - os: linux
+      env: TARGET=mips-unknown-linux-gnu
+           DOCKER=alexcrichton/rust-slave-linux-cross:2016-10-11c
+           SKIP_TESTS=1
+    - os: linux
+      env: TARGET=mipsel-unknown-linux-gnu
+           DOCKER=alexcrichton/rust-slave-linux-cross:2016-10-11c
+           SKIP_TESTS=1
+    - os: linux
+      env: TARGET=mips64-unknown-linux-gnuabi64
+           DOCKER=alexcrichton/rust-slave-linux-cross:2016-10-11c
+           SKIP_TESTS=1
+    - os: linux
+      env: TARGET=mips64el-unknown-linux-gnuabi64
+           DOCKER=alexcrichton/rust-slave-linux-cross:2016-10-11c
+           SKIP_TESTS=1
+    - os: linux
+      env: TARGET=s390x-unknown-linux-gnu
+           DOCKER=alexcrichton/rust-slave-linux-cross:2016-10-11c
            SKIP_TESTS=1
 
     # On OSX we want to target 10.7 so we ensure that the appropriate
diff --git a/ci/run-docker.sh b/ci/run-docker.sh
index 7dc319edd35..8347684c7a6 100644
--- a/ci/run-docker.sh
+++ b/ci/run-docker.sh
@@ -80,6 +80,31 @@ case $TARGET in
     OPENSSL_CC=powerpc64le-linux-gnu-gcc
     OPENSSL_AR=powerpc64le-linux-gnu-ar
     ;;
+  mips-*-linux-*)
+    OPENSSL_OS=linux-mips32
+    OPENSSL_CC=mips-linux-gnu-gcc
+    OPENSSL_AR=mips-linux-gnu-ar
+    ;;
+  mipsel-*-linux-*)
+    OPENSSL_OS=linux-mips32
+    OPENSSL_CC=mipsel-linux-gnu-gcc
+    OPENSSL_AR=mipsel-linux-gnu-ar
+    ;;
+  mips64-*-linux-*)
+    OPENSSL_OS=linux64-mips64
+    OPENSSL_CC=mips64-linux-gnu-gcc
+    OPENSSL_AR=mips64-linux-gnu-ar
+    ;;
+  mips64el-*-linux-*)
+    OPENSSL_OS=linux64-mips64
+    OPENSSL_CC=mips64el-linux-gnu-gcc
+    OPENSSL_AR=mips64el-linux-gnu-ar
+    ;;
+  s390x-*-linux-*)
+    OPENSSL_OS=linux64-s390x
+    OPENSSL_CC=s390x-linux-gnu-gcc
+    OPENSSL_AR=s390x-linux-gnu-ar
+    ;;
   *)
     echo "can't cross compile OpenSSL for $TARGET"
     exit 1