Update Travis.

.appveyor.yml

@@ -19,7 +19,7 @@ environment:
 
 init:
   - git config --global core.autocrlf input
-  - where bash & where cat & where curl & where git & where gzip & where readlink & where sed & where sha256sum & where tar
+  - where bash & where cat & where curl & where file & where git & where gzip & where readlink & where sed & where sha256sum & where tar
 # - bash --version & git --version & sed --version & tar --version
   - git --version & bash --version
 # - dir "c:\Program Files\Git\usr\bin"

.editorconfig

@@ -10,9 +10,12 @@ indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-[{GNUmakefile,Makefile,MMakefile}]
+[{GNUmakefile*,MMakefile*,Makefile*,Makevars*,*.mk}]
 indent_size = 8
 indent_style = tab
 
 [*.S]
 indent_size = 8
+
+[*.yml]
+indent_size = 2

.gitlab-ci.yml

@@ -1,26 +1,45 @@
 # Support for GibLab CI -- https://gitlab.com/
 # Copyright (C) Markus Franz Xaver Johannes Oberhumer
 
-.fedora_install_compilers: &fedora_install_compilers
-  time dnf install -y --best --allowerasing
-    coreutils curl diffutils grep gzip sed
-    bzip2 file findutils git perl tar wget which xz
-    clang gcc gcc-c++ lcov make valgrind
-    glibc-devel      libasan      libstdc++-devel      libubsan      zlib-devel
-    glibc-devel.i686 libasan.i686 libstdc++-devel.i686 libubsan.i686 zlib-devel.i686
-
 before_script:
   - export TRAVIS_OS_NAME=linux
   - unset CROSS C B T X
   - uname -a; pwd; id; umask; env
-  - time rpm -qa | LC_ALL=C sort
+  - cat /etc/os-release || true
-  - *fedora_install_compilers
+  -
+    if egrep -q '^PRETTY_NAME="?Fedora' /etc/os-release; then
+      time rpm -qa | LC_ALL=C sort;
+      time dnf install -y --best --allowerasing
+        coreutils curl diffutils grep gzip sed
+        bzip2 file findutils git perl tar wget which xz
+        clang gcc gcc-c++ lcov make valgrind
+        glibc-devel      libasan      libstdc++-devel      libubsan      zlib-devel
+        glibc-devel.i686 libasan.i686 libstdc++-devel.i686 libubsan.i686 zlib-devel.i686;
+    fi
+  -
+    if egrep -q '^PRETTY_NAME="?Ubuntu' /etc/os-release; then
+      export DEBIAN_FRONTEND=noninteractive;
+      time dpkg -l;
+      time apt-get -yq update;
+      time apt-get -yq --no-install-suggests --no-install-recommends --force-yes upgrade;
+      time apt-get -yq --no-install-suggests --no-install-recommends --force-yes install
+        build-essential ca-certificates curl file git wget xz-utils zlib1g-dev;
+    fi
+  -
+    if egrep -q '^PRETTY_NAME="?Ubuntu 16\.04' /etc/os-release; then
+      dpkg --add-architecture i386;
+      time apt-get -yq update;
+      time apt-get -yq --no-install-suggests --no-install-recommends --force-yes install
+        crossbuild-essential-arm64 crossbuild-essential-armel crossbuild-essential-armhf
+        crossbuild-essential-powerpc crossbuild-essential-ppc64el crossbuild-essential-s390x
+        qemu wine;
+    fi
   - umask 022; mkdir -p ../deps ../build/gitlab
-  - git submodule update --init --recursive
+  - time git submodule update --init --recursive
   - cd ../deps && time wget -q -O - https://github.com/upx/upx/releases/download/v3.00/ucl-1.03.tar.xz | tar -xJ
   - cd ../deps && time wget -q -O - https://github.com/upx/upx/releases/download/v3.00/zlib-1.2.8.tar.xz | tar -xJ
   - cd ../deps && time git clone https://github.com/upx/upx-testsuite
-  - cd $CI_PROJECT_DIR
+  - cd $CI_PROJECT_DIR; pwd
 
 Fedora23-clang+gcc-m32+m64:
   image: fedora:23
@@ -56,4 +75,28 @@ Fedora24-clang+gcc-m32+m64:
   tags: [ shared ]
   except: [ tags ]
 
+Ubuntu1204-gcc-m64:
+  image: ubuntu:12.04
+  script:
+  - time C=gcc-m64              bash ./.github/travis_build.sh
+  - time C=gcc-m64              bash ./.github/travis_testsuite_1.sh
+  tags: [ shared ]
+  except: [ tags ]
+
+Ubuntu1404-gcc-m64:
+  image: ubuntu:14.04
+  script:
+  - time C=gcc-m64              bash ./.github/travis_build.sh
+  - time C=gcc-m64              bash ./.github/travis_testsuite_1.sh
+  tags: [ shared ]
+  except: [ tags ]
+
+Ubuntu1604-gcc-m64:
+  image: ubuntu:16.04
+  script:
+  - time C=gcc-m64              bash ./.github/travis_build.sh
+  - time C=gcc-m64              bash ./.github/travis_testsuite_1.sh
+  tags: [ shared ]
+  except: [ tags ]
+
 # vim:set ts=2 sw=2 et:

.travis.yml

@@ -161,31 +161,31 @@ matrix:
       env: CROSS=x86_64-w64-mingw32 C=gcc-4.6 T=wine
       addons: { apt: { packages: [ "binutils-mingw-w64-x86-64", "g++-mingw-w64-x86-64", "wine" ] } }
     - os: osx
+      osx_image: xcode6.4
       compiler: clang
       # must use debug build or else we get "ld: internal error: atom not found" when linking
       env: C=clang-602-m32 B=debug
-      osx_image: xcode6.4
     - os: osx
+      osx_image: xcode6.4
       compiler: clang
       # must use debug build or else we get "ld: internal error: atom not found" when linking
       env: C=clang-602-m64 B=debug
-      osx_image: xcode6.4
     - os: osx
+      osx_image: xcode7.3
       compiler: clang
       env: C=clang-703-m32
-      osx_image: xcode7.3
     - os: osx
+      osx_image: xcode7.3
       compiler: clang
       env: C=clang-703-m64
-      osx_image: xcode7.3
     - os: osx
+      osx_image: xcode8.1
       compiler: clang
       env: C=clang-800-m32
-      osx_image: xcode8
     - os: osx
+      osx_image: xcode8.1
       compiler: clang
       env: C=clang-800-m64
-      osx_image: xcode8
 
 install:
   - umask 022; cd $TRAVIS_BUILD_DIR && mkdir -p ../deps