Skip to content

wip/andrea/local store#135

Closed
andreabedini wants to merge 85 commits intostable-ghc-9.14from
wip/andrea/local-store
Closed

wip/andrea/local store#135
andreabedini wants to merge 85 commits intostable-ghc-9.14from
wip/andrea/local-store

Conversation

@andreabedini
Copy link
Member

  • fix up for ghc-boot-th-next
  • refactor(Makefile): simplify build system using Cabal local store [WIP]
  • build(stage2): add haddock support and conditionalize terminfo
  • submodule(libraries/Cabal): update

angerman and others added 30 commits November 20, 2025 12:10
This change reverts part of !14544, which forces the bootstrap
compiler to have ghc-internal.  As such it breaks booting with
ghc 9.8.4. A better solution would be to make this conditional
on the ghc version in the cabal file!
…ernal

If the boot compiler doesn't have ghc-internal use "<unavailble>" as the
`cGhcInternalUnitId`.  This allows booting with older compilers. The
subsequent stage2 compilers will have the proper ghc-internal id from
their stage1 compiler, that boots them.
mermaid is a common diagram format that can be inlined in markdown
files, and e.g. github will even render it.  This change adds
support for mermaid diagram output to ghc-pkg.
This adds support to ghc-pkg to infer a package-db from a target name.
Make the first simple optimization pass after desugaring a real CoreToDo
pass. This allows CorePlugins to decide whether they want to be executed
before or after this pass.
It's more user-friendly to directly print the right thing instead of
requiring the user to retry with the additional `-dppr-debug` flag.
The referenced issue 20706 also doesn't list T13786 as a broken test.
By mistake we tried to use deriveConstant without passing
`--gcc-flag -fcommon` (which Hadrian does) and it failed.

This patch adds deriveConstant support for constants stored in the .bss
section so that deriveConstant works without passing `-fcommon` to the C
compiler.
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.
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.
While we do want to drop this, for now, to keep the diff to upstream
small, we will just disable it with [10,100] range, which should
include all relevent LLVM versions in the foresable future.
Update Cabal submodule and refactor Makefile to use Cabal's project
local store instead of inplace builds. This simplifies the build system
by removing cross-compilation support and streamlining the build process.

Key changes:
- Update libraries/Cabal to a6f510ac7 (remove inplace builds)
- Simplify build directory structure (_build/stage*/dist)
- Remove cross-compilation variables for musl, wasm32, javascript
- Streamline CABAL_BUILD_ARGS with fewer customization options
- Remove complex header copying machinery
- Use absolute cabal path from which command
- Add Windows executable extension handling

TODO: Reinstate stage3 and cross-compilation targets (musl, wasm32, javascript)
Add haddock packages (haddock, haddock-api, haddock-library) to stage2
build configuration. Make terminfo library conditional on non-Windows
platforms since it's Unix-specific.
@andreabedini andreabedini marked this pull request as draft January 13, 2026 06:13
@andreabedini
Copy link
Member Author

andreabedini commented Jan 13, 2026

@hasufell The commit 322b686 messes up all the stage3 and cross-compilation targets. Let's pair up to put them back.

I could not rebase after 18e5e95 since the changes to the Makefile were too big.

@andreabedini andreabedini changed the base branch from feat/minimal-stage1 to stable-ghc-9.14.2025.11.12 January 13, 2026 06:24
@andreabedini
Copy link
Member Author

GitHub PRs do not work well on this. The base of my patch is 7e125ca which we do not have a branch for. Maybe I should create one just for this PR?

@hasufell hasufell marked this pull request as ready for review January 13, 2026 06:57
@hasufell hasufell changed the base branch from stable-ghc-9.14.2025.11.12 to stable-ghc-9.14 January 13, 2026 06:58
libraries/Cabal: update
Cache GHC0 --info output to a file and use input redirection instead of pipes to avoid zombie processes. The piped approach could leave orphaned GHC processes when the reading process finished before the writing process was properly cleaned up.

This also improves performance by running $(GHC0) --info once instead of 5 times.
@andreabedini andreabedini force-pushed the wip/andrea/local-store branch from d07d997 to 958def2 Compare January 21, 2026 07:01
@andreabedini andreabedini force-pushed the wip/andrea/local-store branch from 958def2 to 0012ed8 Compare January 22, 2026 16:14
@angerman
Copy link

Superceeded by #140

@angerman angerman closed this Feb 18, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants