Revert "Windows: Bump to GCC 7.2 for GHC 8.4"

This reverts commit b62097d10e0ff490f862661a24e3ca1cc1bba841.

2 files changed, 40 insertions, 39 deletions

diff --git a/mk/get-win32-tarballs.sh b/mk/get-win32-tarballs.sh
index 6ce8424e45..b3c9e0776a 100755
--- a/mk/get-win32-tarballs.sh
+++ b/mk/get-win32-tarballs.sh
@@ -94,28 +94,29 @@ download_tarballs() {
     local format_url="/${mingw_arch}/${package_prefix}-${mingw_arch}"
 
     download_mingw "${format_url}-crt-git-5.0.0.4795.e3d96cb1-1-any.pkg.tar.xz"
-    download_mingw "${format_url}-winpthreads-git-5.0.0.4850.d1662dc7-1-any.pkg.tar.xz"
-    download_mingw "${format_url}-headers-git-5.0.0.4966.1eee2140-1-any.pkg.tar.xz"
-    download_mingw "${format_url}-libwinpthread-git-5.0.0.4850.d1662dc7-1-any.pkg.tar.xz"
-    download_mingw "${format_url}-zlib-1.2.8-9-any.pkg.tar.xz"
-    download_mingw "${format_url}-isl-0.18-1-any.pkg.tar.xz"
-    download_mingw "${format_url}-mpfr-3.1.6-1-any.pkg.tar.xz"
+    download_mingw "${format_url}-winpthreads-git-5.0.0.4761.02bea78-1-any.pkg.tar.xz"
+    download_mingw "${format_url}-headers-git-5.0.0.4797.31e66d7e-1-any.pkg.tar.xz"
+    download_mingw "${format_url}-libwinpthread-git-5.0.0.4761.02bea78-1-any.pkg.tar.xz"
+    download_mingw "${format_url}-zlib-1.2.11-1-any.pkg.tar.xz"
+    download_mingw "${format_url}-isl-0.17.1-1-any.pkg.tar.xz"
+    download_mingw "${format_url}-mpfr-3.1.5.p1-1-any.pkg.tar.xz"
     download_mingw "${format_url}-gmp-6.1.2-1-any.pkg.tar.xz"
-    download_mingw "${format_url}-binutils-2.29.1-1-any.pkg.tar.xz"
-    download_mingw "${format_url}-libidn2-2.0.4-1-any.pkg.tar.xz"
-    download_mingw "${format_url}-gcc-7.2.0-1-any.pkg.tar.xz"
+    download_mingw "${format_url}-binutils-2.28-1-any.pkg.tar.xz"
+    download_mingw "${format_url}-libidn-1.33-1-any.pkg.tar.xz"
+    download_mingw "${format_url}-gcc-6.3.0-2-any.pkg.tar.xz"
 
     # Upstream is unfortunately quite inconsistent in naming
     if test "$mingw_arch" != "sources"; then
         download_mingw "${format_url}-mpc-1.0.3-2-any.pkg.tar.xz"
-        download_mingw "${format_url}-gcc-libs-7.2.0-1-any.pkg.tar.xz"
-        download_file "https://downloads.haskell.org/~ghc/mingw/ghc-perl-1.tar.gz" "ghc-tarballs/perl/ghc-perl-1.tar.gz" "Windows Perl binary distributions" "" ""
+        download_mingw "${format_url}-gcc-libs-6.3.0-2-any.pkg.tar.xz"
     else
         local format_url="${mingw_base_url}/${mingw_arch}/${package_prefix}"
         download_mingw "${format_url}-i686-mpc-1.0.3-2.src.tar.gz"
         download_mingw "${format_url}-x86_64-mpc-1.0.3-2.src.tar.gz"
     fi
 
+    download_file "https://downloads.haskell.org/~ghc/mingw/ghc-perl-1.tar.gz" "ghc-tarballs/perl/ghc-perl-1.tar.gz" "Windows Perl binary distributions"
+
     if ! test "$missing_files" = "0"
     then
         exit 2
diff --git a/mk/win32-tarballs.md5sum b/mk/win32-tarballs.md5sum
index 2c2d3df93a..c60487a066 100644
--- a/mk/win32-tarballs.md5sum
+++ b/mk/win32-tarballs.md5sum
@@ -1,39 +1,39 @@
+ec777eeef661d7e51b2e370ecbef486e ghc-tarballs/mingw-w64/sources/mingw-w64-binutils-2.28-1.src.tar.gz
 d0b3537c3f56b6f396b3dc23a905d186 ghc-tarballs/mingw-w64/sources/mingw-w64-crt-git-5.0.0.4795.e3d96cb1-1.src.tar.gz
-51d1006727d50a599bf30c34537bb6a9 ghc-tarballs/mingw-w64/sources/mingw-w64-binutils-2.29.1-1.src.tar.gz
-4578c232f7ed327bd6a364737cb018f5 ghc-tarballs/mingw-w64/sources/mingw-w64-gcc-7.2.0-1.src.tar.gz
+d7336be322afce1786a1324703f037e1 ghc-tarballs/mingw-w64/sources/mingw-w64-gcc-6.3.0-2.src.tar.gz
 b605210c3d1b03092e3b223d1ccf4001 ghc-tarballs/mingw-w64/sources/mingw-w64-gmp-6.1.2-1.src.tar.gz
-1ad83604bb58ecf43f26843975046c1c ghc-tarballs/mingw-w64/sources/mingw-w64-headers-git-5.0.0.4966.1eee2140-1.src.tar.gz
+9a8a37d73edcbd130211141a4a4eb6b3 ghc-tarballs/mingw-w64/sources/mingw-w64-headers-git-5.0.0.4797.31e66d7e-1.src.tar.gz
 5c24d319656ed61e517dfa0fee7e475c ghc-tarballs/mingw-w64/sources/mingw-w64-i686-mpc-1.0.3-2.src.tar.gz
-214032557d2474f10c23c33bdaced8e5 ghc-tarballs/mingw-w64/sources/mingw-w64-isl-0.18-1.src.tar.gz
-8c7efe60059c4c80d0d1966c943b5aaa ghc-tarballs/mingw-w64/sources/mingw-w64-libidn2-2.0.4-1.src.tar.gz
-18e9d17e968773c0691c50d9ceeede34 ghc-tarballs/mingw-w64/sources/mingw-w64-mpfr-3.1.6-1.src.tar.gz
-0462bc73a8b15a68dece429f6f33ca81 ghc-tarballs/mingw-w64/sources/mingw-w64-winpthreads-git-5.0.0.4850.d1662dc7-1.src.tar.gz
+e0b495821486711fc113de0d9c648498 ghc-tarballs/mingw-w64/sources/mingw-w64-isl-0.17.1-1.src.tar.gz
+dc2409bca461c33e7da0c0cebd8b4dd9 ghc-tarballs/mingw-w64/sources/mingw-w64-libidn-1.33-1.src.tar.gz
+40bea8ba145a8e84d558b3d0ee6ec58e ghc-tarballs/mingw-w64/sources/mingw-w64-mpfr-3.1.5.p1-1.src.tar.gz
+fbbe1bcca01a0dfc728d4c257bbdf82c ghc-tarballs/mingw-w64/sources/mingw-w64-winpthreads-git-5.0.0.4761.02bea78-1.src.tar.gz
 d4261042f502998006c57f0e6517998e ghc-tarballs/mingw-w64/sources/mingw-w64-x86_64-mpc-1.0.3-2.src.tar.gz
+1c3d0adfc59cc2cc0bdf2a956eb999bd ghc-tarballs/mingw-w64/sources/mingw-w64-zlib-1.2.11-1.src.tar.gz
+c2ea634a76f7e6ba5af529a662a18b23 ghc-tarballs/mingw-w64/x86/mingw-w64-i686-binutils-2.28-1-any.pkg.tar.xz
 534bb4756482f3271308576cdadfe5dc ghc-tarballs/mingw-w64/x86/mingw-w64-i686-crt-git-5.0.0.4795.e3d96cb1-1-any.pkg.tar.xz
-32078e2a67e34ff6c0b1795fe6ed9d36 ghc-tarballs/mingw-w64/sources/mingw-w64-zlib-1.2.8-9.src.tar.gz
-66e4fc3e62c0fa6723c0d27bdb832962 ghc-tarballs/mingw-w64/x86/mingw-w64-i686-binutils-2.29.1-1-any.pkg.tar.xz
-634ad635913713abc0dbcb0ebef8c85b ghc-tarballs/mingw-w64/x86/mingw-w64-i686-gcc-7.2.0-1-any.pkg.tar.xz
-5343540bc6caa7ada564483f3a1fdff7 ghc-tarballs/mingw-w64/x86/mingw-w64-i686-gcc-libs-7.2.0-1-any.pkg.tar.xz
+1cf082fd47b5c156cfe1d4710b801834 ghc-tarballs/mingw-w64/x86/mingw-w64-i686-gcc-6.3.0-2-any.pkg.tar.xz
+718e0471f51553b4e94e8539c2b9b470 ghc-tarballs/mingw-w64/x86/mingw-w64-i686-gcc-libs-6.3.0-2-any.pkg.tar.xz
 2f97e71e4ec122151c20350433268d8b ghc-tarballs/mingw-w64/x86/mingw-w64-i686-gmp-6.1.2-1-any.pkg.tar.xz
-07f374e6eb4846169921551ee73103e6 ghc-tarballs/mingw-w64/x86/mingw-w64-i686-headers-git-5.0.0.4966.1eee2140-1-any.pkg.tar.xz
-ac7017bd5d69030cfe76e475e213b43a ghc-tarballs/mingw-w64/x86/mingw-w64-i686-isl-0.18-1-any.pkg.tar.xz
-f758e0d121619b166dbe36060c641767 ghc-tarballs/mingw-w64/x86/mingw-w64-i686-libidn2-2.0.4-1-any.pkg.tar.xz
-3c718f86311bdd8c4438513a0f417391 ghc-tarballs/mingw-w64/x86/mingw-w64-i686-libwinpthread-git-5.0.0.4850.d1662dc7-1-any.pkg.tar.xz
+2afc75ab51093ba5d3a740eec3340f6a ghc-tarballs/mingw-w64/x86/mingw-w64-i686-headers-git-5.0.0.4797.31e66d7e-1-any.pkg.tar.xz
+9fce16db004f00e967eb15efe0cdf86b ghc-tarballs/mingw-w64/x86/mingw-w64-i686-isl-0.17.1-1-any.pkg.tar.xz
+d25d5de6bf10d00046f194e3d584aa4f ghc-tarballs/mingw-w64/x86/mingw-w64-i686-libidn-1.33-1-any.pkg.tar.xz
+8ad554e582ec82a88842eea44b5bfd86 ghc-tarballs/mingw-w64/x86/mingw-w64-i686-libwinpthread-git-5.0.0.4761.02bea78-1-any.pkg.tar.xz
 719e76fa7a54a8676d2e60af3bb13c45 ghc-tarballs/mingw-w64/x86/mingw-w64-i686-mpc-1.0.3-2-any.pkg.tar.xz
+1424415317cf0ed9f7ee19ae32bba330 ghc-tarballs/mingw-w64/x86/mingw-w64-i686-mpfr-3.1.5.p1-1-any.pkg.tar.xz
+567b70b4e1ff961e1cb4875fa9dbb746 ghc-tarballs/mingw-w64/x86/mingw-w64-i686-winpthreads-git-5.0.0.4761.02bea78-1-any.pkg.tar.xz
+170af43955dd671c61a702f7809d230c ghc-tarballs/mingw-w64/x86/mingw-w64-i686-zlib-1.2.11-1-any.pkg.tar.xz
+e3b8e1ca85fd0d4c69bfc7f77c51301d ghc-tarballs/mingw-w64/x86_64/mingw-w64-x86_64-binutils-2.28-1-any.pkg.tar.xz
 3780a25a6f20eef9b143f47f4b615e39 ghc-tarballs/mingw-w64/x86_64/mingw-w64-x86_64-crt-git-5.0.0.4795.e3d96cb1-1-any.pkg.tar.xz
-9d71b5b4698310a6b961a7d9e273a204 ghc-tarballs/mingw-w64/x86/mingw-w64-i686-mpfr-3.1.6-1-any.pkg.tar.xz
-8912539507692ecf3cebcd5405e1a526 ghc-tarballs/mingw-w64/x86/mingw-w64-i686-winpthreads-git-5.0.0.4850.d1662dc7-1-any.pkg.tar.xz
-87c65e9b2930436a75dfd7d459ae98cb ghc-tarballs/mingw-w64/x86/mingw-w64-i686-zlib-1.2.8-9-any.pkg.tar.xz
-a7e26551a47ce247e432d3f3db416f2b ghc-tarballs/mingw-w64/x86_64/mingw-w64-x86_64-binutils-2.29.1-1-any.pkg.tar.xz
-c4ce9e9a696a76a350d6ed4222fe205e ghc-tarballs/mingw-w64/x86_64/mingw-w64-x86_64-gcc-7.2.0-1-any.pkg.tar.xz
-872a54d953e7d9e6f375e3712d540701 ghc-tarballs/mingw-w64/x86_64/mingw-w64-x86_64-gcc-libs-7.2.0-1-any.pkg.tar.xz
+405e8382778b294ee96b92e4023208af ghc-tarballs/mingw-w64/x86_64/mingw-w64-x86_64-gcc-6.3.0-2-any.pkg.tar.xz
+5e02648f21957b9e80f4e2fe1c1c0fca ghc-tarballs/mingw-w64/x86_64/mingw-w64-x86_64-gcc-libs-6.3.0-2-any.pkg.tar.xz
 1e1f79abc9fc0534d360c2889b10a9f5 ghc-tarballs/mingw-w64/x86_64/mingw-w64-x86_64-gmp-6.1.2-1-any.pkg.tar.xz
-8cce0779e70d5c3ef3564a11fb3bd931 ghc-tarballs/mingw-w64/x86_64/mingw-w64-x86_64-headers-git-5.0.0.4966.1eee2140-1-any.pkg.tar.xz
-e1c25a67656e3667847be1f5eba73862 ghc-tarballs/mingw-w64/x86_64/mingw-w64-x86_64-isl-0.18-1-any.pkg.tar.xz
-6faaa722dce8af954b30e39c4213d657 ghc-tarballs/mingw-w64/x86_64/mingw-w64-x86_64-libidn2-2.0.4-1-any.pkg.tar.xz
-df50f51f32efe8bff7a87f26c6832045 ghc-tarballs/mingw-w64/x86_64/mingw-w64-x86_64-libwinpthread-git-5.0.0.4850.d1662dc7-1-any.pkg.tar.xz
+0384f746a2f6f22258b4b882ceb23f56 ghc-tarballs/mingw-w64/x86_64/mingw-w64-x86_64-headers-git-5.0.0.4797.31e66d7e-1-any.pkg.tar.xz
+39c8b3b8e56b3b0bdef86cf32f1e09ba ghc-tarballs/mingw-w64/x86_64/mingw-w64-x86_64-isl-0.17.1-1-any.pkg.tar.xz
+c38366a4f262ff930550115fc632eeee ghc-tarballs/mingw-w64/x86_64/mingw-w64-x86_64-libidn-1.33-1-any.pkg.tar.xz
+e118ccb1b0a53484817a2ea037a7a548 ghc-tarballs/mingw-w64/x86_64/mingw-w64-x86_64-libwinpthread-git-5.0.0.4761.02bea78-1-any.pkg.tar.xz
 df1a7d4050568d83c265ae78c32ef30b ghc-tarballs/mingw-w64/x86_64/mingw-w64-x86_64-mpc-1.0.3-2-any.pkg.tar.xz
-d15495e807e2a87b917febedbfb3f5b3 ghc-tarballs/mingw-w64/x86_64/mingw-w64-x86_64-mpfr-3.1.6-1-any.pkg.tar.xz
-c5ffd1a27eb459242b46d76b066e557e ghc-tarballs/mingw-w64/x86_64/mingw-w64-x86_64-winpthreads-git-5.0.0.4850.d1662dc7-1-any.pkg.tar.xz
-60c3a388478f411b7a0908441ebeb537 ghc-tarballs/mingw-w64/x86_64/mingw-w64-x86_64-zlib-1.2.8-9-any.pkg.tar.xz
+0778972da5f9b18539cdfe18e86e9400 ghc-tarballs/mingw-w64/x86_64/mingw-w64-x86_64-mpfr-3.1.5.p1-1-any.pkg.tar.xz
+5c55c1e1091595645adc36c4c16b1ea6 ghc-tarballs/mingw-w64/x86_64/mingw-w64-x86_64-winpthreads-git-5.0.0.4761.02bea78-1-any.pkg.tar.xz
+ee5a7e4a9f098efc51f9373365099b11 ghc-tarballs/mingw-w64/x86_64/mingw-w64-x86_64-zlib-1.2.11-1-any.pkg.tar.xz
 b21d1681b61cf7a024e854096285b02e ghc-tarballs/perl/ghc-perl-1.tar.gz