Change MSYSTEM to CLANG64 uniformly

5 files changed, 14 insertions, 20 deletions

diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh
index 87f9b96525..19afcdb5f6 100755
--- a/.gitlab/ci.sh
+++ b/.gitlab/ci.sh
@@ -59,7 +59,7 @@ Environment variables affecting both build systems:
   CROSS_TARGET      Triple of cross-compilation target.
   VERBOSE           Set to non-empty for verbose build output
   RUNTEST_ARGS      Arguments passed to runtest.py
-  MSYSTEM           (Windows-only) Which platform to build form (MINGW64 or MINGW32).
+  MSYSTEM           (Windows-only) Which platform to build from (CLANG64).
   IGNORE_PERF_FAILURES
                     Whether to ignore perf failures (one of "increases",
                     "decreases", or "all")
@@ -141,11 +141,7 @@ function setup_locale() {
 
 function mingw_init() {
   case "$MSYSTEM" in
-    MINGW32)
-      target_triple="i386-unknown-mingw32"
-      boot_triple="i386-unknown-mingw32" # triple of bootstrap GHC
-      ;;
-    MINGW64)
+    CLANG64)
       target_triple="x86_64-unknown-mingw32"
       boot_triple="x86_64-unknown-mingw32" # triple of bootstrap GHC
       ;;
@@ -320,8 +316,7 @@ function fetch_cabal() {
         # N.B. Windows uses zip whereas all others use .tar.xz
         MSYS_*|MINGW*)
           case "$MSYSTEM" in
-            MINGW32) cabal_arch="i386" ;;
-            MINGW64) cabal_arch="x86_64" ;;
+            CLANG64) cabal_arch="x86_64" ;;
             *) fail "unknown MSYSTEM $MSYSTEM" ;;
           esac
           url="https://downloads.haskell.org/~cabal/cabal-install-$v/cabal-install-$v-$cabal_arch-windows.zip"
diff --git a/.gitlab/gen_ci.hs b/.gitlab/gen_ci.hs
index c06c1c8463..f1d451732b 100755
--- a/.gitlab/gen_ci.hs
+++ b/.gitlab/gen_ci.hs
@@ -375,7 +375,7 @@ opsysVariables Amd64 (Darwin {}) =
 
           ]
 opsysVariables _ (Windows {}) =
-  mconcat [ "MSYSTEM" =: "MINGW64"
+  mconcat [ "MSYSTEM" =: "CLANG64"
           , "HADRIAN_ARGS" =: "--docs=no-sphinx"
           , "LANG" =: "en_US.UTF-8"
           , "CABAL_INSTALL_VERSION" =: "3.8.1.0"
@@ -842,4 +842,3 @@ main = do
     [] -> B.putStrLn
     (fp:_) -> B.writeFile fp)
     (A.encode jobs)
-
diff --git a/.gitlab/jobs.yaml b/.gitlab/jobs.yaml
index c8fe55a71b..ce580bcd05 100644
--- a/.gitlab/jobs.yaml
+++ b/.gitlab/jobs.yaml
@@ -1798,7 +1798,7 @@
       "GHC_VERSION": "9.4.3",
       "HADRIAN_ARGS": "--docs=no-sphinx",
       "LANG": "en_US.UTF-8",
-      "MSYSTEM": "MINGW64",
+      "MSYSTEM": "CLANG64",
       "TEST_ENV": "x86_64-windows-int_native-validate",
       "XZ_OPT": "-9"
     }
@@ -1857,7 +1857,7 @@
       "GHC_VERSION": "9.4.3",
       "HADRIAN_ARGS": "--docs=no-sphinx",
       "LANG": "en_US.UTF-8",
-      "MSYSTEM": "MINGW64",
+      "MSYSTEM": "CLANG64",
       "TEST_ENV": "x86_64-windows-validate",
       "XZ_OPT": "-9"
     }
@@ -2963,7 +2963,7 @@
       "HADRIAN_ARGS": "--docs=no-sphinx",
       "IGNORE_PERF_FAILURES": "all",
       "LANG": "en_US.UTF-8",
-      "MSYSTEM": "MINGW64",
+      "MSYSTEM": "CLANG64",
       "TEST_ENV": "x86_64-windows-int_native-release+no_split_sections",
       "XZ_OPT": "-9"
     }
@@ -3023,7 +3023,7 @@
       "HADRIAN_ARGS": "--docs=no-sphinx",
       "IGNORE_PERF_FAILURES": "all",
       "LANG": "en_US.UTF-8",
-      "MSYSTEM": "MINGW64",
+      "MSYSTEM": "CLANG64",
       "TEST_ENV": "x86_64-windows-release+no_split_sections",
       "XZ_OPT": "-9"
     }
@@ -4331,7 +4331,7 @@
       "GHC_VERSION": "9.4.3",
       "HADRIAN_ARGS": "--docs=no-sphinx",
       "LANG": "en_US.UTF-8",
-      "MSYSTEM": "MINGW64",
+      "MSYSTEM": "CLANG64",
       "TEST_ENV": "x86_64-windows-int_native-validate"
     }
   },
@@ -4389,7 +4389,7 @@
       "GHC_VERSION": "9.4.3",
       "HADRIAN_ARGS": "--docs=no-sphinx",
       "LANG": "en_US.UTF-8",
-      "MSYSTEM": "MINGW64",
+      "MSYSTEM": "CLANG64",
       "TEST_ENV": "x86_64-windows-validate"
     }
   }
diff --git a/m4/ghc_convert_os.m4 b/m4/ghc_convert_os.m4
index 885ca24848..8e2825d940 100644
--- a/m4/ghc_convert_os.m4
+++ b/m4/ghc_convert_os.m4
@@ -27,7 +27,7 @@ AC_DEFUN([GHC_CONVERT_OS],[
         $3="$1"
         ;;
       msys)
-        AC_MSG_ERROR([Building GHC using the msys toolchain is not supported; please use mingw instead. Perhaps you need to set 'MSYSTEM=MINGW64 or MINGW32?'])
+        AC_MSG_ERROR([Building GHC using the msys toolchain is not supported; please use mingw instead. Perhaps you need to set 'MSYSTEM=CLANG64?'])
         ;;
       aix*) # e.g. powerpc-ibm-aix7.1.3.0
         $3="aix"
diff --git a/testsuite/tests/ffi/should_run/Makefile b/testsuite/tests/ffi/should_run/Makefile
index 03177f4e8a..f49712a90b 100644
--- a/testsuite/tests/ffi/should_run/Makefile
+++ b/testsuite/tests/ffi/should_run/Makefile
@@ -52,7 +52,7 @@ T15933:
 
 .PHONY: T22159
 T22159:
-	C_INCLUDE_PATH=/mingw64/include '$(TEST_HC)' $(TEST_HC_OPTS) -c T22159.hs
-	C_INCLUDE_PATH=/mingw64/include '$(TEST_HC)' $(TEST_HC_OPTS) -c T22159_c.c
-	C_INCLUDE_PATH=/mingw64/include '$(TEST_HC)' $(TEST_HC_OPTS) T22159.o T22159_c.o -o T22159
+	C_INCLUDE_PATH=/clang64/include '$(TEST_HC)' $(TEST_HC_OPTS) -c T22159.hs
+	C_INCLUDE_PATH=/clang64/include '$(TEST_HC)' $(TEST_HC_OPTS) -c T22159_c.c
+	C_INCLUDE_PATH=/clang64/include '$(TEST_HC)' $(TEST_HC_OPTS) T22159.o T22159_c.o -o T22159
 	./T22159