Reorder commits: upstreamable first, fork-specific last - #171
Merged
Merged
Conversation
angerman
force-pushed
the
stable-ghc-9.14
branch
from
March 6, 2026 01:06
05e1a0c to
7968d7c
Compare
Author
|
Tracking issue for upstream work: #175 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Reorders all 92 commits on
stable-ghc-9.14(from base902339d332) so that upstreamable patches come first, followed by bridge commits, then fork-specific commits. This makes it easy to identify, extract, and submit patches upstream.Tree is identical to
origin/stable-ghc-9.14—git diffis empty. The AArch64 NCG commits were squashed from 3 → 1. Two commits became empty during reordering (their content was already incorporated by earlier commits in the new order) and were dropped, bringing the total from 96 → 92.Part A — Upstreamable (52 commits)
Patches that are either already upstream, pending upstream, or candidates for upstreaming to GHC HEAD.
A1. Compiler & Bootstrap Compatibility (6 commits)
749b7fbd46b16af54c687ba31367680d3ead96262ea64e70ca5295374c8eA2. Tooling Improvements (4 commits)
7103d3c8ea046f672e3fd527f4b7663c34ec9c8eA3. Platform & Config (3 commits)
60ff5de9bb5b701750ee261d120c09A4. Static Linking Feature (13 commits)
b28d5385eb95d01932f6d55306c76605e275c9edd7cad137519d18299086ca3303e3a7ae7cf2f3895f612650dfa0f9a79cc54a54d221a817ef33b955ff15b1dd38A5. Linker Refactoring (3 commits)
7ddcaa61f9b9bf745816bb8b9ff4e1A6. RTS Bug Fixes (7 commits)
e6028886f6d67d39f96a509e1d350c1d7b991c4547e5861d31cf2c0ddd258b8324a99eA7. AArch64 NCG (1 squashed commit, was 3)
b22503b15dSquashed from 3 commits: peephole optimizer + inline memcpy/memset fix + @pageoff relocation folding. Includes LDP/STP formation, TBZ/TBNZ, CSEL/CSINC/CSNEG, far branch handling, and pointer tag folding (~34KB binary size reduction).
A8. WASM Backend (6 commits)
343f0fdd0616d6af68ca6fa2b3853b6eb9d3e8d7982b7224e0bc31f0bfe4A9. Windows (1 commit)
8d5879c159A10. Test & Platform Fixes (8 commits)
47d9e1c1bc86a8634ccdb3ddb8ebd86dc6bad1bff2ba7e14669cd1578e41338c911d8904a1d2a12cPart B — Bridge / Maybe-Upstreamable (4 commits)
Commits that serve both upstream and fork needs, or whose upstreamability depends on context.
699c7b74e718cf7a5aaf8b176a47957f21d9367bPart C — Fork-Specific (36 commits)
Commits specific to the Stable Haskell build system, branding, CI, and infrastructure. Not intended for upstream.
C1. RTS Modularization & Split (5 commits)
adabe3fdb68b181b6e1535ce1ff4dca3aa7468422b07e66afeC2. Build System (5 commits)
791e0bdf25b2be57251a5ebcd7c3a74405a8ffd7b951f6c337C3. Build Miscellany (6 commits)
b18cf6de392d9ee6a155f676c44b766d2caa6b1da993682672fd0b99ebf0C4. Submodule Management & libffi (4 commits)
4d3eee79c941d22923ecebbb3a59621eb1d85c03C5. Dynamic Builds (3 commits)
bade0141e0af07a242f8842ff27c2dC6. Platform Support & Branding (5 commits)
4b92f9354c71ad1f2cfe9336e48cea225892f6bd5464d672bcC7. CI, Metrics & Fork-Specific Tests (8 commits)
cefd9f46244977f1122fa242842be115e3cdc6693f2f492be29b71ceff52a193fe382f7968d7c725Verification
Upstream Summary
5 commits already merged upstream:
~47 upstreamable commits remaining, including the AArch64 NCG improvements, WASM backend fixes, RTS bug fixes, and static linking follow-ups.