Skip to content

Stable ghc 9.14 #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
wants to merge 42 commits into
base: ghc-9.14
Choose a base branch
from
Open

Stable ghc 9.14 #42

wants to merge 42 commits into from

Conversation

angerman
Copy link

No description provided.

hsyl20 and others added 4 commits August 28, 2025 22:16
@hsyl20
Add github workflow
fbb9c1a
feat: Implement cabal-based multi-stage build system
efbd4cf 
This commit introduces a comprehensive cabal-based build infrastructure
to support multi-target and cross-compilation scenarios for GHC. The new
build system provides a clean separation between different build stages
and better modularity for toolchain components.

Key changes:
- Add Makefile with stage1, stage2, and stage3 build targets
- Create separate cabal.project files for each build stage
- Update configure.ac for new build system requirements
- Adapt hie.yaml to support cabal-based builds
- Update GitHub CI workflow for new build process

Build stages explained:
- Stage 1: Bootstrap compiler built with system GHC
- Stage 2: Intermediate compiler built with Stage 1
- Stage 3: Final compiler built with Stage 2 (for validation)

This modular approach enables:
- Clean cross-compilation support
- Better dependency management
- Simplified build process for different targets
- Improved build reproducibility

Contributors:
- Andrea Bedini: Build system design and Makefile implementation
- Moritz Angermann: Cross-compilation infrastructure

The new build system maintains compatibility with existing workflows
while providing a more maintainable foundation for future enhancements.
feat: Modularize RTS and extract headers/filesystem utilities
563799e 
This commit restructures the Runtime System (RTS) components for better
modularity and reusability across different build configurations. The
changes enable cleaner separation of concerns and improved support for
cross-compilation scenarios.

Key changes:
- Extract RTS headers into standalone rts-headers package
  * Moved include/rts/Bytecodes.h to rts-headers
  * Moved include/rts/storage/ClosureTypes.h to rts-headers
  * Moved include/rts/storage/FunTypes.h to rts-headers
  * Moved include/stg/MachRegs/* to rts-headers
- Create rts-fs package for filesystem utilities
  * Extracted filesystem code from utils/fs
  * Provides reusable filesystem operations for RTS
- Rename utils/iserv to utils/ghc-iserv for consistency
  * Better naming alignment with other GHC utilities
  * Updated all references throughout the codebase
- Update RTS configuration and build files
  * Modified rts/configure.ac for new structure
  * Updated rts.cabal with new dependencies
  * Adjusted .gitignore for new artifacts

Rationale:
The modularization allows different stages of the compiler build to
share common RTS components without circular dependencies. This is
particularly important for:
- Cross-compilation where host and target RTS differ
- JavaScript backend which needs selective RTS components
- Stage1/Stage2 builds that require different RTS configurations

Contributors:
- Moritz Angermann: RTS modularization architecture and implementation
- Sylvain Henry: JavaScript backend RTS adjustments
- Andrea Bedini: Build system integration

This refactoring maintains full backward compatibility while providing
a cleaner foundation for multi-target support.
feat: Complete multi-target support and compiler enhancements
702b86f 
This commit completes the multi-target support infrastructure with
comprehensive changes across the compiler, build system, and runtime
components. These changes enable GHC to efficiently target multiple
platforms including native, JavaScript, and cross-compilation scenarios.

Core Compiler Changes:
- GHC.Driver.DynFlags: Multi-target configuration support
- GHC.Driver.Session: Enhanced session management for targets
- GHC.Driver.Make: Updated build orchestration for stages
- GHC.Driver.Downsweep: Improved module dependency handling
- GHC.ByteCode.Asm: Cross-platform bytecode assembly
- GHC.Iface.Load: Added Hooks parameter for interface loading
- GHC.Unit.State: Multi-target package database handling

LLVM Integration:
- GHC.CmmToLlvm.*: Refactored LLVM backend configuration
- Removed Version/Bounds.hs.in template
- Dynamic LLVM version detection
- Improved LLVM toolchain integration

JavaScript Backend:
- GHC.Driver.Config.StgToJS: JavaScript code generation config
- Enhanced JavaScript runtime support
- Integration with multi-stage build system

Linker and Code Generation:
- GHC.Linker.Dynamic: Cross-platform dynamic linking
- GHC.Linker.Static: Static linking improvements
- GHC.Linker.ExtraObj: Object file handling
- GHC.Driver.CodeOutput: Multi-target code emission
- CodeGen.Platform.h: Platform-specific code generation

Build System:
- ghc-pkg: Added --target flag support
- deriveConstants: Cross-compilation aware
- genprimopcode: Target-specific primop generation
- Setup.hs files: Updated for new build infrastructure
- packages: Updated submodule references

Libraries:
- system-cxx-std-lib: New C++ standard library wrapper
- ghc-internal: Updated configuration
- ghc-boot: Build system adjustments
- ghc-prim: Cross-compilation support

Testing Infrastructure:
- Updated test driver for multi-target scenarios
- Fixed platform-specific tests
- Adjusted test expectations for new architecture
- Added T10279h.hs test helper

External Dependencies:
- Removed libffi-tarballs (using system packages)
- Updated Cabal submodule
- Updated hsc2hs for cross-compilation

Utilities:
- unlit: Cross-platform compatibility
- ghc-toolchain: Target detection improvements
- config.guess/config.sub: GNU config files for RTS
- Added .envrc for development environment
- Added configure script for build configuration

Contributors:
- Moritz Angermann: Multi-target architecture and cross-compilation
- Sylvain Henry: JavaScript backend integration
- Andrea Bedini: Build system improvements
- Julian Ospald: Testing infrastructure and utilities

This completes the foundational work for GHC's multi-target support,
enabling efficient compilation for diverse platforms while maintaining
backward compatibility and build reproducibility.
Stable Haskell Team and others added 5 commits August 30, 2025 13:20
Fix bootstrap compiler detection and build tool issues
4953f35 
Boot: introduce ghc-boot-th-next for stage1 Template Haskell bootstrapping

Motivation:
Rebasing onto the 9.14 release branch exposed ordering / dependency
issues around Note [Bootstrapping Template Haskell] (see
GHC.Tc.Gen.Splice). We need a stage1 view of the TH AST (via
ghc-internal sources) without dragging the final ghc-boot-th package
shape (and its transitive deps) prematurely into the bootstrap set.

Overview:
We add a synthetic package ghc-boot-th-next, a copy of ghc-boot-th
(with name & self-references rewritten) used only in stage1 builds
(+bootstrap flag). This lets us:
  * Vendor the TH AST for stage1 while keeping template-haskell’s
    dependency surface minimal.
  * Decouple the evolving in-tree TH representation from the shipped
    ghc-boot-th library used in stage2.
  * Avoid allow-newer hacks previously targeting ghc-boot-th.

Key changes:
  * Makefile: add synth-ghc-boot-th-next target; _build/booted depends on
    its .synth-stamp; clean/distclean purge generated artifacts.
  * configure.ac: register new cabal file for substitution.
  * cabal.project.stage1: switch ghc-boot-th → ghc-boot-th-next, add
    bootstrap flags for ghc / ghci / ghc-boot; drop obsolete allow-newer
    override; prune time from stage1 set (stage1 doesn’t need it here).
  * ghc-boot-th.cabal.in: correct hs-source-dirs under bootstrap to use
    ../ghc-boot-th (instead of @sourceroot@), matching the synthesized
    variant layout.
  * compiler/Setup.hs: tolerate missing ghc-internal (fallback
    "<unavailable>") and comment on cStage hack.
  * GHC.Iface.Load: fix getGhcPrimIface usage to pass hsc_hooks
    (API / rebase alignment). (Would have been a fixup if not already
    included in this rebased commit.)

Rationale:
The “next” indirection is a temporary staging device: once the
bootstrap path stabilizes (and/or ghc-internal layering is settled)
we can retire ghc-boot-th-next and fold the logic back, removing the
Makefile synthesis hack.

Future cleanup / follow-ups:
  * Eliminate synthesis step by sharing a parametrised .cabal.in or
    by folding back when layering is finalized.
  * Revisit removal of time if any downstream stage1 tool regresses.
  * Replace cStage hard-code once multi-stage config flow is unified.

Test Plan:
  * make (or make stage1) builds stage1 compiler using ghc-boot-th-next.
  * Verify template-haskell <= 2.22 constraint still satisfied.
  * Build proceeds without manual allow-newer overrides.
  * Ensure synthesized directory contents remain untracked (.gitignore).

Ref: Note [Bootstrapping Template Haskell]

Signed-off-by: Stable Haskell Team <[email protected]>
Fixup basic build issues; still produes crashing ghc-pkg :-/
a132932
Reset configure.ac to the simple stable-haskell one.
98cf43d
Incorporate Julians changes and re-run autoreconf.
9c34b80 
This incporates the changes from:

git diff ff1f2c0...cf217cd
Fixup github CI for the sythesized package requirement.
fe9c59f
angerman
angerman commented Aug 30, 2025
View reviewed changes
utils/ghc-toolchain/src/GHC/Toolchain/Target.hs
Comment on lines -75 to +76
-- Darwin-specific tools
, tgtOtool :: Maybe Program
-- Mac specific
, tgtOtool:: Maybe Program
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess we can bin this change. Seems like it adds nothing useful here.

angerman
angerman commented Aug 30, 2025
View reviewed changes
utils/ghc-pkg/Main.hs Outdated
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should really try to get this upstreamed. I hope this is fairly uncontroversial.

angerman
angerman commented Aug 30, 2025
View reviewed changes
utils/ghc-iserv/ghc-iserv.cabal Outdated
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we shouldn't commit these if they have .in files.

angerman
angerman commented Aug 30, 2025
View reviewed changes
utils/genprimopcode/Main.hs Outdated
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I hope getting these changes upstreamed is also fairly uncontroversial.

angerman
angerman commented Aug 30, 2025
View reviewed changes
utils/deriveConstants/Main.hs
@@ -841,6 +841,7 @@ getWanted verbose os tmpdir gccProgram gccFlags nmProgram mobjdumpProgram
= case words line of
('_' : n) : "C" : s : _ -> mkP n s
n : "C" : s : _ -> mkP n s
n : "B" : _ : s : _ -> mkP n s
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤔 What was this about?

angerman
angerman commented Aug 30, 2025
View reviewed changes
utils/genprimopcode/genprimopcode.cabal
Comment on lines +34 to +35
default-extensions:
UnboxedSums
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we still need this?

angerman
angerman commented Aug 30, 2025
View reviewed changes
rts/rts.cabal Outdated
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Keeping this file in sync is going to be super painful. Maybe we should note down in the file itself what upstream commit it was based on, so that it's easier to update it as upstream evolves?

angerman
angerman commented Aug 30, 2025
View reviewed changes
libraries/ghc-boot-th/ghc-boot-th.cabal.in
@@ -56,7 +56,7 @@ Library
cpp-options: -DBOOTSTRAP_TH
build-depends:
ghc-prim
hs-source-dirs: @SourceRoot@ ../ghc-internal/src
hs-source-dirs: ../ghc-boot-th ../ghc-internal/src
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is really stupid. For ghc-boot-th this works, because well ../ghc-boot-th is the same. For the synthezied -next package, this works, because we look at the ../ghc-boot-th for the modules.

This TH story is such a PITA.

angerman
angerman commented Aug 30, 2025
View reviewed changes
ghc/Main.hs Outdated
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should try to get these changes upstreamed asap.

angerman
angerman commented Aug 30, 2025
View reviewed changes
compiler/Setup.hs Outdated
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤯 this just feels like layering hacks upon hacks 😞

@angerman angerman mentioned this pull request Aug 31, 2025
Closed
@angerman angerman mentioned this pull request Aug 31, 2025
Closed
GHC GitLab CI and others added 24 commits August 31, 2025 21:01
Fix broken exec_signals_child.c
99c0255 
There is no signal 0. The signal mask is 1-32.
Enable ghci library.
cd3acfe 
libHSghc is ~180mb on darwin. This in itself is questionable, but pre-linking it for ghci (and thus also the intneral linker), might help us get around CI test failure.
testsuite: partially revert f68a6b3: drop ELF .note.GNU-stack on Darw…
fabc41b 
…in in T16180
testsuite: clarify Windows/Darwin locale rationale for skipping T6037…
cd9ae5e 
… T2507 T8959a
testsuite: default SKIP_METRICS=1 (suppress perf metrics unless overr…
4ac489b 
…idden)
testsuite: Fix T10920
98e9793
testsuite: run with --verbose=0 by default to suppress fragile pass n…
b31bae5 
…oise
Makefile: align testsuite invocation with Hadrian flags and tool envs…
9b6656d 
…; unify var syntax and avoid subshell pwd
testsuite: Use SKIP_PERF_TESTS
9648178 
This partially reverts commit 4ac489b.
Skip broken tests on macOS (due to leading underscore not handled pro…
549c56e 
…perly in the expected output.)
@hasufell
Improve
7207e8f
@hasufell
Lala
7d0591e
Revert "fixup! Incorporate Julians changes and re-run autoreconf."
d260516 
This reverts commit bccf35b.
@hasufell
Lol
46b78a6
@hasufell
lol
4e51566
@hasufell
Yo
06b3786
@hasufell
LOL
797b291
@hasufell
blah
da31635
@hasufell
lmao
043cdf8
@hasufell
-.-
da31c6a
@hasufell
Rausdeichseln
a1080a8
@hasufell
Lol
b3c5a8a
@hasufell
Dear lord
eb40feb
@hasufell
build threaded
6da04e2
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@angerman @hsyl20 @hasufell