Revert to older test cross compilers

diff --git a/.travis.yml b/.travis.yml
index 9b5711fc32342e9e50f9bad4f2b7aee124c63e16..b11dbc9343bb8257b15fbd2c299c942239ad29e5 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,9 +8,9 @@ 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
+      env: HOST=hppa-linux-gnu MEVAL='export CC="hppa-linux-gnu-gcc-5" && CXX="hppa-linux-gnu-g++-5"' 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
+      env: HOST=s390x-linux-gnu MEVAL='export CC="s390x-linux-gnu-gcc-5" && CXX="s390x-linux-gnu-g++-5"' CONFIGURE_OPTIONS=--disable-shared QEMU_LD_PREFIX=/usr/s390x-linux-gnu
     - os: linux
       env: HOST=arm32v7-linux-gnu LIBFFI_TEST_OPTIMIZATION="-O0"
     - os: linux

diff --git a/.travis/install.sh b/.travis/install.sh
index 4d344de81053ca71452bd0fbad8b599899f67967..fec9dbae37208bbd0ebf3e1123785668ee6405a3 100755 (executable)
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -16,10 +16,10 @@ else
          sudo apt-get install qemu-user-static
          ;;
       hppa-linux-gnu )
-         sudo apt-get install -y qemu-user-static g++-7-hppa-linux-gnu
+         sudo apt-get install -y qemu-user-static g++-5-hppa-linux-gnu
          ;;
       s390x-linux-gnu )
-         sudo apt-get install -y qemu-user-static g++-7-s390x-linux-gnu
+         sudo apt-get install -y qemu-user-static g++-5-s390x-linux-gnu
          ;;
       i386-pc-linux-gnu)
          sudo apt-get install gcc-multilib g++-multilib;