Merge 8.6

1 files changed, 61 insertions, 61 deletions

diff --git a/.travis.yml b/.travis.yml
index 1d5f4dd..587c651 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -158,136 +158,136 @@ matrix:
         - BUILD_DIR=macosx
       install: []
       script: *mactest
-# Test with mingw-w64 (32 bit) cross-compile
+# Test with mingw-w64 cross-compile
 # Doesn't run tests because wine is only an imperfect Windows emulation
-    - name: "Linux-cross-Windows-32/GCC/Shared/no test"
+    - name: "Linux-cross-Windows/GCC/Shared/no test"
       os: linux
       dist: xenial
-      compiler: i686-w64-mingw32-gcc
-      addons: &mingw32
+      compiler: x86_64-w64-mingw32-gcc
+      addons: &mingw64
         apt:
           packages:
             - gcc-mingw-w64-base
-            - binutils-mingw-w64-i686
-            - gcc-mingw-w64-i686
+            - binutils-mingw-w64-x86-64
+            - gcc-mingw-w64-x86-64
             - gcc-mingw-w64
-            - gcc-multilib
             - wine
       env:
         - BUILD_DIR=win
-        - CFGOPT=--host=i686-w64-mingw32
-      script: &crosstest
-        - make all tcltest
-        # Include a high visibility marker that tests are skipped outright
-        - >
-          echo "`tput setaf 3`SKIPPED TEST: CROSS COMPILING`tput sgr0`"
-    - name: "Linux-cross-Windows-32/GCC/Static/no test"
+        - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit"
+      script: *crosstest
+    - name: "Linux-cross-Windows/GCC/Static/no test"
       os: linux
       dist: xenial
-      compiler: i686-w64-mingw32-gcc
-      addons: *mingw32
+      compiler: x86_64-w64-mingw32-gcc
+      addons: *mingw64
       env:
         - BUILD_DIR=win
-        - CFGOPT="--host=i686-w64-mingw32 --disable-shared"
+        - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit --disable-shared"
       script: *crosstest
-    - name: "Linux-cross-Windows-32/GCC/Shared/no test: UTF_MAX=6"
+    - name: "Linux-cross-Windows-64/GCC/Shared/no test: UTF_MAX=6"
       os: linux
       dist: xenial
-      compiler: i686-w64-mingw32-gcc
-      addons: *mingw32
+      compiler: x86_64-w64-mingw32-gcc
+      addons: *mingw64
       env:
         - BUILD_DIR=win
-        - CFGOPT="--host=i686-w64-mingw32 CFLAGS=-DTCL_UTF_MAX=6"
+        - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit CFLAGS=-DTCL_UTF_MAX=6"
       script: *crosstest
-    - name: "Linux-cross-Windows-32/GCC/Shared/no test: UTF_MAX=3"
+    - name: "Linux-cross-Windows/GCC/Shared/no test: UTF_MAX=3"
       os: linux
       dist: xenial
-      compiler: i686-w64-mingw32-gcc
-      addons: *mingw32
+      compiler: x86_64-w64-mingw32-gcc
+      addons: *mingw64
       env:
         - BUILD_DIR=win
-        - CFGOPT="--host=i686-w64-mingw32 CFLAGS=-DTCL_UTF_MAX=3"
+        - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit CFLAGS=-DTCL_UTF_MAX=3"
       script: *crosstest
-    - name: "Linux-cross-Windows-32/GCC/Shared/no test: NO_DEPRECATED"
+    - name: "Linux-cross-Windows-64/GCC/Shared/no test: NO_DEPRECATED"
       os: linux
       dist: xenial
-      compiler: i686-w64-mingw32-gcc
-      addons: *mingw32
+      compiler: x86_64-w64-mingw32-gcc
+      addons: *mingw64
       env:
         - BUILD_DIR=win
-        - CFGOPT="--host=i686-w64-mingw32 CFLAGS=-DTCL_NO_DEPRECATED=1"
+        - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit CFLAGS=-DTCL_NO_DEPRECATED=1"
       script: *crosstest
-    - name: "Linux-cross-Windows-32/GCC/Debug/no test"
+    - name: "Linux-cross-Windows-64/GCC/Debug/no test"
       os: linux
       dist: xenial
-      compiler: i686-w64-mingw32-gcc
-      addons: *mingw32
+      compiler: x86_64-w64-mingw32-gcc
+      addons: *mingw64
       env:
         - BUILD_DIR=win
-        - CFGOPT="--host=i686-w64-mingw32 --enable-symbols"
+        - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit --enable-symbols"
       script: *crosstest
-# Test with mingw-w64 (64 bit)
+# Test with mingw-w64 (32 bit) cross-compile
 # Doesn't run tests because wine is only an imperfect Windows emulation
-    - name: "Linux-cross-Windows-64/GCC/Shared/no test"
+    - name: "Linux-cross-Windows-32/GCC/Shared/no test"
       os: linux
       dist: xenial
-      compiler: x86_64-w64-mingw32-gcc
-      addons: &mingw64
+      compiler: i686-w64-mingw32-gcc
+      addons: &mingw32
         apt:
           packages:
             - gcc-mingw-w64-base
-            - binutils-mingw-w64-x86-64
-            - gcc-mingw-w64-x86-64
+            - binutils-mingw-w64-i686
+            - gcc-mingw-w64-i686
             - gcc-mingw-w64
+            - gcc-multilib
             - wine
       env:
         - BUILD_DIR=win
-        - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit"
-      script: *crosstest
-    - name: "Linux-cross-Windows-64/GCC/Static/no test"
+        - CFGOPT=--host=i686-w64-mingw32
+      script: &crosstest
+        - make all tcltest
+        # Include a high visibility marker that tests are skipped outright
+        - >
+          echo "`tput setaf 3`SKIPPED TEST: CROSS COMPILING`tput sgr0`"
+    - name: "Linux-cross-Windows-32/GCC/Static/no test"
       os: linux
       dist: xenial
-      compiler: x86_64-w64-mingw32-gcc
-      addons: *mingw64
+      compiler: i686-w64-mingw32-gcc
+      addons: *mingw32
       env:
         - BUILD_DIR=win
-        - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit --disable-shared"
+        - CFGOPT="--host=i686-w64-mingw32 --disable-shared"
       script: *crosstest
-    - name: "Linux-cross-Windows-64/GCC/Shared/no test: UTF_MAX=6"
+    - name: "Linux-cross-Windows-32/GCC/Shared/no test: UTF_MAX=6"
       os: linux
       dist: xenial
-      compiler: x86_64-w64-mingw32-gcc
-      addons: *mingw64
+      compiler: i686-w64-mingw32-gcc
+      addons: *mingw32
       env:
         - BUILD_DIR=win
-        - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit CFLAGS=-DTCL_UTF_MAX=6"
+        - CFGOPT="--host=i686-w64-mingw32 CFLAGS=-DTCL_UTF_MAX=6"
       script: *crosstest
-    - name: "Linux-cross-Windows-64/GCC/Shared/no test: UTF_MAX=3"
+    - name: "Linux-cross-Windows-32/GCC/Shared/no test: UTF_MAX=3"
       os: linux
       dist: xenial
-      compiler: x86_64-w64-mingw32-gcc
-      addons: *mingw64
+      compiler: i686-w64-mingw32-gcc
+      addons: *mingw32
       env:
         - BUILD_DIR=win
-        - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit CFLAGS=-DTCL_UTF_MAX=3"
+        - CFGOPT="--host=i686-w64-mingw32 CFLAGS=-DTCL_UTF_MAX=3"
       script: *crosstest
-    - name: "Linux-cross-Windows-64/GCC/Shared/no test: NO_DEPRECATED"
+    - name: "Linux-cross-Windows-32/GCC/Shared/no test: NO_DEPRECATED"
       os: linux
       dist: xenial
-      compiler: x86_64-w64-mingw32-gcc
-      addons: *mingw64
+      compiler: i686-w64-mingw32-gcc
+      addons: *mingw32
       env:
         - BUILD_DIR=win
-        - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit CFLAGS=-DTCL_NO_DEPRECATED=1"
+        - CFGOPT="--host=i686-w64-mingw32 CFLAGS=-DTCL_NO_DEPRECATED=1"
       script: *crosstest
-    - name: "Linux-cross-Windows-64/GCC/Debug/no test"
+    - name: "Linux-cross-Windows-32/GCC/Debug/no test"
       os: linux
       dist: xenial
-      compiler: x86_64-w64-mingw32-gcc
-      addons: *mingw64
+      compiler: i686-w64-mingw32-gcc
+      addons: *mingw32
       env:
         - BUILD_DIR=win
-        - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit --enable-symbols"
+        - CFGOPT="--host=i686-w64-mingw32 --enable-symbols"
       script: *crosstest
 # Test on Windows with MSVC native
     - name: "Windows/MSVC/Shared"