GitLab

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC

Commits:

a20542d2

by Cheng Shao at 2026-01-06T19:38:38-05:00

ghc-internal: remove unused GMP macros

This patch removes unused GMP related macros from `ghc-internal`. The
in-tree GMP version was hard coded and outdated, but it was not used
anywhere anyway.

4079dcd6

by Cheng Shao at 2026-01-06T19:38:38-05:00

hadrian: fix in-tree gmp configure error on newer c compilers

Building in-tree gmp on newer c compilers that default to c23 fails at
configure stage, this patch fixes it, see added comment for
explanation.

3 changed files:

hadrian/src/Rules/Gmp.hs
libraries/ghc-internal/configure.ac
libraries/ghc-internal/include/HsIntegerGmp.h.in

Changes:

hadrian/src/Rules/Gmp.hs

@@ -126,6 +126,12 @@ gmpRules = do
                  interpretInContext ctx $
                  mconcat
                      [ getStagedCCFlags
 +                    -- gmp fails to configure with newer compilers
 +                    -- that default to c23:
 +                    -- https://gmplib.org/list-archives/gmp-devel/2025-January/006279.html.
 +                    -- for now just manually specify -std=gnu11 until
 +                    -- next upstream release.
 +                    , arg "-std=gnu11"
                      -- gmp symbols are only used by bignum logic in
                      -- ghc-internal and shouldn't be exported by the
                      -- ghc-internal shared library.

libraries/ghc-internal/configure.ac

@@ -195,28 +195,10 @@ dnl--------------------------------------------------------------------
     if test "$HaveFrameworkGMP" = "YES" || test "$HaveLibGmp" = "YES"
     then
         AC_MSG_RESULT([no])
 -       UseIntreeGmp=0
         AC_CHECK_HEADER([gmp.h], , [AC_MSG_ERROR([Cannot find gmp.h])])
+-
 -       AC_MSG_CHECKING([GMP version])
 -       AC_COMPUTE_INT(GhcGmpVerMj, __GNU_MP_VERSION, [#include <gmp.h>],
 -           AC_MSG_ERROR([Unable to get value of __GNU_MP_VERSION]))
 -       AC_COMPUTE_INT(GhcGmpVerMi, __GNU_MP_VERSION_MINOR, [#include <gmp.h>],
 -           AC_MSG_ERROR([Unable to get value of __GNU_MP_VERSION_MINOR]))
 -       AC_COMPUTE_INT(GhcGmpVerPl, __GNU_MP_VERSION_PATCHLEVEL, [#include <gmp.h>],
 -           AC_MSG_ERROR([Unable to get value of __GNU_MP_VERSION_PATCHLEVEL]))
 -       AC_MSG_RESULT([$GhcGmpVerMj.$GhcGmpVerMi.$GhcGmpVerPl])
+-
     else
         AC_MSG_RESULT([yes])
 -       UseIntreeGmp=1
         HaveSecurePowm=1
+-
 -       AC_MSG_CHECKING([GMP version])
 -       GhcGmpVerMj=6
 -       GhcGmpVerMi=1
 -       GhcGmpVerPl=2
 -       AC_MSG_RESULT([$GhcGmpVerMj.$GhcGmpVerMi.$GhcGmpVerPl])
     fi
     GMP_INSTALL_INCLUDES="HsIntegerGmp.h ghc-gmp.h"
@@ -231,10 +213,6 @@ AC_SUBST(GMP_INSTALL_INCLUDES)
  AC_SUBST(HaveLibGmp)
  AC_SUBST(HaveFrameworkGMP)
  AC_SUBST(HaveSecurePowm)
 -AC_SUBST(UseIntreeGmp)
 -AC_SUBST(GhcGmpVerMj)
 -AC_SUBST(GhcGmpVerMi)
 -AC_SUBST(GhcGmpVerPl)
  # Compute offsets/sizes used by jsbits/base.js
  if test "$host" = "javascript-ghcjs"

libraries/ghc-internal/include/HsIntegerGmp.h.in

  #pragma once
 -/* Whether GMP is embedded into ghc-internal */
 -#define GHC_GMP_INTREE     @UseIntreeGmp@
+-
 -/* The following values denote the GMP version used during GHC build-time */
 -#define GHC_GMP_VERSION_MJ @GhcGmpVerMj@
 -#define GHC_GMP_VERSION_MI @GhcGmpVerMi@
 -#define GHC_GMP_VERSION_PL @GhcGmpVerPl@
 -#define GHC_GMP_VERSION \
 -    (@GhcGmpVerMj@ * 10000 + @GhcGmpVerMi@ * 100 + @GhcGmpVerPl@)
+-
  /* Whether GMP supports mpz_powm_sec */
  #define HAVE_SECURE_POWM @HaveSecurePowm@