Merge remote-tracking branch 'origin/wip/backports-9.4' into ghc-9.4

6 files changed, 164 insertions, 85 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6f0966cdae..1bc68650eb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -362,7 +362,7 @@ validate-x86_64-linux-deb10-make:
   extends: .build-x86_64-linux-deb10-make
   stage: full-build
   rules:
-    - if: '$CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/'
+    - if: '($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != "yes")'
 
 ############################################################
 # Validation via Pipelines (make)
diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh
index b91161896a..df8db03bb7 100755
--- a/.gitlab/ci.sh
+++ b/.gitlab/ci.sh
@@ -283,10 +283,10 @@ function fetch_ghc() {
       $TAR -xJf ghc.tar.xz || fail "failed to extract GHC binary distribution"
       case "$(uname)" in
         MSYS_*|MINGW*)
-          cp -r "ghc-${GHC_VERSION}"/* "$toolchain"
+          cp -r ghc-${GHC_VERSION}*/* "$toolchain"
           ;;
         *)
-          pushd "ghc-${GHC_VERSION}"
+          pushd "ghc-${GHC_VERSION}*"
           ./configure --prefix="$toolchain"
           "$MAKE" install
           popd
diff --git a/.gitlab/gen_ci.hs b/.gitlab/gen_ci.hs
index c571381f11..40c5e29e98 100755
--- a/.gitlab/gen_ci.hs
+++ b/.gitlab/gen_ci.hs
@@ -309,6 +309,11 @@ opsysVariables _ FreeBSD = mconcat
   , "GHC_VERSION" =: "9.2.2"
   , "CABAL_INSTALL_VERSION" =: "3.2.0.0"
   ]
+opsysVariables ARMv7 (Linux distro) =
+  distroVariables distro <>
+  mconcat [ -- ld.gold is affected by #16177 and therefore cannot be used.
+            "CONFIGURE_ARGS" =: "LD=ld.lld"
+          ]
 opsysVariables _ (Linux distro) = distroVariables distro
 opsysVariables AArch64 (Darwin {}) =
   mconcat [ "NIX_SYSTEM" =: "aarch64-darwin"
@@ -342,13 +347,14 @@ opsysVariables _ _ = mempty
 
 distroVariables :: LinuxDistro -> Variables
 distroVariables Alpine = mconcat
-  [ "CONFIGURE_ARGS" =: "--disable-ld-override"
+  [ -- Due to #20266
+    "CONFIGURE_ARGS" =: "--disable-ld-override"
   , "INSTALL_CONFIGURE_ARGS" =: "--disable-ld-override"
   , "HADRIAN_ARGS" =: "--docs=no-sphinx"
--- encoding004: due to lack of locale support
--- T10458, ghcilink002: due to #17869
--- linker_unload_native: due to musl not supporting any means of probing dynlib dependencies
--- (see Note [Object unloading]).
+    -- encoding004: due to lack of locale support
+    -- T10458, ghcilink002: due to #17869
+    -- linker_unload_native: due to musl not supporting any means of probing dynlib dependencies
+    -- (see Note [Object unloading]).
   , "BROKEN_TESTS" =: "encoding004 T10458 ghcilink002 linker_unload_native"
   ]
 distroVariables Fedora33 = mconcat
@@ -388,6 +394,7 @@ data Artifacts
   = Artifacts { artifactPaths :: [String]
               , junitReport   :: String
               , expireIn      :: String
+              , artifactsWhen :: ArtifactsWhen
               }
 
 instance ToJSON Artifacts where
@@ -397,8 +404,16 @@ instance ToJSON Artifacts where
       ]
     , "expire_in" A..= expireIn
     , "paths" A..= artifactPaths
+    , "when" A..= artifactsWhen
     ]
 
+data ArtifactsWhen = ArtifactsOnSuccess | ArtifactsOnFailure | ArtifactsAlways
+
+instance ToJSON ArtifactsWhen where
+  toJSON ArtifactsOnSuccess = "on_success"
+  toJSON ArtifactsOnFailure = "on_failure"
+  toJSON ArtifactsAlways = "always"
+
 -----------------------------------------------------------------------------
 -- Rules, when do we run a job
 -----------------------------------------------------------------------------
@@ -588,6 +603,7 @@ job arch opsys buildConfig = (jobName, Job {..})
       , expireIn = "2 weeks"
       , artifactPaths = [binDistName arch opsys buildConfig ++ ".tar.xz"
                         ,"junit.xml"]
+      , artifactsWhen = ArtifactsAlways
       }
 
     jobCache
diff --git a/.gitlab/jobs.yaml b/.gitlab/jobs.yaml
index c3dd89ce59..6d1e1da94f 100644
--- a/.gitlab/jobs.yaml
+++ b/.gitlab/jobs.yaml
@@ -15,7 +15,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "aarch64-darwin-$CACHE_REV",
@@ -76,7 +77,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "aarch64-linux-deb10-$CACHE_REV",
@@ -133,7 +135,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "armv7-linux-deb10-$CACHE_REV",
@@ -171,7 +174,7 @@
       "BIGNUM_BACKEND": "gmp",
       "BIN_DIST_NAME": "ghc-armv7-linux-deb10-validate",
       "BUILD_FLAVOUR": "validate",
-      "CONFIGURE_ARGS": "",
+      "CONFIGURE_ARGS": "LD=ld.lld ",
       "TEST_ENV": "armv7-linux-deb10-validate"
     }
   },
@@ -190,7 +193,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "i386-linux-deb9-$CACHE_REV",
@@ -247,7 +251,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "aarch64-darwin-$CACHE_REV",
@@ -309,7 +314,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "aarch64-linux-deb10-$CACHE_REV",
@@ -367,7 +373,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "armv7-linux-deb10-$CACHE_REV",
@@ -405,7 +412,7 @@
       "BIGNUM_BACKEND": "gmp",
       "BIN_DIST_NAME": "ghc-armv7-linux-deb10-validate",
       "BUILD_FLAVOUR": "validate",
-      "CONFIGURE_ARGS": "",
+      "CONFIGURE_ARGS": "LD=ld.lld ",
       "TEST_ENV": "armv7-linux-deb10-validate",
       "XZ_OPT": "-9"
     }
@@ -425,7 +432,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "i386-linux-deb9-$CACHE_REV",
@@ -483,7 +491,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "x86_64-darwin-$CACHE_REV",
@@ -547,7 +556,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "x86_64-freebsd-$CACHE_REV",
@@ -586,7 +596,7 @@
       "BUILD_FLAVOUR": "validate",
       "CABAL_INSTALL_VERSION": "3.2.0.0",
       "CONFIGURE_ARGS": "--with-gmp-includes=/usr/local/include --with-gmp-libraries=/usr/local/lib --with-iconv-includes=/usr/local/include --with-iconv-libraries=/usr/local/lib ",
-      "GHC_VERSION": "8.10.1",
+      "GHC_VERSION": "9.2.2",
       "HADRIAN_ARGS": "--docs=no-sphinx",
       "TEST_ENV": "x86_64-freebsd-validate",
       "XZ_OPT": "-9"
@@ -607,7 +617,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "x86_64-linux-alpine3_12-$CACHE_REV",
@@ -668,7 +679,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "x86_64-linux-alpine3_12-$CACHE_REV",
@@ -729,7 +741,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "x86_64-linux-centos7-$CACHE_REV",
@@ -787,7 +800,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "x86_64-linux-deb10-$CACHE_REV",
@@ -845,7 +859,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "x86_64-linux-deb10-$CACHE_REV",
@@ -903,7 +918,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "x86_64-linux-deb10-$CACHE_REV",
@@ -962,7 +978,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "x86_64-linux-deb10-$CACHE_REV",
@@ -1020,7 +1037,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "x86_64-linux-deb10-$CACHE_REV",
@@ -1078,7 +1096,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "x86_64-linux-deb10-$CACHE_REV",
@@ -1136,7 +1155,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "x86_64-linux-deb10-$CACHE_REV",
@@ -1194,7 +1214,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "x86_64-linux-deb10-$CACHE_REV",
@@ -1254,7 +1275,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "x86_64-linux-deb11-$CACHE_REV",
@@ -1312,7 +1334,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "x86_64-linux-fedora33-$CACHE_REV",
@@ -1372,7 +1395,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "x86_64-linux-fedora33-$CACHE_REV",
@@ -1432,7 +1456,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "x86_64-linux-ubuntu20_04-$CACHE_REV",
@@ -1489,7 +1514,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "no-caching",
@@ -1525,7 +1551,7 @@
       "BUILD_FLAVOUR": "validate",
       "CABAL_INSTALL_VERSION": "3.2.0.0",
       "CONFIGURE_ARGS": "",
-      "GHC_VERSION": "8.10.4",
+      "GHC_VERSION": "9.2.2",
       "HADRIAN_ARGS": "--docs=no-sphinx",
       "LANG": "en_US.UTF-8",
       "MSYSTEM": "MINGW64",
@@ -1547,7 +1573,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "no-caching",
@@ -1583,7 +1610,7 @@
       "BUILD_FLAVOUR": "validate",
       "CABAL_INSTALL_VERSION": "3.2.0.0",
       "CONFIGURE_ARGS": "",
-      "GHC_VERSION": "8.10.4",
+      "GHC_VERSION": "9.2.2",
       "HADRIAN_ARGS": "--docs=no-sphinx",
       "LANG": "en_US.UTF-8",
       "MSYSTEM": "MINGW64",
@@ -1606,7 +1633,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "aarch64-darwin-$CACHE_REV",
@@ -1669,7 +1697,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "aarch64-linux-deb10-$CACHE_REV",
@@ -1728,7 +1757,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "armv7-linux-deb10-$CACHE_REV",
@@ -1766,7 +1796,7 @@
       "BIGNUM_BACKEND": "gmp",
       "BIN_DIST_NAME": "ghc-armv7-linux-deb10-perf",
       "BUILD_FLAVOUR": "perf",
-      "CONFIGURE_ARGS": "",
+      "CONFIGURE_ARGS": "LD=ld.lld ",
       "IGNORE_PERF_FAILURES": "all",
       "TEST_ENV": "armv7-linux-deb10-perf",
       "XZ_OPT": "-9"
@@ -1787,7 +1817,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "i386-linux-deb9-$CACHE_REV",
@@ -1846,7 +1877,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "x86_64-darwin-$CACHE_REV",
@@ -1911,7 +1943,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "x86_64-freebsd-$CACHE_REV",
@@ -1950,7 +1983,7 @@
       "BUILD_FLAVOUR": "perf",
       "CABAL_INSTALL_VERSION": "3.2.0.0",
       "CONFIGURE_ARGS": "--with-gmp-includes=/usr/local/include --with-gmp-libraries=/usr/local/lib --with-iconv-includes=/usr/local/include --with-iconv-libraries=/usr/local/lib ",
-      "GHC_VERSION": "8.10.1",
+      "GHC_VERSION": "9.2.2",
       "HADRIAN_ARGS": "--docs=no-sphinx",
       "IGNORE_PERF_FAILURES": "all",
       "TEST_ENV": "x86_64-freebsd-perf",
@@ -1972,7 +2005,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "x86_64-linux-alpine3_12-$CACHE_REV",
@@ -2034,7 +2068,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "x86_64-linux-alpine3_12-$CACHE_REV",
@@ -2096,7 +2131,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "x86_64-linux-centos7-$CACHE_REV",
@@ -2155,7 +2191,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "x86_64-linux-deb10-$CACHE_REV",
@@ -2214,7 +2251,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "x86_64-linux-deb10-$CACHE_REV",
@@ -2273,7 +2311,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "x86_64-linux-deb11-$CACHE_REV",
@@ -2332,7 +2371,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "x86_64-linux-fedora33-$CACHE_REV",
@@ -2393,7 +2433,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "x86_64-linux-fedora33-$CACHE_REV",
@@ -2454,7 +2495,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "x86_64-linux-ubuntu20_04-$CACHE_REV",
@@ -2512,7 +2554,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "no-caching",
@@ -2548,7 +2591,7 @@
       "BUILD_FLAVOUR": "perf",
       "CABAL_INSTALL_VERSION": "3.2.0.0",
       "CONFIGURE_ARGS": "",
-      "GHC_VERSION": "8.10.4",
+      "GHC_VERSION": "9.2.2",
       "HADRIAN_ARGS": "--docs=no-sphinx",
       "IGNORE_PERF_FAILURES": "all",
       "LANG": "en_US.UTF-8",
@@ -2571,7 +2614,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "no-caching",
@@ -2607,7 +2651,7 @@
       "BUILD_FLAVOUR": "perf",
       "CABAL_INSTALL_VERSION": "3.2.0.0",
       "CONFIGURE_ARGS": "",
-      "GHC_VERSION": "8.10.4",
+      "GHC_VERSION": "9.2.2",
       "HADRIAN_ARGS": "--docs=no-sphinx",
       "IGNORE_PERF_FAILURES": "all",
       "LANG": "en_US.UTF-8",
@@ -2631,7 +2675,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "x86_64-darwin-$CACHE_REV",
@@ -2694,7 +2739,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "x86_64-freebsd-$CACHE_REV",
@@ -2733,7 +2779,7 @@
       "BUILD_FLAVOUR": "validate",
       "CABAL_INSTALL_VERSION": "3.2.0.0",
       "CONFIGURE_ARGS": "--with-gmp-includes=/usr/local/include --with-gmp-libraries=/usr/local/lib --with-iconv-includes=/usr/local/include --with-iconv-libraries=/usr/local/lib ",
-      "GHC_VERSION": "8.10.1",
+      "GHC_VERSION": "9.2.2",
       "HADRIAN_ARGS": "--docs=no-sphinx",
       "TEST_ENV": "x86_64-freebsd-validate"
     }
@@ -2753,7 +2799,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "x86_64-linux-alpine3_12-$CACHE_REV",
@@ -2813,7 +2860,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "x86_64-linux-alpine3_12-$CACHE_REV",
@@ -2873,7 +2921,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "x86_64-linux-centos7-$CACHE_REV",
@@ -2930,7 +2979,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "x86_64-linux-deb10-$CACHE_REV",
@@ -2987,7 +3037,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "x86_64-linux-deb10-$CACHE_REV",
@@ -3045,7 +3096,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "x86_64-linux-deb10-$CACHE_REV",
@@ -3103,7 +3155,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "x86_64-linux-deb10-$CACHE_REV",
@@ -3160,7 +3213,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "x86_64-linux-deb10-$CACHE_REV",
@@ -3217,7 +3271,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "x86_64-linux-deb10-$CACHE_REV",
@@ -3274,7 +3329,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "x86_64-linux-deb10-$CACHE_REV",
@@ -3331,7 +3387,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "x86_64-linux-deb10-$CACHE_REV",
@@ -3391,7 +3448,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "x86_64-linux-deb11-$CACHE_REV",
@@ -3448,7 +3506,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "x86_64-linux-fedora33-$CACHE_REV",
@@ -3507,7 +3566,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "x86_64-linux-fedora33-$CACHE_REV",
@@ -3566,7 +3626,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "x86_64-linux-ubuntu20_04-$CACHE_REV",
@@ -3622,7 +3683,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "no-caching",
@@ -3658,7 +3720,7 @@
       "BUILD_FLAVOUR": "validate",
       "CABAL_INSTALL_VERSION": "3.2.0.0",
       "CONFIGURE_ARGS": "",
-      "GHC_VERSION": "8.10.4",
+      "GHC_VERSION": "9.2.2",
       "HADRIAN_ARGS": "--docs=no-sphinx",
       "LANG": "en_US.UTF-8",
       "MSYSTEM": "MINGW64",
@@ -3679,7 +3741,8 @@
       ],
       "reports": {
         "junit": "junit.xml"
-      }
+      },
+      "when": "always"
     },
     "cache": {
       "key": "no-caching",
@@ -3715,7 +3778,7 @@
       "BUILD_FLAVOUR": "validate",
       "CABAL_INSTALL_VERSION": "3.2.0.0",
       "CONFIGURE_ARGS": "",
-      "GHC_VERSION": "8.10.4",
+      "GHC_VERSION": "9.2.2",
       "HADRIAN_ARGS": "--docs=no-sphinx",
       "LANG": "en_US.UTF-8",
       "MSYSTEM": "MINGW64",
diff --git a/configure.ac b/configure.ac
index 0dc7695c86..ef818fa64a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -815,7 +815,7 @@ AC_PATH_PROG(SPHINXBUILD,sphinx-build)
 AC_CACHE_CHECK([for version of sphinx-build], fp_cv_sphinx_version,
 changequote(, )dnl
 [if test -n "$SPHINXBUILD"; then
-  fp_cv_sphinx_version=`"$SPHINXBUILD" --version 2>&1 | sed 's/.* \([0-9]\.[0-9]\.[0-9]\)/\1/' | head -n1`;
+  fp_cv_sphinx_version=`"$SPHINXBUILD" --version 2>&1 | sed -re 's/.* v?([0-9]\.[0-9]\.[0-9])/\1/' | head -n1`;
 fi;
 changequote([, ])dnl
 ])
diff --git a/testsuite/tests/profiling/should_run/Makefile b/testsuite/tests/profiling/should_run/Makefile
index 4db4e193a5..6e87e2f291 100644
--- a/testsuite/tests/profiling/should_run/Makefile
+++ b/testsuite/tests/profiling/should_run/Makefile
@@ -11,7 +11,7 @@ T7275:
 	# Suzanne should appear here, despite having produced only pinned
 	# allocations. Strip off the actual amounts and cost-center numbers since
 	# they will be non-determinstic.
-	grep suzanne T7275.hp | cut -f1 -d'	' | sed -e 's/([0-9]\+)//'
+	grep suzanne T7275.hp | cut -f1 -d'	' | sed -re 's/\([0-9]+\)//'
 
 .PHONY: T11489
 T11489: