Sven Tennie pushed to branch wip/romes/hadrian-cross-stage2-rebase_SVEN_FINAL at Glasgow Haskell Compiler / GHC

Commits:

• a539e303
  by Matthew Pickering at 2026-05-29T13:21:40+02:00

  hadrian: Build stage 2 cross compilers
  
  * Most of hadrian is abstracted over the stage in order to remove the
    assumption that the target of all stages is the same platform. This
    allows the RTS to be built for two different targets for example.
  * Abstracts the bindist creation logic to allow building either normal
    or cross bindists. Normal bindists use stage 1 libraries and a stage 2
    compiler. Cross bindists use stage 2 libararies and a stage 2
    compiler.
  * hadrian: Make binary-dist-dir the default build target. This allows us
    to have the logic in one place about which libraries/stages to build
    with cross compilers. Fixes #24192
  
  New hadrian target:
  
  * `binary-dist-dir-cross`: Build a cross compiler bindist (compiler =
    stage 1, libraries = stage 2)
  
  This commit also contains various changes to make stage2 compilers
  feasible.
  
  -------------------------
  Metric Decrease:
      ManyAlternatives
      MultiComponentModulesRecomp
      MultiLayerModulesRecomp
      T10421
      T12425
      T12707
      T13035
      T13379
      T15703
      T16577
      T18698a
      T18698b
      T18923
      T1969
      T21839c
      T3294
      T4801
      T5030
      T5321Fun
      T5642
      T783
      T9198
      T9872d
      T9961
      parsing001
      T5321FD
      T6048
      T12227
      T18140
      T18282
      T9233
      T5631
      T9630
  -------------------------
  
  Co-authored-by: Sven Tennie <sven.tennie@gmail.com>
  
  Fix rebase: settings-use-distro-mingw is now staged
  

• db70f834
  by Matthew Pickering at 2026-05-29T13:21:40+02:00

  ci: Test cross bindists
  
  We remove the special logic for testing in-tree cross
  compilers and instead test cross compiler bindists, like we do for all
  other platforms.
  

• 9799f794
  by Matthew Pickering at 2026-05-29T13:21:40+02:00

  ci: Introduce CROSS_STAGE variable
  
  In preparation for building and testing stage3 bindists we introduce the
  CROSS_STAGE variable which is used by a CI job to determine what kind of
  bindist the CI job should produce.
  
  At the moment we are only using CROSS_STAGE=2 but in the future we will
  have some jobs which set CROSS_STAGE=3 to produce native bindists for a
  target, but produced by a cross compiler, which can be tested on by
  another CI job on the native platform.
  
  CROSS_STAGE=2: Build a normal cross compiler bindist
  CROSS_STAGE=3: Build a stage 3 bindist, one which is a native compiler and library for the target
  

• 21b8c07a
  by Sven Tennie at 2026-05-29T13:21:40+02:00

  ghc: Distinguish between having an interpreter and having an internal one
  
  Otherwise, we fail with warnings when compiling tools. Actually, these
  are related but different things:
  
  - ghc can run an interpreter (either internal or external)
  - ghc is compiled with an internal interpreter
  

• 3f57e535
  by Matthew Pickering at 2026-05-29T13:21:40+02:00

  hadrian: Refactor system-cxx-std-lib rules0
  
  I noticed a few things wrong with the hadrian rules for `system-cxx-std-lib` rules.
  
  * For `text` there is an ad-hoc check to depend on `system-cxx-std-lib` outside of `configurePackage`.
  * The `system-cxx-std-lib` dependency is not read from cabal files.
  * Recache is not called on the packge database after the `.conf` file is generated, a more natural place for this rule is `registerRules`.
  
  Treating this uniformly like other packages is complicated by it not having any source code or a cabal file. However we can do a bit better by reporting the dependency firstly in `PackageData` and then needing the `.conf` file in the same place as every other package in `configurePackage`.
  
  Fixes #25303
  

• a3f4d490
  by Sven Tennie at 2026-05-29T13:21:40+02:00

  ci: Increase timeout for emulators
  
  Test runs with emulators naturally take longer than on native machines.
  
  Generate jobs.yml
  

• 51fb5b44
  by Matthew Pickering at 2026-05-29T13:21:40+02:00

  ci: Javascript don't set CROSS_EMULATOR
  
  There is no CROSS_EMULATOR needed to run javascript binaries, so we
  don't set the CROSS_EMULATOR to some dummy value.
  

• abf225a1
  by Sven Tennie at 2026-05-29T13:21:40+02:00

  Javascript skip T23697
  
  See #22355 about how HSC2HS and the Javascript target don't play well
  together.
  

• f50903fe
  by Sven Tennie at 2026-05-29T13:21:40+02:00

  Mark T24602 as fragile
  
  It was skipped before (due to CROSS_EMULATOR being set, which changed
  for JS), so we don't make things worse by marking it as fragile.
  

• f7ad5b50
  by Sven Tennie at 2026-05-29T13:21:40+02:00

  Windows needs NM_STAGE0 as well
  
  The stage0 always needs nm.
  

• 78a2b35c
  by Sven Tennie at 2026-05-29T13:21:40+02:00

  Add haddock to `NoEmulatorNeeded TimeoutIncrease`

• d032d81d
  by Sven Tennie at 2026-05-29T13:21:40+02:00

  Delete done TODO
  

• b743be44
  by Sven Tennie at 2026-05-29T13:24:34+02:00

  Delete done TODO
  

• ee341ea8
  by Sven Tennie at 2026-05-29T13:24:34+02:00

  Remove cross special case of performance flavour
  

• 3cc2bb69
  by Sven Tennie at 2026-05-29T13:24:34+02:00

  Delete obsolete iserv comment
  

• 5e0e25f8
  by Sven Tennie at 2026-05-29T13:24:34+02:00

  No more cross stage special cases
  

• 276d1ff6
  by Sven Tennie at 2026-05-29T13:24:35+02:00

  Fix commented out code
  

• 8e2ea904
  by Sven Tennie at 2026-05-29T13:24:35+02:00

  Remove trace log
  

• 86a51edf
  by Sven Tennie at 2026-05-29T13:24:35+02:00

  configure.ac: Remove unnecessay blank
  

• 545763df
  by Sven Tennie at 2026-05-29T13:24:35+02:00

  Drop Rules.Libffi
  

• 40637b2e
  by Sven Tennie at 2026-05-29T13:24:35+02:00

  Delete targetSupportsGhciObjects
  

• 850bece6
  by Sven Tennie at 2026-05-29T13:24:35+02:00

  Fixup
  

62 changed files:

• .gitlab/ci.sh
• .gitlab/generate-ci/gen_ci.hs
• .gitlab/jobs.yaml
• configure.ac
• distrib/configure.ac.in
• hadrian/README.md
• hadrian/bindist/config.mk.in
• + hadrian/cfg/system.config.host.in
• hadrian/cfg/system.config.in
• + hadrian/cfg/system.config.target.in
• hadrian/hadrian.cabal
• hadrian/src/Base.hs
• + hadrian/src/BindistConfig.hs
• hadrian/src/Builder.hs
• hadrian/src/Context.hs
• hadrian/src/Expression.hs
• hadrian/src/Flavour.hs
• hadrian/src/Flavour/Type.hs
• hadrian/src/Hadrian/Builder.hs
• hadrian/src/Hadrian/Haskell/Cabal/Parse.hs
• hadrian/src/Hadrian/Haskell/Cabal/Type.hs
• hadrian/src/Hadrian/Haskell/Hash.hs
• hadrian/src/Hadrian/Oracles/TextFile.hs
• hadrian/src/Oracles/Flag.hs
• hadrian/src/Oracles/Flavour.hs
• hadrian/src/Oracles/Setting.hs
• hadrian/src/Oracles/TestSettings.hs
• hadrian/src/Packages.hs
• hadrian/src/Rules.hs
• hadrian/src/Rules/BinaryDist.hs
• hadrian/src/Rules/CabalReinstall.hs
• hadrian/src/Rules/Changelog.hs
• hadrian/src/Rules/Compile.hs
• hadrian/src/Rules/Documentation.hs
• hadrian/src/Rules/Generate.hs
• hadrian/src/Rules/Gmp.hs
• hadrian/src/Rules/Library.hs
• hadrian/src/Rules/Program.hs
• hadrian/src/Rules/Register.hs
• hadrian/src/Rules/Rts.hs
• hadrian/src/Rules/Test.hs
• hadrian/src/Settings.hs
• hadrian/src/Settings/Builders/Cabal.hs
• hadrian/src/Settings/Builders/Common.hs
• hadrian/src/Settings/Builders/Configure.hs
• hadrian/src/Settings/Builders/DeriveConstants.hs
• hadrian/src/Settings/Builders/Ghc.hs
• hadrian/src/Settings/Builders/Hsc2Hs.hs
• hadrian/src/Settings/Builders/RunTest.hs
• hadrian/src/Settings/Builders/SplitSections.hs
• hadrian/src/Settings/Default.hs
• hadrian/src/Settings/Flavours/GhcInGhci.hs
• hadrian/src/Settings/Flavours/Performance.hs
• hadrian/src/Settings/Flavours/QuickCross.hs
• hadrian/src/Settings/Flavours/Validate.hs
• hadrian/src/Settings/Packages.hs
• hadrian/src/Settings/Program.hs
• hadrian/src/Settings/Warnings.hs
• libraries/base/tests/all.T
• m4/fp_find_nm.m4
• testsuite/ghc-config/ghc-config.hs
• testsuite/tests/javascript/closure/all.T

The diff was not included because it is too large.