Merge branch 'older-glibc' into rollup

2017-01-20 08:36:50 -08:00
parent 1f342a68cc 0a7420acd1
commit 5e8d7a4b7c
19 changed files with 2856 additions and 36 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,9 +22,10 @@ matrix:
    - env: IMAGE=dist-powerpc-linux DEPLOY=1
    - env: IMAGE=dist-powerpc64-linux DEPLOY=1
    - env: IMAGE=dist-s390x-linux-netbsd DEPLOY=1
-    - env: IMAGE=i686-gnu DEPLOY=1
+    - env: IMAGE=dist-x86-linux DEPLOY=1
+    - env: IMAGE=i686-gnu
    - env: IMAGE=i686-gnu-nopt
-    - env: IMAGE=x86_64-gnu DEPLOY=1
+    - env: IMAGE=x86_64-gnu
    - env: IMAGE=x86_64-gnu-full-bootstrap
    - env: IMAGE=x86_64-gnu-aux
    - env: IMAGE=x86_64-gnu-debug