Compare revisions

ef30e215 · fc23b5ed · 2df92ee1 · f2912143 · aeb8497d · 97655ad8
--- a/.appveyor.sh
+++ b/.appveyor.sh
-# Configure the environment
-MSYSTEM=MINGW64
-THREADS=9
-SKIP_PERF_TESTS=YES
-BUILD_FLAVOUR=
-source /etc/profile || true # a terrible, terrible workaround for msys2 brokenness
-
-# Don't set -e until after /etc/profile is sourced
-set -ex
-cd $APPVEYOR_BUILD_FOLDER
-
-case "$1" in
-    "prepare")
-        # Prepare the tree
-        git config remote.origin.url git://github.com/ghc/ghc.git
-        git config --global url."git://github.com/ghc/packages-".insteadOf git://github.com/ghc/packages/
-        git submodule init
-        git submodule --quiet update --recursive
-        ;;
-    "build")
-        # Build the compiler
-        ./boot
-        cat <<EOF >> mk/build.mk
-        BuildFlavour=$BUILD_FLAVOUR
-        ifneq "\$(BuildFlavour)" ""
-        include mk/flavours/\$(BuildFlavour).mk
-        endif
-EOF
-        ./configure --enable-tarballs-autodownload
-        make -j$THREADS
-        ;;
-
-    "test")
-        make binary-dist
-        curl https://ghc-artifacts.s3.amazonaws.com/tools/ghc-artifact-collector-x86_64-windows --output ghc-artifact-collector
-        ./ghc-artifact-collector *.tar.xz
-        make test THREADS=$THREADS
-        ;;
-
-    *)
-        echo "$0: unknown mode $1"
-        exit 1
-        ;;
-esac
--- a/.editorconfig
+++ b/.editorconfig
@@ -12,3 +12,7 @@ end_of_line = lf

 [Makefile]
 indent_style = tab
+
+[*.c]
+indent_style = space
+indent_size = 2
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,7 @@ variables:
  GIT_SSL_NO_VERIFY: "1"

  # Commit of ghc/ci-images repository from which to pull Docker images
-  DOCKER_REV: 0849567cd9780cc8e9652118b949cb050c632ef4
+  DOCKER_REV: 9e4c540d9e4972a36291dfdf81f079f37d748890

  # Sequential version number of all cached things.
  # Bump to invalidate GitLab CI cache.
@@ -17,7 +17,7 @@ variables:
  # Overridden by individual jobs
  CONFIGURE_ARGS: ""

-  GIT_SUBMODULE_STRATEGY: "recursive"
+  GIT_SUBMODULE_STRATEGY: "normal"

  # Makes ci.sh isolate CABAL_DIR
  HERMETIC: "YES"
@@ -267,7 +267,7 @@ lint-ci-config:
    - mkdir -p ~/.cabal
    - cp -Rf cabal-cache/* ~/.cabal || true
  script:
-    - nix shell --extra-experimental-features nix-command --extra-experimental-features flakes nixpkgs#cabal-install -c cabal update
+    - nix shell --extra-experimental-features nix-command --extra-experimental-features flakes nixpkgs#cabal-install nixpkgs#ghc -c cabal update
    - .gitlab/generate_jobs
        # 1 if .gitlab/generate_jobs changed the output of the generated config
    - nix shell --extra-experimental-features nix-command --extra-experimental-features flakes nixpkgs#git -c git diff --exit-code
@@ -382,64 +382,6 @@ stack-hadrian-build:
    - .gitlab/ci.sh configure
    - hadrian/build-stack --version

-#################################
-# x86_64-linux-deb10-make
-#################################
-
-# One job still using Make for now but we don't produce any release bindists with it.
-
-.build-x86_64-linux-deb10-make:
-  extends: .validate
-  # Sadly we cannot bootstrap the make build system with 9.2 due to #21188.
-  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb10:885dfba7f74583d6a394dbf711cc805178cfcc47"
-  variables:
-    TEST_ENV: "x86_64-linux-deb10-make"
-    BUILD_FLAVOUR: "validate"
-    BIN_DIST_PREP_TAR_COMP: "ghc-x86_64-deb10-linux.tar.gz"
-  before_script:
-    # workaround for docker permissions
-    - sudo chown ghc:ghc -R .
-  after_script:
-    - .gitlab/ci.sh save_cache
-    - .gitlab/ci.sh clean
-    - cat ci-timings
-  tags:
-    - x86_64-linux
-
-validate-x86_64-linux-deb10-make:
-  extends: .build-x86_64-linux-deb10-make
-  stage: full-build
-  rules:
-    - if: '($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != "yes")'
-
-############################################################
-# Validation via Pipelines (make)
-############################################################
-
-.validate:
-  variables:
-    TEST_TYPE: test
-    MAKE_ARGS: "-Werror"
-  script: |
-    # Build hyperlinked sources for documentation when building releases
-    if [[ "$RELEASE_JOB" = "yes" ]]; then
-      HADDOCK_HYPERLINKED_SOURCES=1
-    fi
-    .gitlab/ci.sh setup
-    .gitlab/ci.sh configure
-    .gitlab/ci.sh build_make
-    .gitlab/ci.sh test_make
-
-  dependencies: []
-  artifacts:
-    reports:
-      junit: junit.xml
-    expire_in: 2 week
-    paths:
-      - $BIN_DIST_PREP_TAR_COMP
-      - junit.xml
-      - performance-metrics.tsv
-
 ####################################
 # Testing reinstallable ghc codepath
 ####################################
@@ -627,14 +569,18 @@ test-bootstrap:
    - popd
    - rm -Rf test-bootstrap
  variables:
-    TEST_ENV: "x86_64-linux-deb10-hadrian"
+    # Don't record performance benchmarks
+    TEST_ENV: ""
    BIN_DIST_NAME: "ghc-x86_64-deb10-linux"
    BUILD_FLAVOUR: "validate"
    NO_BOOT: "1"
  rules:
    - if: $NIGHTLY
-    - if: '$RELEASE_JOB == "yes"'
    - if: '$CI_MERGE_REQUEST_LABELS =~ /.*test-bootstrap.*/'
+    - if: '$RELEASE_JOB == "yes"'
+      when: always
+      variables:
+        BUILD_FLAVOUR: "release"


 ############################################################
@@ -814,7 +760,8 @@ pages:
    - x86_64-linux
  script:
    - mkdir -p public/doc
-    - tar -xf haddock.html.tar.xz -C public/doc
+    # haddock docs are not in the hadrian produce doc tarballs at the moment
+    # - tar -xf haddock.html.tar.xz -C public/doc
    - tar -xf libraries.html.tar.xz -C public/doc
    - tar -xf users_guide.html.tar.xz -C public/doc
    - |
@@ -828,6 +775,8 @@ pages:
    # N.B. only run this on ghc/ghc since the deployed pages are quite large
    # and we only serve GitLab Pages for ghc/ghc.
    - if: '$CI_COMMIT_BRANCH == "master" && $CI_PROJECT_NAMESPACE == "ghc"'
+    - if: '$CI_MERGE_REQUEST_LABELS =~ /.*publish-docs.*/'
+
  artifacts:
    paths:
      - public
--- a/.gitlab/ci.sh
+++ b/.gitlab/ci.sh
@@ -50,11 +50,6 @@ Common Modes:
  shell         Run an interactive shell with a configured build environment.
  save_cache    Preserve the cabal cache

-Make build system:
-
-  build_make    Build GHC via the make build system
-  test_make     Test GHC via the make build system
-
 Hadrian build system
  build_hadrian Build GHC via the Hadrian build system
  test_hadrian  Test GHC via the Hadrian build system
@@ -93,6 +88,7 @@ Environment variables determining build configuration of Hadrian system:
  BUILD_FLAVOUR     Which flavour to build.
  REINSTALL_GHC     Build and test a reinstalled "stage3" ghc built using cabal-install
                    This tests the "reinstall" configuration
+  CROSS_EMULATOR    The emulator to use for testing of cross-compilers.

 Environment variables determining bootstrap toolchain (Linux):

@@ -206,6 +202,9 @@ function set_toolchain_paths() {
      CABAL="$toolchain/bin/cabal$exe"
      HAPPY="$toolchain/bin/happy$exe"
      ALEX="$toolchain/bin/alex$exe"
+      if [ "$(uname)" = "FreeBSD" ]; then
+        GHC=/usr/local/bin/ghc
+      fi
      ;;
    nix)
      if [[ ! -f toolchain.sh ]]; then
@@ -287,7 +286,7 @@ function fetch_ghc() {
          cp -r ghc-${GHC_VERSION}*/* "$toolchain"
          ;;
        *)
-          pushd "ghc-${GHC_VERSION}*"
+          pushd ghc-${GHC_VERSION}*
          ./configure --prefix="$toolchain"
          "$MAKE" install
          popd
@@ -325,9 +324,7 @@ function fetch_cabal() {
          local base_url="https://downloads.haskell.org/~cabal/cabal-install-$v/"
          case "$(uname)" in
            Darwin) cabal_url="$base_url/cabal-install-$v-x86_64-apple-darwin17.7.0.tar.xz" ;;
-            FreeBSD)
-              #cabal_url="$base_url/cabal-install-$v-x86_64-portbld-freebsd.tar.xz" ;;
-              cabal_url="http://home.smart-cactus.org/~ben/ghc/cabal-install-3.0.0.0-x86_64-portbld-freebsd.tar.xz" ;;
+            FreeBSD) cabal_url="$base_url/cabal-install-$v-x86_64-freebsd13.tar.xz" ;;
            *) fail "don't know where to fetch cabal-install for $(uname)"
          esac
          echo "Fetching cabal-install from $cabal_url"
@@ -375,8 +372,8 @@ function cleanup_submodules() {
    # On Windows submodules can inexplicably get into funky states where git
    # believes that the submodule is initialized yet its associated repository
    # is not valid. Avoid failing in this case with the following insanity.
-    git submodule sync --recursive || git submodule deinit --force --all
-    git submodule update --init --recursive
+    git submodule sync || git submodule deinit --force --all
+    git submodule update --init
    git submodule foreach git clean -xdf
  else
    info "Not cleaning submodules, not in a git repo"
@@ -434,30 +431,17 @@ function configure() {
  end_section "configuring"
 }

-function build_make() {
-  check_release_build
-  prepare_build_mk
-  if [[ -z "$BIN_DIST_PREP_TAR_COMP" ]]; then
-    fail "BIN_DIST_PREP_TAR_COMP is not set"
-  fi
-  if [[ -n "${VERBOSE:-}" ]]; then
-    MAKE_ARGS="${MAKE_ARGS:-} V=1"
-  else
-    MAKE_ARGS="${MAKE_ARGS:-} V=0"
-  fi
-
-  run "$MAKE" -j"$cores" "$MAKE_ARGS"
-  run "$MAKE" -j"$cores" binary-dist-prep TAR_COMP_OPTS=-1
-  ls -lh "$BIN_DIST_PREP_TAR_COMP"
-}
-
 function fetch_perf_notes() {
  info "Fetching perf notes..."
  "$TOP/.gitlab/test-metrics.sh" pull
 }

 function push_perf_notes() {
-  if [ -n "${CROSS_TARGET:-}" ]; then
+  if [[ -z "${TEST_ENV:-}" ]]; then
+    return
+  fi
+
+  if [[ -n "${CROSS_TARGET:-}" ]]; then
    info "Can't test cross-compiled build."
    return
  fi
@@ -502,23 +486,6 @@ function check_release_build() {
  fi
 }

-function test_make() {
-  if [ -n "${CROSS_TARGET:-}" ]; then
-    info "Can't test cross-compiled build."
-    return
-  fi
-
-  check_msys2_deps inplace/bin/ghc-stage2 --version
-  check_release_build
-
-  run "$MAKE" test_bindist TEST_PREP=YES TEST_PROF=${RELEASE_JOB:-}
-  (unset $(compgen -v | grep CI_*);
-    run "$MAKE" V=0 VERBOSE=1 test \
-      THREADS="$cores" \
-      JUNIT_FILE=../../junit.xml \
-      EXTRA_RUNTEST_OPTS="${RUNTEST_ARGS:-}")
-}
-
 function build_hadrian() {
  if [ -z "${BIN_DIST_NAME:-}" ]; then
    fail "BIN_DIST_NAME not set"
@@ -529,10 +496,6 @@ function build_hadrian() {

  check_release_build

-  # N.B. First build Hadrian, unsetting MACOSX_DEPLOYMENT_TARGET which may warn
-  # if the bootstrap libraries were built with a different version expectation.
-  MACOSX_DEPLOYMENT_TARGET="" run_hadrian -V stage1:exe:ghc-bin
-
  if [[ -n "${REINSTALL_GHC:-}" ]]; then
    run_hadrian build-cabal -V
  else
@@ -560,15 +523,38 @@ function make_install_destdir() {
  fi
  info "merging file tree from $destdir to $instdir"
  cp -a "$destdir/$instdir"/* "$instdir"/
-  "$instdir"/bin/ghc-pkg recache
+  "$instdir"/bin/${cross_prefix}ghc-pkg recache
 }

-function test_hadrian() {
-  if [ -n "${CROSS_TARGET:-}" ]; then
-    info "Can't test cross-compiled build."
-    return
-  fi
+# install the binary distribution in directory $1 to $2.
+function install_bindist() {
+  local bindist="$1"
+  local instdir="$2"
+  pushd "$bindist"
+  case "$(uname)" in
+    MSYS_*|MINGW*)
+      mkdir -p "$instdir"
+      cp -a * "$instdir"
+      ;;
+    *)
+      read -r -a args <<< "${INSTALL_CONFIGURE_ARGS:-}"
+
+      # FIXME: The bindist configure script shouldn't need to be reminded of
+      # the target platform. See #21970.
+      if [ -n "${CROSS_TARGET:-}" ]; then
+          args+=( "--target=$CROSS_TARGET" "--host=$CROSS_TARGET" )
+      fi

+      run ./configure \
+          --prefix="$instdir" \
+          "${args[@]+"${args[@]}"}"
+      make_install_destdir "$TOP"/destdir "$instdir"
+      ;;
+  esac
+  popd
+}
+
+function test_hadrian() {
  check_msys2_deps _build/stage1/bin/ghc --version
  check_release_build

@@ -589,7 +575,21 @@ function test_hadrian() {
  fi


-  if [[ -n "${REINSTALL_GHC:-}" ]]; then
+  if [ -n "${CROSS_TARGET:-}" ]; then
+    if [ -n "${CROSS_EMULATOR:-}" ]; then
+      local instdir="$TOP/_build/install"
+      local test_compiler="$instdir/bin/${cross_prefix}ghc$exe"
+      install_bindist _build/bindist/ghc-*/ "$instdir"
+      echo 'main = putStrLn "hello world"' > hello.hs
+      echo "hello world" > expected
+      run "$test_compiler" hello.hs
+      $CROSS_EMULATOR ./hello > actual
+      run diff expected actual
+    else
+      info "Cannot test cross-compiled build without CROSS_EMULATOR being set."
+      return
+    fi
+  elif [[ -n "${REINSTALL_GHC:-}" ]]; then
    run_hadrian \
      test \
      --test-root-dirs=testsuite/tests/stage1 \
@@ -598,20 +598,9 @@ function test_hadrian() {
      --test-root-dirs=testsuite/tests/typecheck \
      "runtest.opts+=${RUNTEST_ARGS:-}" || fail "hadrian cabal-install test"
  else
-    cd _build/bindist/ghc-*/
-    case "$(uname)" in
-      MSYS_*|MINGW*)
-        mkdir -p "$TOP"/_build/install
-        cp -a * "$TOP"/_build/install
-        ;;
-      *)
-        read -r -a args <<< "${INSTALL_CONFIGURE_ARGS:-}"
-        run ./configure --prefix="$TOP"/_build/install "${args[@]+"${args[@]}"}"
-        make_install_destdir "$TOP"/destdir "$TOP"/_build/install
-        ;;
-    esac
-    cd ../../../
-    test_compiler="$TOP/_build/install/bin/ghc$exe"
+    local instdir="$TOP/_build/install"
+    local test_compiler="$instdir/bin/ghc$exe"
+    install_bindist _build/bindist/ghc-*/ "$instdir"

    if [[ "${WINDOWS_HOST}" == "no" ]]; then
      run_hadrian \
@@ -686,7 +675,6 @@ function save_cache () {

 function clean() {
  rm -R tmp
-  run "$MAKE" --quiet clean || true
  run rm -Rf _build
 }

@@ -775,6 +763,9 @@ esac
 if [ -n "${CROSS_TARGET:-}" ]; then
  info "Cross-compiling for $CROSS_TARGET..."
  target_triple="$CROSS_TARGET"
+  cross_prefix="$target_triple-"
+else
+  cross_prefix=""
 fi

 echo "Branch name ${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME:-}"
@@ -808,13 +799,6 @@ case $1 in
  usage) usage ;;
  setup) setup && cleanup_submodules ;;
  configure) time_it "configure" configure ;;
-  build_make) time_it "build" build_make ;;
-  test_make)
-    fetch_perf_notes
-    res=0
-    time_it "test" test_make || res=$?
-    push_perf_notes
-    exit $res ;;
  build_hadrian) time_it "build" build_hadrian ;;
  # N.B. Always push notes, even if the build fails. This is okay to do as the
  # testsuite driver doesn't record notes for tests that fail due to

--- a/.gitlab/darwin/toolchain.nix
+++ b/.gitlab/darwin/toolchain.nix
@@ -85,7 +85,6 @@ pkgs.writeTextFile {
    export PATH
    PATH="${pkgs.autoconf}/bin:$PATH"
    PATH="${pkgs.automake}/bin:$PATH"
-    PATH="${pkgs.coreutils}/bin:$PATH"
    export FONTCONFIG_FILE=${fonts}
    export XELATEX="${ourtexlive}/bin/xelatex"
    export MAKEINDEX="${ourtexlive}/bin/makeindex"

--- a/.gitlab/gen_ci.hs
+++ b/.gitlab/gen_ci.hs
@@ -2,13 +2,16 @@
 {-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE DeriveFunctor #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {- cabal:
-build-depends: base, monoidal-containers, aeson >= 1.8.1, containers, bytestring
+build-depends: base, aeson >= 1.8.1, containers, bytestring
 -}

+import Data.Coerce
 import Data.String (String)
 import Data.Aeson as A
-import qualified Data.Map.Monoidal as M
+import qualified Data.Map as Map
+import Data.Map (Map)
 import qualified Data.ByteString.Lazy as B hiding (putStrLn)
 import qualified Data.ByteString.Lazy.Char8 as B
 import Data.List (intercalate)
@@ -92,7 +95,7 @@ names of jobs to update these other places.
 data Opsys
  = Linux LinuxDistro
  | Darwin
-  | FreeBSD
+  | FreeBSD13
  | Windows deriving (Eq)

 data LinuxDistro
@@ -116,6 +119,8 @@ data BuildConfig
                , llvmBootstrap  :: Bool
                , withAssertions :: Bool
                , withNuma       :: Bool
+                , crossTarget    :: Maybe String
+                , crossEmulator  :: Maybe String
                , fullyStatic    :: Bool
                , tablesNextToCode :: Bool
                , threadSanitiser :: Bool
@@ -126,6 +131,7 @@ configureArgsStr :: BuildConfig -> String
 configureArgsStr bc = intercalate " " $
  ["--enable-unregisterised"| unregisterised bc ]
  ++ ["--disable-tables-next-to-code" | not (tablesNextToCode bc) ]
+  ++ ["--with-intree-gmp" | Just _ <- pure (crossTarget bc) ]

 -- Compute the hadrian flavour from the BuildConfig
 mkJobFlavour :: BuildConfig -> Flavour
@@ -156,6 +162,8 @@ vanilla = BuildConfig
  , llvmBootstrap  = False
  , withAssertions = False
  , withNuma = False
+  , crossTarget = Nothing
+  , crossEmulator = Nothing
  , fullyStatic = False
  , tablesNextToCode = True
  , threadSanitiser = False
@@ -186,6 +194,14 @@ static = vanilla { fullyStatic = True }
 staticNativeInt :: BuildConfig
 staticNativeInt = static { bignumBackend = Native }

+crossConfig :: String       -- ^ target triple
+            -> Maybe String -- ^ emulator for testing
+            -> BuildConfig
+crossConfig triple emulator =
+    vanilla { crossTarget = Just triple
+            , crossEmulator = emulator
+            }
+
 llvm :: BuildConfig
 llvm = vanilla { llvmBootstrap = True }

@@ -210,7 +226,7 @@ runnerTag arch (Linux distro) =
 runnerTag AArch64 Darwin = "aarch64-darwin"
 runnerTag Amd64 Darwin = "x86_64-darwin-m1"
 runnerTag Amd64 Windows = "new-x86_64-windows"
-runnerTag Amd64 FreeBSD = "x86_64-freebsd"
+runnerTag Amd64 FreeBSD13 = "x86_64-freebsd13"

 tags :: Arch -> Opsys -> BuildConfig -> [String]
 tags arch opsys _bc = [runnerTag arch opsys] -- Tag for which runners we can use
@@ -229,7 +245,7 @@ distroName Alpine     = "alpine3_12"
 opsysName :: Opsys -> String
 opsysName (Linux distro) = "linux-" ++ distroName distro
 opsysName Darwin = "darwin"
-opsysName FreeBSD = "freebsd"
+opsysName FreeBSD13 = "freebsd13"
 opsysName Windows = "windows"

 archName :: Arch -> String
@@ -252,6 +268,7 @@ testEnv arch opsys bc = intercalate "-" $
                        ++ ["unreg" | unregisterised bc ]
                        ++ ["numa"  | withNuma bc ]
                        ++ ["no_tntc"  | not (tablesNextToCode bc) ]
+                        ++ ["cross_"++triple  | Just triple <- pure $ crossTarget bc ]
                        ++ [flavourString (mkJobFlavour bc)]

 -- | The hadrian flavour string we are going to use for this build
@@ -293,13 +310,25 @@ dockerImage _ _ = Nothing
 -- The "proper" solution would be to use a dependent monoidal map where each key specifies
 -- the combination behaviour of it's values. Ie, whether setting it multiple times is an error
 -- or they should be combined.
-type Variables = M.MonoidalMap String [String]
+newtype MonoidalMap k v = MonoidalMap (Map k v)
+    deriving (Eq, Show, Functor, ToJSON)
+
+instance (Ord k, Semigroup v) => Semigroup (MonoidalMap k v) where
+    (MonoidalMap a) <> (MonoidalMap b) = MonoidalMap (Map.unionWith (<>) a b)
+
+instance (Ord k, Semigroup v) => Monoid (MonoidalMap k v) where
+    mempty = MonoidalMap (Map.empty)
+
+mminsertWith :: Ord k => (a -> a -> a) -> k -> a -> MonoidalMap k a -> MonoidalMap k a
+mminsertWith f k v (MonoidalMap m) = MonoidalMap (Map.insertWith f k v m)
+
+type Variables = MonoidalMap String [String]

 (=:) :: String -> String -> Variables
-a =: b = M.singleton a [b]
+a =: b = MonoidalMap (Map.singleton a [b])

 opsysVariables :: Arch -> Opsys -> Variables
-opsysVariables _ FreeBSD = mconcat
+opsysVariables _ FreeBSD13 = mconcat
  [ -- N.B. we use iconv from ports as I see linker errors when we attempt
    -- to use the "native" iconv embedded in libc as suggested by the
    -- porting guide [1].
@@ -307,12 +336,19 @@ opsysVariables _ FreeBSD = mconcat
    "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"
  , "HADRIAN_ARGS" =: "--docs=no-sphinx"
  , "GHC_VERSION" =: "9.2.2"
-  , "CABAL_INSTALL_VERSION" =: "3.2.0.0"
+  , "CABAL_INSTALL_VERSION" =: "3.6.2.0"
  ]
 opsysVariables ARMv7 (Linux distro) =
  distroVariables distro <>
-  mconcat [ -- ld.gold is affected by #16177 and therefore cannot be used.
-            "CONFIGURE_ARGS" =: "LD=ld.lld"
+  mconcat [ "CONFIGURE_ARGS" =: "--host=armv7-linux-gnueabihf --build=armv7-linux-gnueabihf --target=armv7-linux-gnueabihf"
+            -- N.B. We disable ld.lld explicitly here because it appears to fail
+            -- non-deterministically on ARMv7. See #18280.
+          , "LD" =: "ld.gold"
+          , "GccUseLdOpt" =: "-fuse-ld=gold"
+            -- Awkwardly, this appears to be necessary to work around a
+            -- live-lock exhibited by the CPython (at least in 3.9 and 3.8)
+            -- interpreter on ARMv7
+          , "HADRIAN_ARGS" =: "--test-verbose=3"
          ]
 opsysVariables _ (Linux distro) = distroVariables distro
 opsysVariables AArch64 (Darwin {}) =
@@ -475,12 +511,13 @@ instance ToJSON OnOffRules where

 -- | A Rule corresponds to some condition which must be satisifed in order to
 -- run the job.
-data Rule = FastCI -- ^ Run this job when the fast-ci label is set
-          | ReleaseOnly -- ^ Only run this job in a release pipeline
-          | Nightly     -- ^ Only run this job in the nightly pipeline
-          | LLVMBackend -- ^ Only run this job when the "LLVM backend" label is present
-          | FreeBSDTag  -- ^ Only run this job when the "FreeBSD" label is set.
-          | Disable     -- ^ Don't run this job.
+data Rule = FastCI       -- ^ Run this job when the fast-ci label is set
+          | ReleaseOnly  -- ^ Only run this job in a release pipeline
+          | Nightly      -- ^ Only run this job in the nightly pipeline
+          | LLVMBackend  -- ^ Only run this job when the "LLVM backend" label is present
+          | FreeBSDLabel -- ^ Only run this job when the "FreeBSD" label is set.
+          | ARMLabel    -- ^ Only run this job when the "ARM" label is set.
+          | Disable      -- ^ Don't run this job.
          deriving (Bounded, Enum, Ord, Eq)

 -- A constant evaluating to True because gitlab doesn't support "true" in the
@@ -498,8 +535,10 @@ ruleString On FastCI = true
 ruleString Off FastCI = "$CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/"
 ruleString On LLVMBackend = "$CI_MERGE_REQUEST_LABELS =~ /.*LLVM backend.*/"
 ruleString Off LLVMBackend = true
-ruleString On FreeBSDTag = "$CI_MERGE_REQUEST_LABELS =~ /.*FreeBSD.*/"
-ruleString Off FreeBSDTag = true
+ruleString On FreeBSDLabel = "$CI_MERGE_REQUEST_LABELS =~ /.*FreeBSD.*/"
+ruleString Off FreeBSDLabel = true
+ruleString On ARMLabel = "$CI_MERGE_REQUEST_LABELS =~ /.*ARM.*/"
+ruleString Off ARMLabel = true
 ruleString On ReleaseOnly = "$RELEASE_JOB == \"yes\""
 ruleString Off ReleaseOnly = "$RELEASE_JOB != \"yes\""
 ruleString On Nightly = "$NIGHTLY"
@@ -542,7 +581,7 @@ instance ToJSON Job where
    , "allow_failure" A..= jobAllowFailure
    -- Joining up variables like this may well be the wrong thing to do but
    -- at least it doesn't lose information silently by overriding.
-    , "variables" A..= (M.map (intercalate " ") jobVariables)
+    , "variables" A..= fmap (intercalate " ") jobVariables
    , "artifacts" A..= jobArtifacts
    , "cache" A..= jobCache
    , "after_script" A..= jobAfterScript
@@ -597,8 +636,9 @@ job arch opsys buildConfig = (jobName, Job {..})
      , "BUILD_FLAVOUR" =: flavourString jobFlavour
      , "BIGNUM_BACKEND" =: bignumString (bignumBackend buildConfig)
      , "CONFIGURE_ARGS" =: configureArgsStr buildConfig
-
-      , if withNuma buildConfig then "ENABLE_NUMA" =: "1" else M.empty
+      , maybe mempty ("CROSS_TARGET" =:) (crossTarget buildConfig)
+      , maybe mempty ("CROSS_EMULATOR" =:) (crossEmulator buildConfig)
+      , if withNuma buildConfig then "ENABLE_NUMA" =: "1" else mempty
      ]

    jobArtifacts = Artifacts
@@ -644,7 +684,7 @@ addJobRule :: Rule -> Job -> Job
 addJobRule r j = j { jobRules = enableRule r (jobRules j) }

 addVariable :: String -> String -> Job -> Job
-addVariable k v j = j { jobVariables = M.insertWith (++) k [v] (jobVariables j) }
+addVariable k v j = j { jobVariables = mminsertWith (++) k [v] (jobVariables j) }

 -- Building the standard jobs
 --
@@ -740,8 +780,8 @@ flattenJobGroup (ValidateOnly a b) = [a, b]


 -- | Specification for all the jobs we want to build.
-jobs :: M.MonoidalMap String Job
-jobs = M.fromList $ concatMap flattenJobGroup $
+jobs :: Map String Job
+jobs = Map.fromList $ concatMap flattenJobGroup $
     [ disableValidate (standardBuilds Amd64 (Linux Debian10))
     , (standardBuildsWithConfig Amd64 (Linux Debian10) dwarf)
     , (validateBuilds Amd64 (Linux Debian10) nativeInt)
@@ -766,13 +806,14 @@ jobs = M.fromList $ concatMap flattenJobGroup $
     , fastCI (standardBuilds Amd64 Windows)
     , disableValidate (standardBuildsWithConfig Amd64 Windows nativeInt)
     , standardBuilds Amd64 Darwin
-     , allowFailureGroup (addValidateRule FreeBSDTag (standardBuilds Amd64 FreeBSD))
+     , allowFailureGroup (addValidateRule FreeBSDLabel (standardBuilds Amd64 FreeBSD13))
     , standardBuilds AArch64 Darwin
     , standardBuilds AArch64 (Linux Debian10)
-     , allowFailureGroup (disableValidate (standardBuilds ARMv7 (Linux Debian10)))
+     , allowFailureGroup (addValidateRule ARMLabel (standardBuilds ARMv7 (Linux Debian10)))
     , standardBuilds I386 (Linux Debian9)
     , allowFailureGroup (standardBuildsWithConfig Amd64 (Linux Alpine) static)
     , disableValidate (allowFailureGroup (standardBuildsWithConfig Amd64 (Linux Alpine) staticNativeInt))
+     , validateBuilds Amd64 (Linux Debian11) (crossConfig "aarch64-linux-gnu" (Just "qemu-aarch64 -L /usr/aarch64-linux-gnu"))
     ]

  where

--- a/.gitlab/jobs.yaml
+++ b/.gitlab/jobs.yaml
@@ -35,7 +35,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -97,7 +97,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -155,7 +155,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"disabled\" != \"disabled\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && ($CI_MERGE_REQUEST_LABELS =~ /.*ARM.*/) && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -174,7 +174,10 @@
      "BIGNUM_BACKEND": "gmp",
      "BIN_DIST_NAME": "ghc-armv7-linux-deb10-validate",
      "BUILD_FLAVOUR": "validate",
-      "CONFIGURE_ARGS": "LD=ld.lld ",
+      "CONFIGURE_ARGS": "--host=armv7-linux-gnueabihf --build=armv7-linux-gnueabihf --target=armv7-linux-gnueabihf ",
+      "GccUseLdOpt": "-fuse-ld=gold",
+      "HADRIAN_ARGS": "--test-verbose=3",
+      "LD": "ld.gold",
      "TEST_ENV": "armv7-linux-deb10-validate"
    }
  },
@@ -213,7 +216,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -271,7 +274,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -334,7 +337,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -393,7 +396,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -412,7 +415,10 @@
      "BIGNUM_BACKEND": "gmp",
      "BIN_DIST_NAME": "ghc-armv7-linux-deb10-validate",
      "BUILD_FLAVOUR": "validate",
-      "CONFIGURE_ARGS": "LD=ld.lld ",
+      "CONFIGURE_ARGS": "--host=armv7-linux-gnueabihf --build=armv7-linux-gnueabihf --target=armv7-linux-gnueabihf ",
+      "GccUseLdOpt": "-fuse-ld=gold",
+      "HADRIAN_ARGS": "--test-verbose=3",
+      "LD": "ld.gold",
      "TEST_ENV": "armv7-linux-deb10-validate",
      "XZ_OPT": "-9"
    }
@@ -452,7 +458,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -511,7 +517,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -541,7 +547,7 @@
      "ac_cv_func_utimensat": "no"
    }
  },
-  "nightly-x86_64-freebsd-validate": {
+  "nightly-x86_64-freebsd13-validate": {
    "after_script": [
      ".gitlab/ci.sh save_cache",
      ".gitlab/ci.sh clean",
@@ -551,7 +557,7 @@
    "artifacts": {
      "expire_in": "8 weeks",
      "paths": [
-        "ghc-x86_64-freebsd-validate.tar.xz",
+        "ghc-x86_64-freebsd13-validate.tar.xz",
        "junit.xml"
      ],
      "reports": {
@@ -560,7 +566,7 @@
      "when": "always"
    },
    "cache": {
-      "key": "x86_64-freebsd-$CACHE_REV",
+      "key": "x86_64-freebsd13-$CACHE_REV",
      "paths": [
        "cabal-cache",
        "toolchain"
@@ -576,7 +582,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -588,17 +594,17 @@
    ],
    "stage": "full-build",
    "tags": [
-      "x86_64-freebsd"
+      "x86_64-freebsd13"
    ],
    "variables": {
      "BIGNUM_BACKEND": "gmp",
-      "BIN_DIST_NAME": "ghc-x86_64-freebsd-validate",
+      "BIN_DIST_NAME": "ghc-x86_64-freebsd13-validate",
      "BUILD_FLAVOUR": "validate",
-      "CABAL_INSTALL_VERSION": "3.2.0.0",
+      "CABAL_INSTALL_VERSION": "3.6.2.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": "9.2.2",
      "HADRIAN_ARGS": "--docs=no-sphinx",
-      "TEST_ENV": "x86_64-freebsd-validate",
+      "TEST_ENV": "x86_64-freebsd13-validate",
      "XZ_OPT": "-9"
    }
  },
@@ -637,7 +643,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -699,7 +705,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -761,7 +767,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -821,7 +827,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -880,7 +886,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -939,7 +945,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -999,7 +1005,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -1058,7 +1064,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -1117,7 +1123,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -1176,7 +1182,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -1235,7 +1241,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -1261,6 +1267,67 @@
      "XZ_OPT": "-9"
    }
  },
+  "nightly-x86_64-linux-deb11-cross_aarch64-linux-gnu-validate": {
+    "after_script": [
+      ".gitlab/ci.sh save_cache",
+      ".gitlab/ci.sh clean",
+      "cat ci_timings"
+    ],
+    "allow_failure": false,
+    "artifacts": {
+      "expire_in": "8 weeks",
+      "paths": [
+        "ghc-x86_64-linux-deb11-cross_aarch64-linux-gnu-validate.tar.xz",
+        "junit.xml"
+      ],
+      "reports": {
+        "junit": "junit.xml"
+      },
+      "when": "always"
+    },
+    "cache": {
+      "key": "x86_64-linux-deb11-$CACHE_REV",
+      "paths": [
+        "cabal-cache",
+        "toolchain"
+      ]
+    },
+    "dependencies": [],
+    "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb11:$DOCKER_REV",
+    "needs": [
+      {
+        "artifacts": false,
+        "job": "hadrian-ghc-in-ghci"
+      }
+    ],
+    "rules": [
+      {
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "when": "on_success"
+      }
+    ],
+    "script": [
+      "sudo chown ghc:ghc -R .",
+      ".gitlab/ci.sh setup",
+      ".gitlab/ci.sh configure",
+      ".gitlab/ci.sh build_hadrian",
+      ".gitlab/ci.sh test_hadrian"
+    ],
+    "stage": "full-build",
+    "tags": [
+      "x86_64-linux"
+    ],
+    "variables": {
+      "BIGNUM_BACKEND": "gmp",
+      "BIN_DIST_NAME": "ghc-x86_64-linux-deb11-cross_aarch64-linux-gnu-validate",
+      "BUILD_FLAVOUR": "validate",
+      "CONFIGURE_ARGS": "--with-intree-gmp",
+      "CROSS_EMULATOR": "qemu-aarch64 -L /usr/aarch64-linux-gnu",
+      "CROSS_TARGET": "aarch64-linux-gnu",
+      "TEST_ENV": "x86_64-linux-deb11-cross_aarch64-linux-gnu-validate",
+      "XZ_OPT": "-9"
+    }
+  },
  "nightly-x86_64-linux-deb11-validate": {
    "after_script": [
      ".gitlab/ci.sh save_cache",
@@ -1296,7 +1363,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -1355,7 +1422,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -1414,7 +1481,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -1475,7 +1542,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -1537,7 +1604,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -1598,7 +1665,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -1653,7 +1720,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -1712,7 +1779,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -1775,7 +1842,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB == \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB == \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -1839,7 +1906,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB == \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB == \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -1899,7 +1966,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB == \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB == \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -1918,8 +1985,11 @@
      "BIGNUM_BACKEND": "gmp",
      "BIN_DIST_NAME": "ghc-armv7-linux-deb10-release",
      "BUILD_FLAVOUR": "release",
-      "CONFIGURE_ARGS": "LD=ld.lld ",
+      "CONFIGURE_ARGS": "--host=armv7-linux-gnueabihf --build=armv7-linux-gnueabihf --target=armv7-linux-gnueabihf ",
+      "GccUseLdOpt": "-fuse-ld=gold",
+      "HADRIAN_ARGS": "--test-verbose=3",
      "IGNORE_PERF_FAILURES": "all",
+      "LD": "ld.gold",
      "TEST_ENV": "armv7-linux-deb10-release",
      "XZ_OPT": "-9"
    }
@@ -1959,7 +2029,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB == \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB == \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -2019,7 +2089,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB == \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB == \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -2050,7 +2120,7 @@
      "ac_cv_func_utimensat": "no"
    }
  },
-  "release-x86_64-freebsd-release": {
+  "release-x86_64-freebsd13-release": {
    "after_script": [
      ".gitlab/ci.sh save_cache",
      ".gitlab/ci.sh clean",
@@ -2060,7 +2130,7 @@
    "artifacts": {
      "expire_in": "1 year",
      "paths": [
-        "ghc-x86_64-freebsd-release.tar.xz",
+        "ghc-x86_64-freebsd13-release.tar.xz",
        "junit.xml"
      ],
      "reports": {
@@ -2069,7 +2139,7 @@
      "when": "always"
    },
    "cache": {
-      "key": "x86_64-freebsd-$CACHE_REV",
+      "key": "x86_64-freebsd13-$CACHE_REV",
      "paths": [
        "cabal-cache",
        "toolchain"
@@ -2085,7 +2155,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB == \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB == \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -2097,18 +2167,18 @@
    ],
    "stage": "full-build",
    "tags": [
-      "x86_64-freebsd"
+      "x86_64-freebsd13"
    ],
    "variables": {
      "BIGNUM_BACKEND": "gmp",
-      "BIN_DIST_NAME": "ghc-x86_64-freebsd-release",
+      "BIN_DIST_NAME": "ghc-x86_64-freebsd13-release",
      "BUILD_FLAVOUR": "release",
-      "CABAL_INSTALL_VERSION": "3.2.0.0",
+      "CABAL_INSTALL_VERSION": "3.6.2.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": "9.2.2",
      "HADRIAN_ARGS": "--docs=no-sphinx",
      "IGNORE_PERF_FAILURES": "all",
-      "TEST_ENV": "x86_64-freebsd-release",
+      "TEST_ENV": "x86_64-freebsd13-release",
      "XZ_OPT": "-9"
    }
  },
@@ -2147,7 +2217,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB == \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB == \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -2210,7 +2280,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB == \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB == \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -2273,7 +2343,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB == \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB == \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -2334,7 +2404,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB == \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB == \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -2394,7 +2464,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB == \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB == \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -2454,7 +2524,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB == \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB == \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -2514,7 +2584,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB == \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB == \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -2574,7 +2644,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB == \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB == \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -2636,7 +2706,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB == \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB == \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -2698,7 +2768,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB == \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB == \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -2761,7 +2831,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB == \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB == \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -2817,7 +2887,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB == \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB == \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -2877,7 +2947,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB == \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB == \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -2941,7 +3011,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -2970,7 +3040,7 @@
      "ac_cv_func_utimensat": "no"
    }
  },
-  "x86_64-freebsd-validate": {
+  "x86_64-freebsd13-validate": {
    "after_script": [
      ".gitlab/ci.sh save_cache",
      ".gitlab/ci.sh clean",
@@ -2980,7 +3050,7 @@
    "artifacts": {
      "expire_in": "2 weeks",
      "paths": [
-        "ghc-x86_64-freebsd-validate.tar.xz",
+        "ghc-x86_64-freebsd13-validate.tar.xz",
        "junit.xml"
      ],
      "reports": {
@@ -2989,7 +3059,7 @@
      "when": "always"
    },
    "cache": {
-      "key": "x86_64-freebsd-$CACHE_REV",
+      "key": "x86_64-freebsd13-$CACHE_REV",
      "paths": [
        "cabal-cache",
        "toolchain"
@@ -3005,7 +3075,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && ($CI_MERGE_REQUEST_LABELS =~ /.*FreeBSD.*/) && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && ($CI_MERGE_REQUEST_LABELS =~ /.*FreeBSD.*/) && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -3017,17 +3087,17 @@
    ],
    "stage": "full-build",
    "tags": [
-      "x86_64-freebsd"
+      "x86_64-freebsd13"
    ],
    "variables": {
      "BIGNUM_BACKEND": "gmp",
-      "BIN_DIST_NAME": "ghc-x86_64-freebsd-validate",
+      "BIN_DIST_NAME": "ghc-x86_64-freebsd13-validate",
      "BUILD_FLAVOUR": "validate",
-      "CABAL_INSTALL_VERSION": "3.2.0.0",
+      "CABAL_INSTALL_VERSION": "3.6.2.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": "9.2.2",
      "HADRIAN_ARGS": "--docs=no-sphinx",
-      "TEST_ENV": "x86_64-freebsd-validate"
+      "TEST_ENV": "x86_64-freebsd13-validate"
    }
  },
  "x86_64-linux-alpine3_12-int_native-validate+fully_static": {
@@ -3065,7 +3135,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"disabled\" != \"disabled\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"disabled\" != \"disabled\")",
        "when": "on_success"
      }
    ],
@@ -3126,7 +3196,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -3187,7 +3257,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"disabled\" != \"disabled\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"disabled\" != \"disabled\")",
        "when": "on_success"
      }
    ],
@@ -3246,7 +3316,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -3305,7 +3375,7 @@
    "rules": [
      {
        "allow_failure": true,
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "manual"
      }
    ],
@@ -3363,7 +3433,7 @@
    ],
    "rules": [
      {
-        "if": "(\"true\" == \"true\") && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "(\"true\" == \"true\") && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -3422,7 +3492,7 @@
    ],
    "rules": [
      {
-        "if": "(\"true\" == \"true\") && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "(\"true\" == \"true\") && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -3480,7 +3550,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"disabled\" != \"disabled\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"disabled\" != \"disabled\")",
        "when": "on_success"
      }
    ],
@@ -3538,7 +3608,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -3596,7 +3666,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && ($CI_MERGE_REQUEST_LABELS =~ /.*LLVM backend.*/) && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && ($CI_MERGE_REQUEST_LABELS =~ /.*LLVM backend.*/) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -3655,7 +3725,7 @@
    "rules": [
      {
        "allow_failure": true,
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "manual"
      }
    ],
@@ -3680,6 +3750,66 @@
      "TSAN_OPTIONS": "suppressions=$CI_PROJECT_DIR/rts/.tsan-suppressions"
    }
  },
+  "x86_64-linux-deb11-cross_aarch64-linux-gnu-validate": {
+    "after_script": [
+      ".gitlab/ci.sh save_cache",
+      ".gitlab/ci.sh clean",
+      "cat ci_timings"
+    ],
+    "allow_failure": false,
+    "artifacts": {
+      "expire_in": "2 weeks",
+      "paths": [
+        "ghc-x86_64-linux-deb11-cross_aarch64-linux-gnu-validate.tar.xz",
+        "junit.xml"
+      ],
+      "reports": {
+        "junit": "junit.xml"
+      },
+      "when": "always"
+    },
+    "cache": {
+      "key": "x86_64-linux-deb11-$CACHE_REV",
+      "paths": [
+        "cabal-cache",
+        "toolchain"
+      ]
+    },
+    "dependencies": [],
+    "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb11:$DOCKER_REV",
+    "needs": [
+      {
+        "artifacts": false,
+        "job": "hadrian-ghc-in-ghci"
+      }
+    ],
+    "rules": [
+      {
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "when": "on_success"
+      }
+    ],
+    "script": [
+      "sudo chown ghc:ghc -R .",
+      ".gitlab/ci.sh setup",
+      ".gitlab/ci.sh configure",
+      ".gitlab/ci.sh build_hadrian",
+      ".gitlab/ci.sh test_hadrian"
+    ],
+    "stage": "full-build",
+    "tags": [
+      "x86_64-linux"
+    ],
+    "variables": {
+      "BIGNUM_BACKEND": "gmp",
+      "BIN_DIST_NAME": "ghc-x86_64-linux-deb11-cross_aarch64-linux-gnu-validate",
+      "BUILD_FLAVOUR": "validate",
+      "CONFIGURE_ARGS": "--with-intree-gmp",
+      "CROSS_EMULATOR": "qemu-aarch64 -L /usr/aarch64-linux-gnu",
+      "CROSS_TARGET": "aarch64-linux-gnu",
+      "TEST_ENV": "x86_64-linux-deb11-cross_aarch64-linux-gnu-validate"
+    }
+  },
  "x86_64-linux-deb11-validate": {
    "after_script": [
      ".gitlab/ci.sh save_cache",
@@ -3715,7 +3845,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"disabled\" != \"disabled\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"disabled\" != \"disabled\")",
        "when": "on_success"
      }
    ],
@@ -3773,7 +3903,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"disabled\" != \"disabled\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"disabled\" != \"disabled\")",
        "when": "on_success"
      }
    ],
@@ -3831,7 +3961,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],
@@ -3891,7 +4021,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"disabled\" != \"disabled\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"disabled\" != \"disabled\")",
        "when": "on_success"
      }
    ],
@@ -3952,7 +4082,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"disabled\" != \"disabled\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"disabled\" != \"disabled\")",
        "when": "on_success"
      }
    ],
@@ -4012,7 +4142,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"disabled\" != \"disabled\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"disabled\" != \"disabled\")",
        "when": "on_success"
      }
    ],
@@ -4066,7 +4196,7 @@
    ],
    "rules": [
      {
-        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"disabled\" != \"disabled\")",
+        "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"disabled\" != \"disabled\")",
        "when": "on_success"
      }
    ],
@@ -4124,7 +4254,7 @@
    ],
    "rules": [
      {
-        "if": "(\"true\" == \"true\") && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+        "if": "(\"true\" == \"true\") && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
        "when": "on_success"
      }
    ],

--- a/.gitlab/upload_ghc_libs.py
+++ b/.gitlab/upload_ghc_libs.py
@@ -17,6 +17,7 @@ There are two modes, preparation and upload.
 """

 from subprocess import run, check_call
+from getpass import getpass
 import shutil
 from pathlib import Path
 from typing import NamedTuple, Callable, List, Dict, Optional
@@ -36,6 +37,10 @@ class Package(NamedTuple):
    path: Path
    prepare_sdist: Callable[[], None]

+class Credentials(NamedTuple):
+    username: str
+    password: str
+
 def no_prep():
    pass

@@ -97,11 +102,15 @@ PACKAGES = {
 }
 # Dict[str, Package]

-def cabal_upload(tarball: Path, publish: bool=False, extra_args=[]):
+def cabal_upload(tarball: Path, creds: Credentials, publish: bool=False, extra_args=[]):
    if publish:
        extra_args += ['--publish']

-    run(['cabal', 'upload'] + extra_args + [tarball], check=True)
+    creds_args = [
+        f'--username={creds.username}',
+        f'--password={creds.password}'
+    ]
+    run(['cabal', 'upload'] + extra_args + [tarball] + creds_args, check=True)

 def prepare_sdist(pkg: Package):

@@ -115,13 +124,13 @@ def prepare_sdist(pkg: Package):
    res_path = shutil.copy(sdist, OUT_DIR)
    return os.path.relpath(res_path, OUT_DIR)

-def upload_pkg_sdist(sdist : Path, pkg : Package, publish : bool):
+def upload_pkg_sdist(sdist : Path, pkg: Package, publish: bool, creds: Credentials):
    publish_tag = '-publish' if publish else ''
    stamp = WORK_DIR / f'{pkg.name}-sdist{publish_tag}'
    if stamp.is_file():
        return
    print(f'Uploading package {pkg.name}...')
-    cabal_upload(sdist, publish)
+    cabal_upload(sdist, publish=publish, creds=creds)
    stamp.write_text('')

 def get_version(cabal_file: Path) -> Optional[str]:
@@ -137,8 +146,8 @@ def prepare_docs(bindist: Path, pkg: Package):
    """
    cabal_file = pkg.path / f'{pkg.name}.cabal'
    version = get_version(cabal_file)
-    docdir = bindist / 'doc' / 'html' / 'libraries' / (pkg.name + "-" + version)
    assert version is not None
+    docdir = bindist / 'doc' / 'html' / 'libraries' / (pkg.name + "-" + version)

    # Build the documentation tarball from the bindist documentation
    stem = f'{pkg.name}-{version}-docs'
@@ -148,20 +157,20 @@ def prepare_docs(bindist: Path, pkg: Package):
    run(['tar', '-czf', OUT_DIR / tarball, '-H', 'ustar', '-C', tmp.name, stem])
    return tarball

-def upload_docs(tarball : Path, pkg : Package, publish : bool):
+def upload_docs(tarball : Path, pkg : Package, publish : bool, creds: Credentials):
    publish_tag = '-publish' if publish else ''
    stamp = WORK_DIR / f'{pkg.name}-docs{publish_tag}'
    if stamp.is_file():
        return
    # Upload the documentation tarball
    print(f'Uploading documentation for {pkg.name}...')
-    cabal_upload(tarball, publish=publish, extra_args=['--documentation'])
+    cabal_upload(tarball, publish=publish, extra_args=['--documentation'], creds=creds)
    stamp.write_text('')

-def upload_pkg(pkg: Package, d : Path, meta, publish : bool):
+def upload_pkg(pkg: Package, d : Path, meta, publish : bool, creds: Credentials):
    print(f'Uploading {pkg.name}...')
-    upload_pkg_sdist(d / meta['sdist'], pkg, publish=publish)
-    upload_docs(d / meta['docs'], pkg, publish=publish)
+    upload_pkg_sdist(d / meta['sdist'], pkg, publish=publish, creds=creds)
+    upload_docs(d / meta['docs'], pkg, publish=publish, creds=creds)

 def prepare_pkg(bindist : Path, pkg : Package):
    if pkg.path.exists():
@@ -172,11 +181,6 @@ def prepare_pkg(bindist : Path, pkg : Package):
    else:
        print(f"Package {pkg.name} doesn't exist... skipping")

-
-def upload_all(bindist: Path):
-    for pkg in PACKAGES.values():
-        upload_pkg(bindist, pkg)
-
 def main() -> None:
    import argparse

@@ -212,13 +216,16 @@ def main() -> None:
            pickle.dump(manifest, fout)

    elif args.command == "upload":
+        username = input('Hackage username: ')
+        password = getpass('Hackage password: ')
+        creds = Credentials(username, password)
        manifest_path = args.docs
        with open(manifest_path / 'manifest.pickle', 'rb') as fin:
            manifest = pickle.load(fin)
        for pkg, item in manifest.items():
            if pkg.name in pkgs:
                print(pkg, item)
-                upload_pkg(pkg, manifest_path, item, publish=args.publish)
+                upload_pkg(pkg, manifest_path, item, publish=args.publish, creds=creds)

 if __name__ == '__main__':
    main()

--- a/MAKEHELP.md
+++ b/MAKEHELP.md
-Quick `make` guide for GHC
-==========================
-
-For a "Getting Started" guide, see:
-
-  - https://gitlab.haskell.org/ghc/ghc/wikis/building/quick-start
-  - https://gitlab.haskell.org/ghc/ghc/wikis/building/using
-  - https://gitlab.haskell.org/ghc/ghc/wikis/building/standard-targets
-
-Common commands:
-
-  - `make`
-
-    Builds everything: ghc stages 1 and 2, all libraries and tools.
-
-  - `make -j2`
-
-    Parallel build: runs up to 2 commands at a time.
-
-  - `cd <dir>; make`
-
-    Builds everything in the given directory.
-
-  - `cd <dir>; make help`
-
-    Shows the targets available in <dir>
-
-  - `make install`
-  - `make install-strip`
-
-    Installs GHC, libraries and tools under $(prefix). The install-strip
-    variant strips executable files while installing them.
-
-  - `make sdist`
-  - `make binary-dist`
-
-    Builds a source or binary distribution respectively
-
-  - `make show VALUE=<var>`
-  - `make show! VALUE=<var>`
-
-    Show the value of make variable <var>. The show! variant works right after
-    ./configure (it skips reading package-data.mk files).
-
-  - `make clean`
-  - `make distclean`
-  - `make maintainer-clean`
-
-    Various levels of cleaning: "clean" restores the tree to the
-    state after "./configure", "distclean" restores to the state
-    after "python3 boot", and maintainer-clean restores the tree to the
-    completely clean checked-out state.
-
-Using `make` in subdirectories
-==============================
-
-  - `make`
-
-    Builds everything in this directory (including dependencies elsewhere
-    in the tree, if necessary)
-
-  - `make fast`
-
-    The same as 'make', but omits some phases and does not
-    recalculate dependencies.  Useful for saving time if you are sure
-    the rest of the tree is up to date.
-
-  - `make clean`
-  - `make distclean`
-  - `make maintainer-clean`
-
-    Clean just this directory
-
-  - `make html`
-  - `make pdf`
-  - `make ps`
-
-    Make documentation in this directory (if any)
-
-  - `make show VALUE=<var>`
-  - `make show! VALUE=<var>`
-
-    Show the value of make variable <var>. The show! variant works right after
-    ./configure (it skips reading package-data.mk files).
-
-  - `make <file>`
-
-    Bring a particular file up to date, e.g. make dist/build/Module.o
-    The name <file> is relative to the current directory
-
-Useful links:
-=============
-
-See also "new Hadrian build system":
-
-  - https://gitlab.haskell.org/ghc/ghc/wikis/building/hadrian
--- a/Makefile
+++ b/Makefile
-# -----------------------------------------------------------------------------
-#
-# (c) 2009 The University of Glasgow
-#
-# This file is part of the GHC build system.
-#
-# To understand how the build system works and how to modify it, see
-#      https://gitlab.haskell.org/ghc/ghc/wikis/building/architecture
-#      https://gitlab.haskell.org/ghc/ghc/wikis/building/modifying
-#
-# -----------------------------------------------------------------------------
-
-# Eliminate use of the built-in implicit rules, and clear out the default list
-# of suffixes for suffix rules. Speeds up make quite a bit. Both are needed
-# for the shortest `make -d` output.
-# Don't set --no-builtin-variables; some rules might stop working if you do
-# (e.g. 'make clean' in testsuite/ currently relies on an implicit $RM).
-MAKEFLAGS += --no-builtin-rules
-.SUFFIXES:
-
-
-# -----------------------------------------------------------------------------
-# Sanitize environment
-
-# See #11530
-export GREP_OPTIONS :=
-
-ifneq "$(filter maintainer-clean distclean clean clean_% help,$(MAKECMDGOALS))" ""
-include mk/config.mk
-else
-include mk/config.mk
-ifeq "$(ProjectVersion)" ""
-$(error Please run ./configure first)
-endif
-endif
-
-include mk/custom-settings.mk
-
-
-ifeq "$(wildcard distrib/)" ""
-
-# We're in a bindist
-
-.PHONY: default
-default:
-	@echo 'Run "make install" to install'
-	@false
-
-.PHONY: install show
-install show:
-	$(MAKE) --no-print-directory -f ghc.mk $@ BINDIST=YES NO_INCLUDE_DEPS=YES
-
-# Note [install-strip]
-# ~~~~~~~~~~~~~~~~~~~~
-# install-strip is like install, but it strips the executable files while
-# installing them.
-#
-# From http://www.gnu.org/prep/standards/html_node/Standard-Targets.html:
-#
-#   "install-strip should not strip the executables in the build directory
-#   which are being copied for installation. It should only strip the copies
-#   that are installed. "
-
-.PHONY: install-strip
-install-strip:
-	# See Note [install-strip].
-	$(MAKE) --no-print-directory -f ghc.mk INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install BINDIST=YES NO_INCLUDE_DEPS=YES
-
-else
-
-.PHONY: default
-default : all
-	@:
-
-# For help, type 'make help'
-.PHONY: help
-help:
-	@cat MAKEHELP.md
-
-# No need to update makefiles for these targets:
-# (the ones we're filtering out)
-REALGOALS=$(filter-out \
-    binary-dist \
-    binary-dist-prep \
-    install-strip \
-    sdist sdist-ghc \
-    sdist-ghc-prep \
-    sdist-windows-tarballs \
-    sdist-windows-tarballs-prep \
-    sdist-testsuite \
-    sdist-testsuite-prep \
-    bootstrapping-files \
-    framework-pkg \
-    clean \
-    clean_% \
-    distclean \
-    maintainer-clean \
-    show \
-    show! \
-    echo \
-    help \
-    test \
-    fulltest \
-    slowtest \
-    fasttest \
-    fast \
-  ,$(MAKECMDGOALS))
-
-# configure touches certain files even if they haven't changed.  This
-# can mean a lot of unnecessary recompilation after a re-configure, so
-# here we cache the old versions of these files so we can restore the
-# timestamps.
-%.old:  %
-	@set -x && test -f $@ && cmp -s $< $@ || cp -p $< $@
-	touch -r $@ $<
-
-
-# NB. not the same as saying '%: ...', which doesn't do the right thing:
-# it does nothing if we specify a target that already exists.
-.PHONY: $(REALGOALS) all
-$(REALGOALS) all: mk/config.mk.old mk/project.mk.old compiler/ghc.cabal.old
-ifneq "$(OMIT_PHASE_0)" "YES"
-	@echo "===--- building phase 0"
-	$(MAKE) --no-print-directory -f ghc.mk phase=0 phase_0_builds
-endif
-ifneq "$(OMIT_PHASE_1)" "YES"
-	@echo "===--- building phase 1"
-	$(MAKE) --no-print-directory -f ghc.mk phase=1 phase_1_builds
-endif
-	@echo "===--- building final phase"
-	$(MAKE) --no-print-directory -f ghc.mk phase=final $@
-
-# if BINARY_DIST_DIR is not set, assume we want the old
-# behaviour of placing the binary dist into the current
-# directory. Provide BINARY_DIST_DIR to put the final
-# binary distribution elsewhere.
-BINARY_DIST_DIR ?= .
-
-.PHONY: binary-dist
-binary-dist: binary-dist-prep
-	mv bindistprep/*.tar.$(TAR_COMP_EXT) "$(BINARY_DIST_DIR)"
-
-.PHONY: binary-dist-prep
-binary-dist-prep:
-ifeq "$(mingw32_TARGET_OS)" "1"
-	$(MAKE) --no-print-directory -f ghc.mk windows-binary-dist-prep
-else
-	rm -f bindist-list
-	$(MAKE) --no-print-directory -f ghc.mk bindist-list BINDIST=YES
-	$(MAKE) --no-print-directory -f ghc.mk unix-binary-dist-prep
-endif
-
-.PHONY: install-strip
-install-strip:
-	# See Note [install-strip].
-	$(MAKE) --no-print-directory -f ghc.mk INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
-
-.PHONY: sdist sdist-ghc sdist-ghc-prep sdist-windows-tarballs sdist-windows-tarballs-prep sdist-testsuite sdist-testsuite-prep
-# Just running `./boot && ./configure && make sdist` should work, so skip
-# phase 0 and 1 and don't build any dependency files.
-sdist sdist-ghc sdist-ghc-prep sdist-windows-tarballs sdist-windows-tarballs-prep sdist-testsuite sdist-testsuite-prep :
-	$(MAKE) --no-print-directory -f ghc.mk $@ NO_INCLUDE_DEPS=YES NO_INCLUDE_PKGDATA=YES
-
-.PHONY: clean distclean maintainer-clean
-clean distclean maintainer-clean:
-	$(MAKE) --no-print-directory -f ghc.mk $@ CLEANING=YES
-	test ! -d testsuite || $(MAKE) -C testsuite $@
-
-.PHONY: $(filter clean_%,$(MAKECMDGOALS))
-$(filter clean_%, $(MAKECMDGOALS)) : clean_% :
-	$(MAKE) --no-print-directory -f ghc.mk $@ CLEANING=YES
-
-.PHONY: bootstrapping-files show echo
-bootstrapping-files show echo:
-	$(MAKE) --no-print-directory -f ghc.mk $@
-
-.PHONY: show!
-show!:
-	$(MAKE) --no-print-directory -f ghc.mk show NO_INCLUDE_PKGDATA=YES
-
-ifeq "$(darwin_TARGET_OS)" "1"
-.PHONY: framework-pkg
-framework-pkg:
-	$(MAKE) -C distrib/MacOS $@
-endif
-
-# If the user says 'make A B', then we don't want to invoke two
-# instances of the rule above in parallel:
-.NOTPARALLEL:
-
-endif
-
-# Note [validate and testsuite speed]
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-# There are 3 different validate and testsuite speed settings:
-# fast, normal and slow.
-#
-#                              how    how   used
-#           cd tests  config.  many   many  by
-# validate  && make   speed=   tests  ways  whom
-# =============================================================================
-# --fast    fast      2        some   1+exs Travis (to stay within time limit)
-# --normal  test      1        all    1+exs Phabricator (slow takes too long?)
-# --slow    slow      0        all    all   Nightly (slow is ok)
-#
-#           accept    1        all    1
-#
-# `--fast` and `--normal` run one default way, as well as any other ways which
-# are explicitly requested by the test using extra_ways().
-#
-# `make accept` should run all tests exactly once. There is no point in
-# accepting a test for multiple ways, since it should produce the same output
-# for all ways.
-#
-# To make sure all .stderr and .stdout files in the testsuite are never
-# out-of-date, it is useful if Phabricator, via a normal `./validate` and `make
-# test`, runs each test at least once.
-.PHONY: fasttest
-fasttest:
-	$(MAKE) -C testsuite/tests SUMMARY_FILE=../../testsuite_summary.txt fast
-
-.PHONY: test
-test:
-	$(MAKE) -C testsuite/tests SUMMARY_FILE=../../testsuite_summary.txt
-
-.PHONY: slowtest fulltest
-slowtest fulltest:
-	$(MAKE) -C testsuite/tests SUMMARY_FILE=../../testsuite_summary.txt slow
-
-.PHONY: fast
-fast:
-	@echo "You can use 'make fast' only from inside a sub-component directory."
-	@exit 1
--- a/README.md
+++ b/README.md
@@ -53,19 +53,22 @@ For building library documentation, you'll need [Haddock][6].  To build
 the compiler documentation, you need [Sphinx](http://www.sphinx-doc.org/)
 and Xelatex (only for PDF output).

-**Quick start**: the following gives you a default build:
+**Quick start**: GHC is built using the [Hadrian build system](hadrian/README.md).
+The following gives you a default build:

    $ ./boot
    $ ./configure
-    $ make         # can also say 'make -jX' for X number of jobs
-    $ make install
+    $ hadrian/build         # can also say '-jX' for X number of jobs

  On Windows, you need an extra repository containing some build tools.
  These can be downloaded for you by configure. This only needs to be done once by running:

    $ ./configure --enable-tarballs-autodownload

-(NB: **Do you have multiple cores? Be sure to tell that to `make`!** This can
+  Additionally, on Windows, to run Hadrian you should run `hadrian/build.bat`
+  instead of `hadrian/build`.
+
+(NB: **Do you have multiple cores? Be sure to tell that to `hadrian`!** This can
 save you hours of build time depending on your system configuration, and is
 almost always a win regardless of how many cores you have. As a simple rule,
 you should have about N+1 jobs, where `N` is the amount of cores you have.)

--- a/appveyor.yml
+++ b/appveyor.yml
-version: "{build}"
-build_cloud: ghc-gce-cloud
-image: GHC-GCE
-
-build:
-  verbosity: normal
-
-environment:
-  matrix:
-  - COMPILER: msys2
-    PLATFORM: x64
-    MSYS2_ARCH: x86_64
-    MSYS2_DIR: msys64
-    MSYSTEM: MINGW64
-    BIT: 64
-
-deploy: off
-
-install:
-  - cmd: |
-      SET "PATH=C:\%MSYS2_DIR%\%MSYSTEM%\bin;C:\%MSYS2_DIR%\usr\bin;%PATH%"
-      bash .appveyor.sh prepare
-
-build_script:
-  - bash .appveyor.sh build
-  - bash .appveyor.sh test
-
-artifacts:
-  - path: ghc-windows.zip
-    name: GHC Windows bindist
-    type: zip
--- a/bindisttest/ghc.mk
+++ b/bindisttest/ghc.mk
-# -----------------------------------------------------------------------------
-#
-# (c) 2009 The University of Glasgow
-#
-# This file is part of the GHC build system.
-#
-# To understand how the build system works and how to modify it, see
-#      https://gitlab.haskell.org/ghc/ghc/wikis/building/architecture
-#      https://gitlab.haskell.org/ghc/ghc/wikis/building/modifying
-#
-# -----------------------------------------------------------------------------
-
-ifeq "$(TEST_PREP)" "YES"
-BIN_DIST_TEST_TAR_COMP = $(BIN_DIST_PREP_TAR_COMP)
-else
-BIN_DIST_TEST_TAR_COMP = $(BIN_DIST_TAR_COMP)
-endif
-
-.PHONY: test_bindist
-test_bindist:
-	"$(RM)" $(RM_OPTS_REC) bindisttest/$(BIN_DIST_INST_SUBDIR)
-	"$(RM)" $(RM_OPTS_REC) bindisttest/a
-	"$(RM)" $(RM_OPTS) bindisttest/HelloWorld
-	"$(RM)" $(RM_OPTS) bindisttest/HelloWorld.o
-	"$(RM)" $(RM_OPTS) bindisttest/HelloWorld.hi
-	"$(RM)" $(RM_OPTS) bindisttest/output
-# We use the a/b/c subdirectory as configure looks for install-sh in
-# . .. ../.. and we don't want it to find the build system's install-sh.
-#
-# NB. tar has funny interpretation of filenames sometimes (thinking
-# c:/foo is a remote file), so it's safer to bzip and then pipe into
-# tar rather than using tar -xjf:
-	mkdir bindisttest/a
-	mkdir bindisttest/a/b
-	mkdir bindisttest/a/b/c
-	cd bindisttest/a/b/c/ && $(TAR_COMP_CMD) -cd ../../../../$(BIN_DIST_TEST_TAR_COMP) | $(TAR_CMD) -xf -
-	$(SHELL) bindisttest/checkBinaries.sh $(ProjectVersion)
-ifeq "$(Windows_Host)" "YES"
-	mv bindisttest/a/b/c/$(BIN_DIST_NAME) $(BIN_DIST_INST_DIR)
-else
-	cd bindisttest/a/b/c/$(BIN_DIST_NAME) && ./configure --prefix=$(TOP)/$(BIN_DIST_INST_DIR) CC="$(CC)"
-	cd bindisttest/a/b/c/$(BIN_DIST_NAME) && $(MAKE) install
-endif
-ifeq "$(GhcProfiled)" "NO"
-	$(BIN_DIST_INST_DIR)/bin/runghc bindisttest/HelloWorld > bindisttest/output
-	$(CONTEXT_DIFF) bindisttest/output bindisttest/expected_output
-endif
-	$(BIN_DIST_INST_DIR)/bin/ghc --make bindisttest/HelloWorld
-	bindisttest/HelloWorld > bindisttest/output
-	$(CONTEXT_DIFF) bindisttest/output bindisttest/expected_output
-# Without --no-user-package-db we might pick up random packages from ~/.ghc
-	$(BIN_DIST_INST_DIR)/bin/ghc-pkg check --no-user-package-db
-
-$(eval $(call clean-target,bindisttest,all,$(BIN_DIST_INST_DIR) $(wildcard bindisttest/a/b/c/*) bindisttest/HelloWorld bindisttest/HelloWorld.o bindisttest/HelloWorld.hi bindisttest/output))
-
--- a/boot
+++ b/boot
@@ -4,19 +4,11 @@ import glob
 import os
 import os.path
 import sys
-import argparse
 from textwrap import dedent
 import subprocess
 import re
 import shutil

-cwd = os.getcwd()
-
-parser = argparse.ArgumentParser()
-parser.add_argument('--validate', action='store_true', help='Run in validate mode')
-parser.add_argument('--hadrian', action='store_true', help='Do not assume the make base build system')
-args = parser.parse_args()
-
 # Packages whose libraries aren't in the submodule root
 EXCEPTIONS = {
    'libraries/containers/': 'libraries/containers/containers/'
@@ -56,70 +48,6 @@ def check_boot_packages():
                    Maybe you haven't run 'git submodule update --init'?
                    """ % license_path)

-# Create libraries/*/{ghc.mk,GNUmakefile}
-def boot_pkgs():
-    library_dirs = []
-
-    for package in glob.glob("libraries/*/"):
-        packages_file = os.path.join(package, 'ghc-packages')
-        print(package)
-        if os.path.isfile(packages_file):
-            for subpkg in open(packages_file, 'r'):
-                library_dirs.append(os.path.join(package, subpkg.strip()))
-        elif package in EXCEPTIONS:
-            library_dirs.append(EXCEPTIONS[package])
-        else:
-            library_dirs.append(package)
-
-    for package in library_dirs:
-        if package[-1] == '/':
-            # drop trailing '/'
-            package = package[:-1]
-
-        dir_ = os.path.relpath(package, 'libraries')
-        cabals = glob.glob(os.path.join(package, '*.cabal.in'))
-        if len(cabals) == 0:
-            cabals = glob.glob(os.path.join(package, '*.cabal'))
-
-        if len(cabals) > 1:
-            die('Too many .cabal files in %s' % package)
-        elif len(cabals) == 1:
-            cabal = cabals[0]
-
-            if os.path.isfile(cabal):
-                # strip both .cabal and .in
-                pkg = os.path.splitext(os.path.splitext(os.path.basename(cabal))[0])[0]
-                top = os.path.join(*['..'] * len(os.path.normpath(package).split(os.path.sep)))
-
-                ghc_mk = os.path.join(package, 'ghc.mk')
-                if os.path.exists(ghc_mk):
-                    print('Skipping %s which already exists' % ghc_mk)
-                    continue
-                print('Creating %s' % ghc_mk)
-                with open(ghc_mk, 'w') as f:
-                    f.write(dedent(
-                        """\
-                        {package}_PACKAGE = {pkg}
-                        {package}_dist-install_GROUP = libraries
-                        $(if $(filter {dir},$(PACKAGES_STAGE0)),$(eval $(call build-package,{package},dist-boot,0)))
-                        $(if $(filter {dir},$(PACKAGES_STAGE1)),$(eval $(call build-package,{package},dist-install,1)))
-                        $(if $(filter {dir},$(PACKAGES_STAGE2)),$(eval $(call build-package,{package},dist-install,2)))
-                        """.format(package = package,
-                                pkg = pkg,
-                                dir = dir_)))
-
-                makefile = os.path.join(package, 'GNUmakefile')
-                with open(makefile, 'w') as f:
-                    f.write(dedent(
-                        """\
-                        dir = {package}
-                        TOP = {top}
-                        include $(TOP)/mk/sub-makefile.mk
-                        FAST_MAKE_OPTS += stage=0
-                        """.format(package = package, top = top)
-                    ))
-
-
 def autoreconf():
    # Run autoreconf on everything that needs it.
    processes = {}
@@ -154,24 +82,5 @@ def autoreconf():
    if fail:
        sys.exit(1)

-def check_build_mk():
-    if not args.validate and not os.path.isfile("mk/build.mk"):
-        print(dedent(
-            """
-            WARNING: You don't have a mk/build.mk file.
-
-            By default a standard GHC build will be done, which uses optimisation
-            and builds the profiling libraries. This will take a long time, so may
-            not be what you want if you are developing GHC or the libraries, rather
-            than simply building it to use it.
-
-            For information on creating a mk/build.mk file, please see:
-                https://gitlab.haskell.org/ghc/ghc/wikis/building/using#build-configuration
-            """))
-
 check_boot_packages()
-if not args.hadrian:
-    boot_pkgs()
 autoreconf()
-if not args.hadrian:
-    check_build_mk()
--- a/compiler/CodeGen.Platform.h
+++ b/compiler/CodeGen.Platform.h
@@ -926,6 +926,14 @@ freeReg 29 = False
 -- ip0 -- used for spill offset computations
 freeReg 16 = False

+#if defined(darwin_HOST_OS) || defined(ios_HOST_OS)
+-- x18 is reserved by the platform on Darwin/iOS, and can not be used
+-- More about ARM64 ABI that Apple platforms support:
+-- https://developer.apple.com/documentation/xcode/writing-arm64-code-for-apple-platforms
+-- https://github.com/Siguza/ios-resources/blob/master/bits/arm64.md
+freeReg 18 = False
+#endif
+
 # if defined(REG_Base)
 freeReg REG_Base  = False
 # endif

--- a/compiler/GHC.hs
+++ b/compiler/GHC.hs
@@ -586,7 +586,7 @@ initGhcMonad mb_top_dir = setSession =<< liftIO (initHscEnv mb_top_dir)
 -- 'setSessionDynFlags' sets both @DynFlags@, and 'getSessionDynFlags'
 -- retrieves the program @DynFlags@ (for backwards compatibility).

-- This is a compatability function which sets dynflags for the top session
+-- This is a compatibility function which sets dynflags for the top session
 -- as well as the unit.
 setSessionDynFlags :: (HasCallStack, GhcMonad m) => DynFlags -> m ()
 setSessionDynFlags dflags0 = do
@@ -929,7 +929,8 @@ checkNewDynFlags logger dflags = do
  -- See Note [DynFlags consistency]
  let (dflags', warnings) = makeDynFlagsConsistent dflags
  let diag_opts = initDiagOpts dflags
-  liftIO $ handleFlagWarnings logger diag_opts (map (Warn WarningWithoutFlag) warnings)
+      print_config = initPrintConfig dflags
+  liftIO $ handleFlagWarnings logger print_config diag_opts (map (Warn WarningWithoutFlag) warnings)
  return dflags'

 checkNewInteractiveDynFlags :: MonadIO m => Logger -> DynFlags -> m DynFlags
@@ -939,7 +940,8 @@ checkNewInteractiveDynFlags logger dflags0 = do
  if xopt LangExt.StaticPointers dflags0
  then do
    let diag_opts = initDiagOpts dflags0
-    liftIO $ printOrThrowDiagnostics logger diag_opts $ singleMessage
+        print_config = initPrintConfig dflags0
+    liftIO $ printOrThrowDiagnostics logger print_config diag_opts $ singleMessage
      $ fmap GhcDriverMessage
      $ mkPlainMsgEnvelope diag_opts interactiveSrcSpan DriverStaticPointersNotSupported
    return $ xopt_unset dflags0 LangExt.StaticPointers

--- a/compiler/GHC/Builtin/Names.hs
+++ b/compiler/GHC/Builtin/Names.hs
@@ -50,7 +50,7 @@ occur. We have to be careful about this in exactly two places:
 This is accomplished through a combination of mechanisms:

  1. When parsing source code, the RdrName-decorated AST has some
-     RdrNames which are Exact. These are wired-in RdrNames where the
+     RdrNames which are Exact. These are wired-in RdrNames where
     we could directly tell from the parsed syntax what Name to
     use. For example, when we parse a [] in a type we can just insert
     an Exact RdrName Name with the listTyConKey.
@@ -427,7 +427,7 @@ basicKnownKeyNames
        rationalToDoubleName,

        -- Other classes
-        randomClassName, randomGenClassName, monadPlusClassName,
+        monadPlusClassName,

        -- Type-level naturals
        knownNatClassName, knownSymbolClassName, knownCharClassName,
@@ -538,7 +538,7 @@ gHC_PRIM, gHC_PRIM_PANIC, gHC_PRIM_EXCEPTION,
    gHC_GHCI, gHC_GHCI_HELPERS, gHC_CSTRING,
    gHC_SHOW, gHC_READ, gHC_NUM, gHC_MAYBE,
    gHC_NUM_INTEGER, gHC_NUM_NATURAL, gHC_NUM_BIGNAT,
-    gHC_LIST, gHC_TUPLE, dATA_EITHER, dATA_VOID, dATA_LIST, dATA_STRING,
+    gHC_LIST, gHC_TUPLE, gHC_TUPLE_PRIM, dATA_EITHER, dATA_VOID, dATA_LIST, dATA_STRING,
    dATA_FOLDABLE, dATA_TRAVERSABLE,
    gHC_CONC, gHC_IO, gHC_IO_Exception,
    gHC_ST, gHC_IX, gHC_STABLE, gHC_PTR, gHC_ERR, gHC_REAL,
@@ -573,6 +573,7 @@ gHC_NUM_NATURAL = mkBignumModule (fsLit "GHC.Num.Natural")
 gHC_NUM_BIGNAT  = mkBignumModule (fsLit "GHC.Num.BigNat")
 gHC_LIST        = mkBaseModule (fsLit "GHC.List")
 gHC_TUPLE       = mkPrimModule (fsLit "GHC.Tuple")
+gHC_TUPLE_PRIM  = mkPrimModule (fsLit "GHC.Tuple.Prim")
 dATA_EITHER     = mkBaseModule (fsLit "Data.Either")
 dATA_VOID       = mkBaseModule (fsLit "Data.Void")
 dATA_LIST       = mkBaseModule (fsLit "Data.List")
@@ -1575,11 +1576,8 @@ toAnnotationWrapperName :: Name
 toAnnotationWrapperName = varQual gHC_DESUGAR (fsLit "toAnnotationWrapper") toAnnotationWrapperIdKey

 -- Other classes, needed for type defaulting
-monadPlusClassName, randomClassName, randomGenClassName,
-    isStringClassName :: Name
+monadPlusClassName, isStringClassName :: Name
 monadPlusClassName  = clsQual mONAD (fsLit "MonadPlus")      monadPlusClassKey
-randomClassName     = clsQual rANDOM (fsLit "Random")        randomClassKey
-randomGenClassName  = clsQual rANDOM (fsLit "RandomGen")     randomGenClassKey
 isStringClassName   = clsQual dATA_STRING (fsLit "IsString") isStringClassKey

 -- Type-level naturals
@@ -1849,7 +1847,8 @@ statePrimTyConKey, stableNamePrimTyConKey, stableNameTyConKey,
    typeConKey, threadIdPrimTyConKey, bcoPrimTyConKey, ptrTyConKey,
    funPtrTyConKey, tVarPrimTyConKey, eqPrimTyConKey,
    eqReprPrimTyConKey, eqPhantPrimTyConKey,
-    compactPrimTyConKey, stackSnapshotPrimTyConKey :: Unique
+    compactPrimTyConKey, stackSnapshotPrimTyConKey,
+    promptTagPrimTyConKey :: Unique
 statePrimTyConKey                       = mkPreludeTyConUnique 50
 stableNamePrimTyConKey                  = mkPreludeTyConUnique 51
 stableNameTyConKey                      = mkPreludeTyConUnique 52
@@ -1878,6 +1877,7 @@ funPtrTyConKey                          = mkPreludeTyConUnique 78
 tVarPrimTyConKey                        = mkPreludeTyConUnique 79
 compactPrimTyConKey                     = mkPreludeTyConUnique 80
 stackSnapshotPrimTyConKey               = mkPreludeTyConUnique 81
+promptTagPrimTyConKey                   = mkPreludeTyConUnique 82

 eitherTyConKey :: Unique
 eitherTyConKey                          = mkPreludeTyConUnique 84

--- a/compiler/GHC/Builtin/PrimOps.hs
+++ b/compiler/GHC/Builtin/PrimOps.hs
@@ -658,7 +658,7 @@ to link primops; it rather does a rather hacky symbol lookup (see
 GHC.ByteCode.Linker.primopToCLabel). TODO: Perhaps this should be changed?

 Note that these wrappers aren't *quite* as expressive as their unwrapped
-breathren, in that they may exhibit less representation polymorphism.
+brethren, in that they may exhibit less representation polymorphism.
 For instance, consider the case of mkWeakNoFinalizer#, which has type:

    mkWeakNoFinalizer# :: forall (r :: RuntimeRep) (k :: TYPE r) (v :: Type).

--- a/compiler/GHC/Builtin/Types.hs
+++ b/compiler/GHC/Builtin/Types.hs
@@ -282,7 +282,7 @@ wiredInTyCons = [ -- Units are not treated like other tuples, because they
                  unitTyCon
                , unboxedUnitTyCon

-                -- Solo (i.e., the bosed 1-tuple) is also not treated
+                -- Solo (i.e., the boxed 1-tuple) is also not treated
                -- like other tuples (i.e. we /do/ include it here),
                -- since it does not use special syntax like other tuples
                -- See Note [One-tuples] (Wrinkle: Make boxed one-tuple names
@@ -809,7 +809,7 @@ bit odd:
 Zero-tuples have used up the logical name. So we use 'Solo' and 'Solo#'
 for one-tuples.  So in ghc-prim:GHC.Tuple we see the declarations:
  data ()     = ()
-  data Solo a = Solo a
+  data Solo a = MkSolo a
  data (a,b)  = (a,b)

 There is no way to write a boxed one-tuple in Haskell using tuple syntax.
@@ -832,7 +832,7 @@ Note [Don't flatten tuples from HsSyn] in GHC.Core.Make.
 -- Wrinkle: Make boxed one-tuple names have known keys
 -----

-We make boxed one-tuple names have known keys so that `data Solo a = Solo a`,
+We make boxed one-tuple names have known keys so that `data Solo a = MkSolo a`,
 defined in GHC.Tuple, will be used when one-tuples are spliced in through
 Template Haskell. This program (from #18097) crucially relies on this:

@@ -943,20 +943,21 @@ isPunOcc_maybe _ _ = Nothing

 mkTupleOcc :: NameSpace -> Boxity -> Arity -> OccName
 -- No need to cache these, the caching is done in mk_tuple
-mkTupleOcc ns Boxed   ar = mkOccName ns (mkBoxedTupleStr   ar)
+mkTupleOcc ns Boxed   ar = mkOccName ns (mkBoxedTupleStr ns ar)
 mkTupleOcc ns Unboxed ar = mkOccName ns (mkUnboxedTupleStr ar)

 mkCTupleOcc :: NameSpace -> Arity -> OccName
 mkCTupleOcc ns ar = mkOccName ns (mkConstraintTupleStr ar)

-mkTupleStr :: Boxity -> Arity -> String
+mkTupleStr :: Boxity -> NameSpace -> Arity -> String
 mkTupleStr Boxed   = mkBoxedTupleStr
-mkTupleStr Unboxed = mkUnboxedTupleStr
+mkTupleStr Unboxed = const mkUnboxedTupleStr

-mkBoxedTupleStr :: Arity -> String
-mkBoxedTupleStr 0  = "()"
-mkBoxedTupleStr 1  = "Solo"   -- See Note [One-tuples]
-mkBoxedTupleStr ar = '(' : commas ar ++ ")"
+mkBoxedTupleStr :: NameSpace -> Arity -> String
+mkBoxedTupleStr _ 0  = "()"
+mkBoxedTupleStr ns 1 | isDataConNameSpace ns = "MkSolo"  -- See Note [One-tuples]
+mkBoxedTupleStr _ 1 = "Solo"                             -- See Note [One-tuples]
+mkBoxedTupleStr _ ar = '(' : commas ar ++ ")"

 mkUnboxedTupleStr :: Arity -> String
 mkUnboxedTupleStr 0  = "(##)"
@@ -1117,7 +1118,7 @@ mk_tuple Boxed arity = (tycon, tuple_con)
    tuple_con  = pcDataCon dc_name dc_tvs dc_arg_tys tycon

    boxity  = Boxed
-    modu    = gHC_TUPLE
+    modu    = gHC_TUPLE_PRIM
    tc_name = mkWiredInName modu (mkTupleOcc tcName boxity arity) tc_uniq
                         (ATyCon tycon) BuiltInSyntax
    dc_name = mkWiredInName modu (mkTupleOcc dataName boxity arity) dc_uniq

--- a/compiler/GHC/Builtin/Types/Prim.hs
+++ b/compiler/GHC/Builtin/Types/Prim.hs
@@ -80,6 +80,7 @@ module GHC.Builtin.Types.Prim(
        weakPrimTyCon,                  mkWeakPrimTy,
        threadIdPrimTyCon,              threadIdPrimTy,
        stackSnapshotPrimTyCon,         stackSnapshotPrimTy,
+        promptTagPrimTyCon,             mkPromptTagPrimTy,

        int8PrimTyCon,          int8PrimTy, int8PrimTyConName,
        word8PrimTyCon,         word8PrimTy, word8PrimTyConName,
@@ -198,6 +199,7 @@ exposedPrimTyCons
    , word32PrimTyCon
    , word64PrimTyCon
    , stackSnapshotPrimTyCon
+    , promptTagPrimTyCon

    , tYPETyCon
    , funTyCon
@@ -231,7 +233,7 @@ charPrimTyConName, intPrimTyConName, int8PrimTyConName, int16PrimTyConName, int3
  stableNamePrimTyConName, compactPrimTyConName, bcoPrimTyConName,
  weakPrimTyConName, threadIdPrimTyConName,
  eqPrimTyConName, eqReprPrimTyConName, eqPhantPrimTyConName,
-  stackSnapshotPrimTyConName :: Name
+  stackSnapshotPrimTyConName, promptTagPrimTyConName :: Name
 charPrimTyConName             = mkPrimTc (fsLit "Char#") charPrimTyConKey charPrimTyCon
 intPrimTyConName              = mkPrimTc (fsLit "Int#") intPrimTyConKey  intPrimTyCon
 int8PrimTyConName             = mkPrimTc (fsLit "Int8#") int8PrimTyConKey int8PrimTyCon
@@ -269,6 +271,7 @@ stackSnapshotPrimTyConName    = mkPrimTc (fsLit "StackSnapshot#") stackSnapshotP
 bcoPrimTyConName              = mkPrimTc (fsLit "BCO") bcoPrimTyConKey bcoPrimTyCon
 weakPrimTyConName             = mkPrimTc (fsLit "Weak#") weakPrimTyConKey weakPrimTyCon
 threadIdPrimTyConName         = mkPrimTc (fsLit "ThreadId#") threadIdPrimTyConKey threadIdPrimTyCon
+promptTagPrimTyConName        = mkPrimTc (fsLit "PromptTag#") promptTagPrimTyConKey promptTagPrimTyCon

 {-
 ************************************************************************
@@ -1168,6 +1171,20 @@ threadIdPrimTy    = mkTyConTy threadIdPrimTyCon
 threadIdPrimTyCon :: TyCon
 threadIdPrimTyCon = pcPrimTyCon0 threadIdPrimTyConName unliftedRepTy

+{-
+************************************************************************
+*                                                                      *
+   The ``prompt tag'' type
+*                                                                      *
+************************************************************************
+-}
+
+promptTagPrimTyCon :: TyCon
+promptTagPrimTyCon = pcPrimTyCon promptTagPrimTyConName [Representational] unliftedRepTy
+
+mkPromptTagPrimTy :: Type -> Type
+mkPromptTagPrimTy v = TyConApp promptTagPrimTyCon [v]
+
 {-
 ************************************************************************
 *                                                                      *
No results found