From 0fb9ee21e68ca3e70cf236a63ba00b5ca32031ff Mon Sep 17 00:00:00 2001
From: Anthony Green <green@moxielogic.com>
Date: Wed, 6 Nov 2019 06:44:19 -0500
Subject: [PATCH] Use older test compiler.  Enable s390x testing.

---
 .travis.yml        | 6 ++++--
 .travis/build.sh   | 4 ----
 .travis/install.sh | 7 +++++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2af5feb..9b5711f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,10 @@ matrix:
     - os: osx
       env: HOST=arm-apple-darwin
     - os: linux
+      env: HOST=hppa-linux-gnu MEVAL='export CC="hppa-linux-gnu-gcc-7" && CXX="hppa-linux-gnu-g++-7"' CONFIGURE_OPTIONS=--disable-shared QEMU_LD_PREFIX=/usr/hppa-linux-gnu
+    - os: linux
+      env: HOST=s390x-linux-gnu MEVAL='export CC="s390x-linux-gnu-gcc-7" && CXX="s390x-linux-gnu-g++-7"' CONFIGURE_OPTIONS=--disable-shared QEMU_LD_PREFIX=/usr/s390x-linux-gnu
+    - os: linux
       env: HOST=arm32v7-linux-gnu LIBFFI_TEST_OPTIMIZATION="-O0"
     - os: linux
       env: HOST=arm32v7-linux-gnu LIBFFI_TEST_OPTIMIZATION="-O2"
@@ -22,8 +26,6 @@ matrix:
     - os: linux
       env: HOST=mips64el-linux-gnu
     - os: linux
-      env: HOST=hppa-linux-gnu MEVAL='export CC="hppa-linux-gnu-gcc-8" && CXX="hppa-linux-gnu-g++-8"' CONFIGURE_OPTIONS=--disable-shared QEMU_LD_PREFIX=/usr/hppa-linux-gnu
-    - os: linux
       compiler: gcc
       env: HOST=i386-pc-linux-gnu MEVAL='export CC="$CC -m32" && CXX="$CXX -m32"'
     - os: linux
diff --git a/.travis/build.sh b/.travis/build.sh
index ac56755..7baa81f 100755
--- a/.travis/build.sh
+++ b/.travis/build.sh
@@ -56,10 +56,6 @@ case "$HOST" in
     aarch64-linux-gnu| powerpc64le-unknown-linux-gnu | mips64el-linux-gnu | sparc64-linux-gnu)
         build_cfarm
 	;;
-    s390x-linux-gnu)
-	./autogen.sh
-	build_foreign_linux s390x s390x/ubuntu
-	;;
     *)
 	./autogen.sh
 	build_linux
diff --git a/.travis/install.sh b/.travis/install.sh
index 2fdbdc5..4d344de 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -12,11 +12,14 @@ else
   case $HOST in
       aarch64-linux-gnu | powerpc64le-unknown-linux-gnu | mips64el-linux-gnu | sparc64-linux-gnu)
           ;;	  
-      arm32v7-linux-gnu | s390x-linux-gnu)
+      arm32v7-linux-gnu )
 	  sudo apt-get install qemu-user-static
 	  ;;
       hppa-linux-gnu )
-	  sudo apt-get install qemu-user-static g++-8-hppa-linux-gnu
+	  sudo apt-get install -y qemu-user-static g++-7-hppa-linux-gnu
+	  ;;
+      s390x-linux-gnu )
+	  sudo apt-get install -y qemu-user-static g++-7-s390x-linux-gnu
 	  ;;
       i386-pc-linux-gnu)
 	  sudo apt-get install gcc-multilib g++-multilib;
-- 
2.7.4