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
-
171a3cdd
by Ben Gamari at 2025-03-18T16:40:00+00:00
-
e24ac496
by Ben Gamari at 2025-03-18T16:40:00+00:00
-
3b6d79b4
by Ben Gamari at 2025-04-15T10:51:21-04:00
-
0dabd3c1
by Ben Gamari at 2025-04-15T10:51:32-04:00
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:
| ... | ... | @@ -243,7 +243,8 @@ def mk_new_yaml(release_mode, version, date, pipeline_type, job_map): |
| 243 | 243 | , "unknown_versioning" : centos7 }
|
| 244 | 244 | , "Linux_Fedora" : { ">= 33": fedora33
|
| 245 | 245 | , "unknown_versioning": centos7 }
|
| 246 | - , "Linux_RedHat" : { "unknown_versioning": fedora33 }
|
|
| 246 | + , "Linux_RedHat" : { "< 9": rocky8
|
|
| 247 | + , "unknown_versioning": fedora33 }
|
|
| 247 | 248 | , "Linux_UnknownLinux" : { "unknown_versioning": rocky8 }
|
| 248 | 249 | , "Darwin" : { "unknown_versioning" : darwin_x86 }
|
| 249 | 250 | , "Windows" : { "unknown_versioning" : windows }
|
| ... | ... | @@ -9,7 +9,19 @@ |
| 9 | 9 | //
|
| 10 | 10 | // The CPP is thus about the RTS version GHC is linked against, and not the
|
| 11 | 11 | // version of the GHC being built.
|
| 12 | -#if !MIN_VERSION_GLASGOW_HASKELL(9,9,0,0)
|
|
| 12 | + |
|
| 13 | +#if MIN_VERSION_GLASGOW_HASKELL(9,9,0,0)
|
|
| 14 | +// Unique64 patch was present in 9.10 and later
|
|
| 15 | +#define HAVE_UNIQUE64 1
|
|
| 16 | +#elif !MIN_VERSION_GLASGOW_HASKELL(9,9,0,0) && MIN_VERSION_GLASGOW_HASKELL(9,8,4,0)
|
|
| 17 | +// Unique64 patch was backported to 9.8.4
|
|
| 18 | +#define HAVE_UNIQUE64 1
|
|
| 19 | +#elif !MIN_VERSION_GLASGOW_HASKELL(9,7,0,0) && MIN_VERSION_GLASGOW_HASKELL(9,6,7,0)
|
|
| 20 | +// Unique64 patch was backported to 9.6.7
|
|
| 21 | +#define HAVE_UNIQUE64 1
|
|
| 22 | +#endif
|
|
| 23 | + |
|
| 24 | +#if !defined(HAVE_UNIQUE64)
|
|
| 13 | 25 | HsWord64 ghc_unique_counter64 = 0;
|
| 14 | 26 | #endif
|
| 15 | 27 | #if !MIN_VERSION_GLASGOW_HASKELL(9,3,0,0)
|
| ... | ... | @@ -13,7 +13,7 @@ dnl |
| 13 | 13 | # see what flags are available. (Better yet, read the documentation!)
|
| 14 | 14 | #
|
| 15 | 15 | |
| 16 | -AC_INIT([The Glorious Glasgow Haskell Compilation System], [9.12.2], [glasgow-haskell-bugs@haskell.org], [ghc-AC_PACKAGE_VERSION])
|
|
| 16 | +AC_INIT([The Glorious Glasgow Haskell Compilation System], [9.12.3], [glasgow-haskell-bugs@haskell.org], [ghc-AC_PACKAGE_VERSION])
|
|
| 17 | 17 | # Version on master must be X.Y (not X.Y.Z) for ProjectVersionMunged variable
|
| 18 | 18 | # to be useful (cf #19058). However, the version must have three components
|
| 19 | 19 | # (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 |
| 22 | 22 | AC_CONFIG_MACRO_DIRS([m4])
|
| 23 | 23 | |
| 24 | 24 | # Set this to YES for a released version, otherwise NO
|
| 25 | -: ${RELEASE=YES}
|
|
| 25 | +: ${RELEASE=NO}
|
|
| 26 | 26 | |
| 27 | 27 | # The primary version (e.g. 7.5, 7.4.1) is set in the AC_INIT line
|
| 28 | 28 | # above. If this is not a released version, then we will append the
|
| ... | ... | @@ -4,7 +4,7 @@ packages: ./ |
| 4 | 4 | |
| 5 | 5 | -- This essentially freezes the build plan for hadrian
|
| 6 | 6 | -- It would be wise to keep this up to date with the state set in .gitlab/ci.sh.
|
| 7 | -index-state: 2024-10-30T22:56:00Z
|
|
| 7 | +index-state: 2025-03-18T00:00:00Z
|
|
| 8 | 8 | |
| 9 | 9 | -- unordered-containers-0.2.20-r1 requires template-haskell < 2.22
|
| 10 | 10 | -- ghc-9.10 has template-haskell-2.22.0.0
|
| ... | ... | @@ -191,4 +191,4 @@ executable hadrian |
| 191 | 191 | if flag(selftest)
|
| 192 | 192 | other-modules: Rules.Selftest
|
| 193 | 193 | cpp-options: -DHADRIAN_ENABLE_SELFTEST
|
| 194 | - build-depends: QuickCheck >= 2.6 && < 2.15 |
|
| 194 | + build-depends: QuickCheck >= 2.6 && < 2.16 |