GitLab

Sven Tennie pushed to branch wip/supersven/ghc-9.12.2-release+jumptable-fix at Glasgow Haskell Compiler / GHC

Commits:

5a7cc5ff

by Ben Gamari at 2025-06-19T12:33:17+00: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.

1 changed file:

compiler/cbits/genSym.c

Changes:

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)