[Git][ghc/ghc][ghc-9.8] 4 commits: compiler: Fix bootstrapping with 9.8.3

[Ben Gamari (@bgamari)]

Ben Gamari pushed to branch ghc-9.8 at Glasgow Haskell Compiler / GHC


Commits:
7a274a7f by Ben Gamari at 2024-11-25T14:20:29-05:00
compiler: Fix bootstrapping with 9.8.3

Bump the CPP in genSym to ensure that we don't look for
`ghc_unique_counter64` in any compilers earlier than 9.8.4.

Inconsistency noticed in #25519.

- - - - -
0768fe93 by Cheng Shao at 2024-11-26T13:25:31-05:00
testsuite: bump T22744 timeout to 5x

- - - - -
22559ece by Ben Gamari at 2024-11-27T10:09:54-05:00
testsuite: Skip T22744 due to #22524

This test has been routinely timing out on Darwin; this is being
investigated but for the time being we will disable it to move ahead
with the 9.8.4 release.

- - - - -
a3401159 by Mario Blažević at 2024-11-27T10:13:19-05:00
Bumped the upper bound of text to <2.2

(cherry picked from commit 471b267294bc5f17e4864ce9bb2f221c4d47eac8)

- - - - -


4 changed files:

- compiler/cbits/genSym.c
- linters/lint-commit-msg/lint-commit-msg.cabal
- linters/lint-submodule-refs/lint-submodule-refs.cabal
- testsuite/tests/perf/compiler/all.T


Changes:

=====================================
compiler/cbits/genSym.c
=====================================
@@ -9,7 +9,7 @@
 //
 // 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,7,0,0)
+#if !MIN_VERSION_GLASGOW_HASKELL(9,8,4,0)
 HsWord64 ghc_unique_counter64 = 0;
 #endif
 #if !MIN_VERSION_GLASGOW_HASKELL(9,3,0,0)


=====================================
linters/lint-commit-msg/lint-commit-msg.cabal
=====================================
@@ -26,4 +26,4 @@ executable lint-commit-msg
     base
        >= 4.14 && < 5,
     text
-       >= 1.2  && < 2.1
+       >= 1.2  && < 2.2


=====================================
linters/lint-submodule-refs/lint-submodule-refs.cabal
=====================================
@@ -15,7 +15,7 @@ executable lint-submodule-refs
     base
        >= 4.14 && < 5,
     text
-       >= 1.2  && < 2.1,
+       >= 1.2  && < 2.2,
     linters-common
 
   ghc-options:


=====================================
testsuite/tests/perf/compiler/all.T
=====================================
@@ -692,7 +692,7 @@ test('T22744',
        req_interp,
        pre_cmd('$MAKE -s --no-print-directory T22744'),
        extra_files(['genT22744']),
-       compile_timeout_multiplier(3)
+       skip, # due to #25524
      ],
      multimod_compile,
      ['T22744', '-v0'])



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/1b2f40f996640a528c2039ec51cacc5b8c305f89...a3401159f2846605abb517e71af463df47398e72

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/1b2f40f996640a528c2039ec51cacc5b8c305f89...a3401159f2846605abb517e71af463df47398e72
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20241129/ae4d7a02/attachment-0001.html>