Ben Gamari pushed to branch wip/backports-9.12 at Glasgow Haskell Compiler / GHC Commits: 711ccfa1 by Ben Gamari at 2025-03-17T10:18:42-04:00 ghcup-metadata: Use Rocky 8 for RHEL < 9 - - - - - 171a3cdd by Ben Gamari at 2025-03-18T16:40:00+00:00 Bump index-state Allowing splitmix-0.1.1 which is necessary for bootstrapping with GHC 9.12. - - - - - e24ac496 by Ben Gamari at 2025-03-18T16:40:00+00:00 hadrian: Bump QuickCheck upper bound - - - - - 3b6d79b4 by Ben Gamari at 2025-04-15T10:51:21-04:00 configure: Set RELEASE=NO - - - - - 0dabd3c1 by Ben Gamari at 2025-04-15T10:51:32-04:00 compiler: Fix CPP guards around ghc_unique_counter64 The `ghc_unique_counter64` symbol was introduced in the RTS in the 64-bit unique refactor (!10568) which has been backported to %9.6.7 and %9.8.4. Update the CPP to reflect this. Fixes #25576. (cherry picked from commit 595013d41464c1e328369bb81ce0ea2814e91b68) - - - - - 5 changed files: - .gitlab/rel_eng/mk-ghcup-metadata/mk_ghcup_metadata.py - compiler/cbits/genSym.c - configure.ac - hadrian/cabal.project - hadrian/hadrian.cabal Changes: ===================================== .gitlab/rel_eng/mk-ghcup-metadata/mk_ghcup_metadata.py ===================================== @@ -243,7 +243,8 @@ def mk_new_yaml(release_mode, version, date, pipeline_type, job_map): , "unknown_versioning" : centos7 } , "Linux_Fedora" : { ">= 33": fedora33 , "unknown_versioning": centos7 } - , "Linux_RedHat" : { "unknown_versioning": fedora33 } + , "Linux_RedHat" : { "< 9": rocky8 + , "unknown_versioning": fedora33 } , "Linux_UnknownLinux" : { "unknown_versioning": rocky8 } , "Darwin" : { "unknown_versioning" : darwin_x86 } , "Windows" : { "unknown_versioning" : windows } ===================================== compiler/cbits/genSym.c ===================================== @@ -9,7 +9,19 @@ // // The CPP is thus about the RTS version GHC is linked against, and not the // version of the GHC being built. -#if !MIN_VERSION_GLASGOW_HASKELL(9,9,0,0) + +#if MIN_VERSION_GLASGOW_HASKELL(9,9,0,0) +// Unique64 patch was present in 9.10 and later +#define HAVE_UNIQUE64 1 +#elif !MIN_VERSION_GLASGOW_HASKELL(9,9,0,0) && MIN_VERSION_GLASGOW_HASKELL(9,8,4,0) +// Unique64 patch was backported to 9.8.4 +#define HAVE_UNIQUE64 1 +#elif !MIN_VERSION_GLASGOW_HASKELL(9,7,0,0) && MIN_VERSION_GLASGOW_HASKELL(9,6,7,0) +// Unique64 patch was backported to 9.6.7 +#define HAVE_UNIQUE64 1 +#endif + +#if !defined(HAVE_UNIQUE64) HsWord64 ghc_unique_counter64 = 0; #endif #if !MIN_VERSION_GLASGOW_HASKELL(9,3,0,0) ===================================== configure.ac ===================================== @@ -13,7 +13,7 @@ dnl # see what flags are available. (Better yet, read the documentation!) # -AC_INIT([The Glorious Glasgow Haskell Compilation System], [9.12.2], [glasgow-haskell-bugs@haskell.org], [ghc-AC_PACKAGE_VERSION]) +AC_INIT([The Glorious Glasgow Haskell Compilation System], [9.12.3], [glasgow-haskell-bugs@haskell.org], [ghc-AC_PACKAGE_VERSION]) # Version on master must be X.Y (not X.Y.Z) for ProjectVersionMunged variable # to be useful (cf #19058). However, the version must have three components # (X.Y.Z) on stable branches (e.g. ghc-9.2) to ensure that pre-releases are @@ -22,7 +22,7 @@ AC_INIT([The Glorious Glasgow Haskell Compilation System], [9.12.2], [glasgow-ha AC_CONFIG_MACRO_DIRS([m4]) # Set this to YES for a released version, otherwise NO -: ${RELEASE=YES} +: ${RELEASE=NO} # The primary version (e.g. 7.5, 7.4.1) is set in the AC_INIT line # above. If this is not a released version, then we will append the ===================================== hadrian/cabal.project ===================================== @@ -4,7 +4,7 @@ packages: ./ -- This essentially freezes the build plan for hadrian -- It would be wise to keep this up to date with the state set in .gitlab/ci.sh. -index-state: 2024-10-30T22:56:00Z +index-state: 2025-03-18T00:00:00Z -- unordered-containers-0.2.20-r1 requires template-haskell < 2.22 -- ghc-9.10 has template-haskell-2.22.0.0 ===================================== hadrian/hadrian.cabal ===================================== @@ -191,4 +191,4 @@ executable hadrian if flag(selftest) other-modules: Rules.Selftest cpp-options: -DHADRIAN_ENABLE_SELFTEST - build-depends: QuickCheck >= 2.6 && < 2.15 + build-depends: QuickCheck >= 2.6 && < 2.16 View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/383be28ffdddf65b57b7b111bfc8980... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/383be28ffdddf65b57b7b111bfc8980... You're receiving this email because of your account on gitlab.haskell.org.