- ghc-commits - Haskell.org

[Git][ghc/ghc][wip/mangoiv/ci-backports] Deleted 1 commit: ci: increased low speed time, removed post buffer increase
by Magnus (＠MangoIV) 07 May '26

07 May '26

Magnus pushed to branch wip/mangoiv/ci-backports at Glasgow Haskell Compiler / GHC WARNING: The push did not contain any new commits, but force pushed to delete the commits and changes below. Deleted commits: 3f4db087 by mangoiv at 2026-05-07T13:06:18+02:00 ci: increased low speed time, removed post buffer increase - - - - - 1 changed file: - .gitlab/test-metrics.sh Changes: ===================================== .gitlab/test-metrics.sh ===================================== @@ -22,7 +22,10 @@ function pull() { # to set a larger http.postBuffer, although this is definitely a workaround. # The default should work just fine. The error could be in git, GitLab, or # perhaps the networking tube (including all proxies etc) between the two. - run git -c http.postBuffer=2097152 fetch -f "$NOTES_ORIGIN" "$ref:$ref" + # 2026-05-07: git fetch started failing again on darwin. Increased the low speed + # time. Removed the postbuffer change since we shouldn't actually be PUSHing anything + export GIT_CURL_VERBOSE=1 + run git -c http.lowSpeedTime=600 fetch -f "$NOTES_ORIGIN" "$ref:$ref" echo "perf notes ref $ref is $(git rev-parse $ref)" } View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/3f4db087bfd12a145a997745c5022ab… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/3f4db087bfd12a145a997745c5022ab… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/spj-reinstallable-base3
by Simon Peyton Jones (＠simonpj) 07 May '26

07 May '26

Simon Peyton Jones pushed new branch wip/spj-reinstallable-base3 at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/spj-reinstallable-base3 You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/mangoiv/ci-backports] ci: increased low speed time, removed post buffer increase
by Magnus (＠MangoIV) 07 May '26

07 May '26

Magnus pushed to branch wip/mangoiv/ci-backports at Glasgow Haskell Compiler / GHC Commits: 3f4db087 by mangoiv at 2026-05-07T13:06:18+02:00 ci: increased low speed time, removed post buffer increase - - - - - 1 changed file: - .gitlab/test-metrics.sh Changes: ===================================== .gitlab/test-metrics.sh ===================================== @@ -22,7 +22,10 @@ function pull() { # to set a larger http.postBuffer, although this is definitely a workaround. # The default should work just fine. The error could be in git, GitLab, or # perhaps the networking tube (including all proxies etc) between the two. - run git -c http.postBuffer=2097152 fetch -f "$NOTES_ORIGIN" "$ref:$ref" + # 2026-05-07: git fetch started failing again on darwin. Increased the low speed + # time. Removed the postbuffer change since we shouldn't actually be PUSHing anything + export GIT_CURL_VERBOSE=1 + run git -c http.lowSpeedTime=600 fetch -f "$NOTES_ORIGIN" "$ref:$ref" echo "perf notes ref $ref is $(git rev-parse $ref)" } View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/3f4db087bfd12a145a997745c5022ab… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/3f4db087bfd12a145a997745c5022ab… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/mangoiv/ci-backports] ci: increased low speed time, removed post buffer increase
by Magnus (＠MangoIV) 07 May '26

07 May '26

Magnus pushed to branch wip/mangoiv/ci-backports at Glasgow Haskell Compiler / GHC Commits: f3e714d4 by mangoiv at 2026-05-07T11:26:31+02:00 ci: increased low speed time, removed post buffer increase - - - - - 1 changed file: - .gitlab/test-metrics.sh Changes: ===================================== .gitlab/test-metrics.sh ===================================== @@ -22,7 +22,9 @@ function pull() { # to set a larger http.postBuffer, although this is definitely a workaround. # The default should work just fine. The error could be in git, GitLab, or # perhaps the networking tube (including all proxies etc) between the two. - run git -c http.postBuffer=2097152 fetch -f "$NOTES_ORIGIN" "$ref:$ref" + # 2026-05-07: git fetch started failing again on darwin. Increased the low speed + # time. Removed the postbuffer change since we shouldn't actually be PUSHing anything + run GIT_CURL_VERBOSE=1 git -c http.lowSpeedTime=600 fetch -f "$NOTES_ORIGIN" "$ref:$ref" echo "perf notes ref $ref is $(git rev-parse $ref)" } View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/f3e714d4caf4536e8e82d45cd71ea26… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/f3e714d4caf4536e8e82d45cd71ea26… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/dcoutts/windows-rts-dll] 5 commits: Add minimal dlltool support into ./configure
by David Eichmann (＠DavidEichmann) 07 May '26

07 May '26

David Eichmann pushed to branch wip/dcoutts/windows-rts-dll at Glasgow Haskell Compiler / GHC Commits: 3eed75d2 by Duncan Coutts at 2026-05-06T17:58:12+01:00 Add minimal dlltool support into ./configure Find dlltool, and hopefully support finding it within the bundled llvm toolchain on windows. - - - - - 9a074a69 by Duncan Coutts at 2026-05-06T17:58:14+01:00 Update the default host and target files for dlltool support - - - - - 5fdb97fd by Duncan Coutts at 2026-05-06T17:58:14+01:00 Add dlltool as a hadrian builder Optional except on windows. - - - - - 6b7d555f by Duncan Coutts at 2026-05-06T17:58:14+01:00 Update and generate libHSghc-internal.def from .def.in file The only symbol that the rts imports from the ghc-internal package now is init_ghc_hs_iface. So the rts only needs an import lib that defines that one symbol. Also, remove the libHSghc-prim.def because it is redundant. The rts no longer imports anything from ghc-prim. Keep libHSffi.def for now. We may yet need it once it is clear how libffi is going to be built/used for ghc. - - - - - f195d87e by Duncan Coutts at 2026-05-06T17:58:14+01:00 Add rule to build libHSghc-internal.dll.a and link into the rts On windows only, with dynamic linking. This is needed because on windows, all symbols in dlls must be resolved. No dangling symbols allowed. References to external symbols must be explicit. We resolve this with an import library. We create an import library for ghc-internal, a .dll.a file. This is a static archive containing .o files that define the symbols we need, and crucially have ".idata" sections that specifies the symbols the dll imports and from where. Note that we do not install this libHSghc-internal.dll.a, and it does not need to list all the symbols exported by that package. We create a special purpose import lib and only use it when linking the rts dll, so it only has to list the symbols that the rts uses from ghc-internal (which is exactly one symbol: init_ghc_hs_iface). - - - - - 15 changed files: - configure.ac - distrib/configure.ac.in - hadrian/cfg/default.host.target.in - hadrian/cfg/default.target.in - hadrian/src/Builder.hs - hadrian/src/Rules/Generate.hs - hadrian/src/Rules/Library.hs - hadrian/src/Rules/Rts.hs - m4/find_llvm_prog.m4 - m4/fp_setup_windows_toolchain.m4 - m4/ghc_toolchain.m4 - m4/prep_target_file.m4 - rts/.gitignore - + rts/win32/libHSghc-internal.def.in - utils/ghc-toolchain/exe/Main.hs Changes: ===================================== configure.ac ===================================== @@ -314,13 +314,16 @@ else AC_CHECK_TOOL([RANLIB],[ranlib]) AC_CHECK_TOOL([OBJDUMP],[objdump]) AC_CHECK_TOOL([WindresCmd],[windres]) + AC_CHECK_TOOL([DlltoolCmd],[llvm-dlltool]) AC_CHECK_TOOL([Genlib],[genlib]) if test "$HostOS" = "mingw32"; then AC_CHECK_TARGET_TOOL([WindresCmd],[windres]) + AC_CHECK_TARGET_TOOL([DlltoolCmd],[llvm-dlltool]) AC_CHECK_TARGET_TOOL([OBJDUMP],[objdump]) WindresCmd="$(cygpath -m $WindresCmd)" + DlltoolCmd="$(cygpath -m $DlltoolCmd)" if test "$Genlib" != ""; then GenlibCmd="$(cygpath -m $Genlib)" @@ -568,6 +571,11 @@ FIND_LLVM_PROG([OPT], [opt], [$LlvmMinVersion], [$LlvmMaxVersion]) OptCmd="$OPT" AC_SUBST([OptCmd]) +dnl ** Which LLVM llvm-dlltool to use? +dnl -------------------------------------------------------------- +AC_ARG_VAR(DlltoolCmd,[Use as the path to LLVM's llvm-dlltool [default=autodetect]]) +FIND_LLVM_PROG([DlltoolCmd], [llvm-dlltool], [$LlvmMinVersion], [$LlvmMaxVersion]) + dnl ** look to see if we have a C compiler using an llvm back end. dnl FP_CC_LLVM_BACKEND @@ -1080,9 +1088,10 @@ echo "\ libdw : $UseLibdw Using LLVM tools - llc : $LlcCmd - opt : $OptCmd - llvm-as : $LlvmAsCmd" + llc : $LlcCmd + opt : $OptCmd + llvm-as : $LlvmAsCmd + llvm-dlltool : $DlltoolCmd" if test "$HSCOLOUR" = ""; then echo " ===================================== distrib/configure.ac.in ===================================== @@ -229,6 +229,13 @@ FIND_LLVM_PROG([LLVMAS], [clang], [$LlvmMinVersion], [$LlvmMaxVersion]) LlvmAsCmd="$LLVMAS" AC_SUBST([LlvmAsCmd]) +dnl ** Which LLVM llvm-dlltool to use? +dnl -------------------------------------------------------------- +AC_CHECK_TARGET_TOOL([DlltoolCmd],[llvm-dlltool]) +AC_ARG_VAR(DlltoolCmd,[Use as the path to LLVM's llvm-dlltool [default=autodetect]]) +FIND_LLVM_PROG([DlltoolCmd], [llvm-dlltool], [$LlvmMinVersion], [$LlvmMaxVersion]) +AC_SUBST([DlltoolCmd]) + dnl We know that `clang` supports `--target` and it is necessary to pass it dnl lest we see #25793. if test -z "$LlvmAsFlags" && ! test -z "$LlvmTarget"; then ===================================== hadrian/cfg/default.host.target.in ===================================== @@ -45,6 +45,7 @@ Target , tgtOpt = Nothing , tgtLlvmAs = Nothing , tgtWindres = Nothing +, tgtDlltool = Nothing , tgtOtool = Nothing , tgtInstallNameTool = Nothing } ===================================== hadrian/cfg/default.target.in ===================================== @@ -45,6 +45,7 @@ Target , tgtOpt = @OptCmdMaybeProg@ , tgtLlvmAs = @LlvmAsCmdMaybeProg@ , tgtWindres = @WindresCmdMaybeProg@ +, tgtDlltool = @DlltoolCmdMaybeProg@ , tgtOtool = @OtoolCmdMaybeProg@ , tgtInstallNameTool = @InstallNameToolCmdMaybeProg@ } ===================================== hadrian/src/Builder.hs ===================================== @@ -17,7 +17,7 @@ import Development.Shake.Classes import Development.Shake.Command import Development.Shake.FilePath import GHC.Generics -import GHC.Platform.ArchOS (ArchOS(..), Arch(..)) +import GHC.Platform.ArchOS (ArchOS(..), Arch(..), OS(..)) import qualified Hadrian.Builder as H import Hadrian.Builder hiding (Builder) import Hadrian.Builder.Ar @@ -180,6 +180,7 @@ data Builder = Alex | Objdump | Python | Ranlib + | Dlltool | Testsuite TestMode | Sphinx SphinxMode | Tar TarMode @@ -418,6 +419,7 @@ isOptional target = \case Alex -> True -- Most ar implemententions no longer need ranlib, but some still do Ranlib -> not $ Toolchain.arNeedsRanlib (tgtAr target) + Dlltool -> archOS_OS (tgtArchOs target) /= OSMinGW32 JsCpp -> not $ (archOS_arch . tgtArchOs) target == ArchJavaScript -- ArchWasm32 too? _ -> False @@ -442,6 +444,7 @@ systemBuilderPath builder = case builder of Objdump -> fromKey "objdump" Python -> fromKey "python" Ranlib -> fromTargetTC "ranlib" (maybeProg Toolchain.ranlibProgram . tgtRanlib) + Dlltool -> fromTargetTC "dlltool" (maybeProg id . tgtDlltool) Testsuite _ -> fromKey "python" Sphinx _ -> fromKey "sphinx-build" Tar _ -> fromKey "tar" ===================================== hadrian/src/Rules/Generate.hs ===================================== @@ -377,6 +377,7 @@ templateRules = do , interpolateSetting "ProjectPatchLevel1" ProjectPatchLevel1 , interpolateSetting "ProjectPatchLevel2" ProjectPatchLevel2 ] + templateRule "rts/win32/libHSghc-internal.def" projectVersion templateRule "docs/index.html" $ packageUnitIds Stage1 templateRule "docs/users_guide/ghc_config.py" $ mconcat [ projectVersion ===================================== hadrian/src/Rules/Library.hs ===================================== @@ -4,6 +4,8 @@ import Hadrian.BuildPath import Hadrian.Haskell.Cabal import Hadrian.Haskell.Cabal.Type import qualified Text.Parsec as Parsec +import GHC.Platform.ArchOS (ArchOS(archOS_OS), OS(..)) +import GHC.Toolchain.Target (Target(tgtArchOs)) import Base import Context @@ -185,9 +187,13 @@ jsObjects context = do srcs <- interpretInContext context (getContextData jsSrcs) mapM (objectPath context) srcs --- | Return extra object files needed to build the given library context. The --- resulting list is currently non-empty only when the package from the --- 'Context' is @ghc-internal@ built with in-tree GMP backend. +-- | Return extra object files needed to build the given library context. +-- +-- This is non-empty for: +-- +-- * @ghc-internal@ when built with in-tree GMP backend +-- * @rts@ on Windows when linking dynamically +-- extraObjects :: Context -> Action [FilePath] extraObjects context | package context == ghcInternal = do @@ -195,6 +201,13 @@ extraObjects context "gmp" -> gmpObjects (stage context) _ -> return [] + | package context == rts = do + target <- interpretInContext context getStagedTarget + builddir <- buildPath context + return [ builddir -/- "libHSghc-internal.dll.a" + | archOS_OS (tgtArchOs target) == OSMinGW32 + , Dynamic `wayUnit` way context ] + | otherwise = return [] -- | Return all the object files to be put into the library we're building for ===================================== hadrian/src/Rules/Rts.hs ===================================== @@ -24,6 +24,20 @@ rtsRules = priority 3 $ do (addRtsDummyVersion $ takeFileName rtsLibFilePath') rtsLibFilePath' + -- Solve the recursive dependency between the rts and ghc-internal + -- on Windows by creating an import lib for the ghc-internal dll, + -- to be linked into the rts dll. + forM_ [Stage1, Stage2, Stage3 ] $ \ stage -> do + let buildPath = root -/- buildDir (rtsContext stage) + buildPath -/- "libHSghc-internal.dll.a" %> buildGhcInternalImportLib + +buildGhcInternalImportLib :: FilePath -> Action () +buildGhcInternalImportLib target = do + let input = "rts/win32/libHSghc-internal.def" + output = target -- the .dll.a import lib + need [input] + runBuilder Dlltool ["-d", input, "-l", output] [input] [output] + -- Need symlinks generated by rtsRules. needRtsSymLinks :: Stage -> Set.Set Way -> Action () needRtsSymLinks stage rtsWays ===================================== m4/find_llvm_prog.m4 ===================================== @@ -16,9 +16,12 @@ AC_DEFUN([FIND_LLVM_PROG],[ AS_IF([test x"$$1" != x],[ PROG_VERSION=`$$1 --version | sed -n -e 's/.*version $\([[0-9]][[0-9]]*\.$$[[0-9]][[0-9]]*\.$*[[0-9]][[0-9]]*\).*/\1/gp'` AS_IF([test x"$PROG_VERSION" = x], - [AC_MSG_RESULT(no) - $1="" - AC_MSG_NOTICE([We only support llvm $3 upto $4 (non-inclusive) (no version found).])], + [AS_IF( + [test x"$2" = x"llvm-dlltool"], + [AC_MSG_RESULT(yes)], # llvm-dlltool doesn't have a --version + [AC_MSG_RESULT(no) + AC_MSG_NOTICE([We only support llvm $3 upto $4 (non-inclusive) (no version found).])] + )], [AC_MSG_CHECKING([$$1 version ($PROG_VERSION) is between $3 and $4]) AX_COMPARE_VERSION([$PROG_VERSION], [lt], [$3], [AC_MSG_RESULT(no) ===================================== m4/fp_setup_windows_toolchain.m4 ===================================== @@ -131,8 +131,8 @@ AC_DEFUN([FP_SETUP_WINDOWS_TOOLCHAIN],[ AR="${mingwbin}llvm-ar.exe" RANLIB="${mingwbin}llvm-ranlib.exe" OBJDUMP="${mingwbin}llvm-objdump.exe" - DLLTOOL="${mingwbin}llvm-dlltool.exe" WindresCmd="${mingwbin}llvm-windres.exe" + DlltoolCmd="${mingwbin}llvm-dlltool.exe" LLC="${mingwbin}llc.exe" OPT="${mingwbin}opt.exe" LLVMAS="${mingwbin}clang.exe" ===================================== m4/ghc_toolchain.m4 ===================================== @@ -95,6 +95,7 @@ AC_DEFUN([FIND_GHC_TOOLCHAIN], echo "--merge-objs=$MergeObjsCmd" >> acargs echo "--readelf=$READELF" >> acargs echo "--windres=$WindresCmd" >> acargs + echo "--dlltool=$DlltoolCmd" >> acargs echo "--llc=$LlcCmd" >> acargs echo "--opt=$OptCmd" >> acargs echo "--llvm-as=$LlvmAsCmd" >> acargs ===================================== m4/prep_target_file.m4 ===================================== @@ -191,6 +191,7 @@ AC_DEFUN([PREP_TARGET_FILE],[ PREP_MAYBE_SIMPLE_PROGRAM([OptCmd]) PREP_MAYBE_PROGRAM([LlvmAsCmd], [LlvmAsFlags]) PREP_MAYBE_SIMPLE_PROGRAM([WindresCmd]) + PREP_MAYBE_SIMPLE_PROGRAM([DlltoolCmd]) PREP_MAYBE_SIMPLE_PROGRAM([OtoolCmd]) PREP_MAYBE_SIMPLE_PROGRAM([InstallNameToolCmd]) PREP_MAYBE_STRING([TargetVendor_CPP]) ===================================== rts/.gitignore ===================================== @@ -20,3 +20,4 @@ /ghcautoconf.h.autoconf.in /ghcautoconf.h.autoconf /include/ghcautoconf.h +/win32/libHSghc-internal.def ===================================== rts/win32/libHSghc-internal.def.in ===================================== @@ -0,0 +1,4 @@ +LIBRARY libHSghc-internal-@ProjectVersionForLib@.0-ghc@ProjectVersion@.dll + +EXPORTS + init_ghc_hs_iface ===================================== utils/ghc-toolchain/exe/Main.hs ===================================== @@ -486,7 +486,7 @@ mkTarget opts = do -- for windows, also used for cross compiling windres <- optional $ findProgram "windres" (optWindres opts) ["windres"] - dlltool <- optional $ findProgram "dlltool" (optDlltool opts) ["dlltool", "llvm-dlltool"] + dlltool <- optional $ findProgram "dlltool" (optDlltool opts) ["llvm-dlltool"] -- Darwin-specific utilities (otool, installNameTool) <- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/3ea6bb3f3c11c0e300ac2c627d05cf… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/3ea6bb3f3c11c0e300ac2c627d05cf… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/spj-reinstallable-base2] unsafeCoercePrimName
by Rodrigo Mesquita (＠alt-romes) 07 May '26

07 May '26

Rodrigo Mesquita pushed to branch wip/spj-reinstallable-base2 at Glasgow Haskell Compiler / GHC Commits: 25497cb4 by Rodrigo Mesquita at 2026-05-06T17:51:42+01:00 unsafeCoercePrimName - - - - - 5 changed files: - compiler/GHC/Builtin/KnownKeys.hs - compiler/GHC/HsToCore.hs - compiler/GHC/Tc/Module.hs - compiler/GHC/Tc/Utils/Concrete.hs - libraries/base/src/GHC/Essentials.hs Changes: ===================================== compiler/GHC/Builtin/KnownKeys.hs ===================================== @@ -271,6 +271,9 @@ knownKeyTable , (mkDataOcc ":$$:", typeErrorVAppendDataConKey) , (mkDataOcc "ShowType", typeErrorShowTypeDataConKey) + -- Unsafe coercion proofs + , (mkVarOcc "unsafeCoerce#", unsafeCoercePrimIdKey) + -- Plugins , (mkTcOcc "Plugin", pluginTyConKey) , (mkTcOcc "FrontendPlugin", frontendPluginTyConKey) @@ -372,10 +375,7 @@ basicKnownKeyNames starKindRepName, starArrStarKindRepName, starArrStarArrStarKindRepName, - constraintKindRepName, - - -- Unsafe coercion proofs - unsafeCoercePrimName + constraintKindRepName ] @@ -437,10 +437,6 @@ constraintKindRepName = varQual gHC_TYPES (fsLit "krep$Constraint") con withDictClassName :: Name withDictClassName = clsQual gHC_MAGIC_DICT (fsLit "WithDict") withDictClassKey --- Unsafe coercion proofs -unsafeCoercePrimName:: Name -unsafeCoercePrimName = varQual gHC_INTERNAL_UNSAFE_COERCE (fsLit "unsafeCoerce#") unsafeCoercePrimIdKey - genericClassKeys :: [KnownKey] genericClassKeys = [genClassKey, gen1ClassKey] ===================================== compiler/GHC/HsToCore.hs ===================================== @@ -86,7 +86,6 @@ import GHC.Types.SourceFile import GHC.Types.TypeEnv import GHC.Types.Name import GHC.Types.Name.Set -import GHC.Types.Name.Env import GHC.Types.Name.Ppr import GHC.Types.HpcInfo @@ -99,6 +98,7 @@ import Data.List (partition) import Data.IORef import GHC.Iface.Make (mkRecompUsageInfo) import GHC.Runtime.Interpreter (interpreterProfiled) +import GHC.Types.Unique.FM {- ************************************************************************ @@ -684,13 +684,14 @@ patchMagicDefns pairs -- optimization: check whether we're in a magic module before looking -- at all the ids = do { this_mod <- getModule + ; magicDefnModules <- mkMagicDefnModules ; if this_mod `elemModuleSet` magicDefnModules then traverse patchMagicDefn pairs else return pairs } patchMagicDefn :: (Id, CoreExpr) -> DsM (Id, CoreExpr) patchMagicDefn orig_pair@(orig_id, orig_rhs) - | Just mk_magic_pair <- lookupNameEnv magicDefnsEnv (getName orig_id) + | Just mk_magic_pair <- lookupUFM magicDefnsEnv (getUnique orig_id) = do { magic_pair@(magic_id, _) <- mk_magic_pair orig_id orig_rhs -- Patching should not change the Name or the type of the Id @@ -701,22 +702,25 @@ patchMagicDefn orig_pair@(orig_id, orig_rhs) | otherwise = return orig_pair -magicDefns :: [(Name, Id -> CoreExpr -- old Id and RHS +magicDefns :: [(KnownKey, Id -> CoreExpr -- old Id and RHS -> DsM (Id, CoreExpr) -- new Id and RHS )] -magicDefns = [ (unsafeCoercePrimName, mkUnsafeCoercePrimPair) ] +magicDefns = [ (unsafeCoercePrimIdKey, mkUnsafeCoercePrimPair) ] -magicDefnsEnv :: NameEnv (Id -> CoreExpr -> DsM (Id, CoreExpr)) -magicDefnsEnv = mkNameEnv magicDefns +magicDefnsEnv :: UniqFM KnownKey (Id -> CoreExpr -> DsM (Id, CoreExpr)) +magicDefnsEnv = listToUFM magicDefns -magicDefnModules :: ModuleSet -magicDefnModules = mkModuleSet $ map (nameModule . getName . fst) magicDefns +mkMagicDefnModules :: DsM ModuleSet +mkMagicDefnModules = do + mods <- mapM (fmap nameModule . dsLookupKnownKeyName . fst) magicDefns + pure $ mkModuleSet mods mkUnsafeCoercePrimPair :: Id -> CoreExpr -> DsM (Id, CoreExpr) -- See Note [Wiring in unsafeCoerce#] for the defn we are creating here mkUnsafeCoercePrimPair _old_id old_expr = do { unsafe_equality_proof_id <- dsLookupKnownKeyId unsafeEqualityProofIdKey ; unsafe_equality_tc <- dsLookupKnownKeyTyCon unsafeEqualityTyConKey + ; unsafeCoercePrimName <- dsLookupKnownKeyName unsafeCoercePrimIdKey ; let [unsafe_refl_data_con] = tyConDataCons unsafe_equality_tc ===================================== compiler/GHC/Tc/Module.hs ===================================== @@ -2566,7 +2566,7 @@ tcGhciStmts stmts -- We use Any rather than a dummy type such as () because of -- the rules of unsafeCoerce#; see Unsafe/Coerce.hs for the details. - ; AnId unsafe_coerce_id <- tcLookupGlobal unsafeCoercePrimName + ; AnId unsafe_coerce_id <- tcLookupKnownKeyGlobal unsafeCoercePrimIdKey -- We use unsafeCoerce# here because of (U11) in -- Note [Implementing unsafeCoerce] in base:Unsafe.Coerce ===================================== compiler/GHC/Tc/Utils/Concrete.hs ===================================== @@ -18,7 +18,7 @@ module GHC.Tc.Utils.Concrete import GHC.Prelude -import GHC.Builtin.KnownKeys ( unsafeCoercePrimName ) +import GHC.Builtin.KnownKeys ( unsafeCoercePrimIdKey ) import GHC.Builtin.WiredIn.Types import GHC.Core.Coercion @@ -45,6 +45,7 @@ import GHC.Utils.Outputable import GHC.Data.FastString ( FastString, fsLit ) import Control.Monad ( void ) +import GHC.Types.Name (hasKnownKey) {- Note [Concrete overview] @@ -857,7 +858,7 @@ idConcreteTvs id -- in the correct information in the desugarer). -- So, for the time being, we manually inspect the type of the original, -- unpatched Id to retrieve which of its outer forall-d tyvars should be concrete. - | idName id == unsafeCoercePrimName + | id `hasKnownKey`unsafeCoercePrimIdKey , (a_rep:_b_rep:a:_b:_, _) <- tcSplitForAllTyVars $ idType id -- NB: only check the argument representation, not the result representation. -- This is because the following is OK: @@ -866,7 +867,7 @@ idConcreteTvs id -- unsafeCoerceWordRep = unsafeCoerce# = mkNameEnv [(tyVarName a_rep, ConcreteFRR $ FixedRuntimeRepOrigin (mkTyVarTy a) - $ FRRRepPolyId unsafeCoercePrimName RepPolyFunction + $ FRRRepPolyId (idName id) RepPolyFunction $ mkArgPos 1 Top)] | otherwise ===================================== libraries/base/src/GHC/Essentials.hs ===================================== @@ -161,7 +161,7 @@ module GHC.Essentials , CS.unpackAppendCStringUtf8#, CS.cstringLength# , eqString, inline - , UnsafeEquality( UnsafeRefl ), unsafeEqualityProof + , UnsafeEquality( UnsafeRefl ), unsafeEqualityProof, unsafeCoerce# -- Typeable and type representations , SomeTypeRep( SomeTypeRep ), TR.Module( Module ) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/25497cb478856fc82cdc5277f85eebb… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/25497cb478856fc82cdc5277f85eebb… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/spj-reinstallable-base2] 4 commits: Document in commit message cycle with unpack
by Rodrigo Mesquita (＠alt-romes) 07 May '26

07 May '26

Rodrigo Mesquita pushed to branch wip/spj-reinstallable-base2 at Glasgow Haskell Compiler / GHC Commits: ede44664 by Rodrigo Mesquita at 2026-05-06T14:06:59+01:00 Document in commit message cycle with unpack - GHC.Internal.CString defines a known-key name unpackCString# (unpackCStringIdKey) - IIUC, this known-key is looked up essentially for all modules, as long as there’s some literal string in it (coreStringLit uses unpackCStringIdKey) - GHC.Internal.Types has literal strings, so it needs to lookup unpackCString. It fails with this error: libraries/ghc-internal/src/GHC/Internal/Types.hs:653:1: error: [GHC-99040] • Could not find known-key entity ‘unpackCString#’ in the top-level environment (unqualified, or qualified as Rebindable) Consider importing it Call stack: lookupKnownGRE, called at compiler/GHC/Iface/Load.hs:196:10 in ghc-10.1-inplace:GHC.Iface.Load […] tcLookupKnownKeyId, called at compiler/GHC/Tc/Solver/Monad.hs:1192:36 in ghc-10.1-inplace:GHC.Tc.Solver.Monad • In the kind ‘k’ In the class declaration for ‘Coercible’ | 653 | class Coercible (a :: k) (b :: k) | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - This makes sense, unpackCString must be in scope (this is GHC.Internal.Types, i.e. ghc-internal, i.e. compiled with -frebindable-known-names) - For GHC.Internal.Types, unpackCString is looked up to later construct a string expression in `evCallStack` - Thus, GHC.Internal.Types MUST import unpackCString from GHC.Internal.String - BUT! GHC.Internal.CString imports GHC.Internal.Types… - - - - - 61d6b31d by Rodrigo Mesquita at 2026-05-06T14:20:35+01:00 ptrTyConName, funPtrTyConName - - - - - 6decd81e by Rodrigo Mesquita at 2026-05-06T14:24:17+01:00 word8TyConName is wired in - - - - - 9dec147e by Rodrigo Mesquita at 2026-05-06T17:29:51+01:00 pluginTyConName, frontendPluginTyConName - - - - - 7 changed files: - compiler/GHC/Builtin/KnownKeys.hs - compiler/GHC/Builtin/WiredIn/Types.hs - compiler/GHC/Driver/Plugins.hs - compiler/GHC/HsToCore/Foreign/C.hs - compiler/GHC/Runtime/Loader.hs - libraries/base/src/GHC/Essentials.hs - libraries/ghc-internal/src/GHC/Internal/Ptr.hs Changes: ===================================== compiler/GHC/Builtin/KnownKeys.hs ===================================== @@ -163,6 +163,8 @@ knownKeyRdrName key = knownOccRdrName (knownKeyOccName key) This section tells what the compiler knows about the association of names with uniques. These ones are the *non* wired-in ones. The wired in ones are defined in GHC.Builtin.Types etc. + +See Note [Overview of known entities] in GHC.Builtin -} knownKeyTable :: [(OccName, KnownKey)] @@ -269,6 +271,10 @@ knownKeyTable , (mkDataOcc ":$$:", typeErrorVAppendDataConKey) , (mkDataOcc "ShowType", typeErrorShowTypeDataConKey) + -- Plugins + , (mkTcOcc "Plugin", pluginTyConKey) + , (mkTcOcc "FrontendPlugin", frontendPluginTyConKey) + -- Base strings Strings , (mkVarOcc "unpackCString#", unpackCStringIdKey) , (mkVarOcc "unpackCStringUtf8#", unpackCStringUtf8IdKey) @@ -367,16 +373,9 @@ basicKnownKeyNames starArrStarKindRepName, starArrStarArrStarKindRepName, constraintKindRepName, - -- FFI primitive types that are not wired-in. - ptrTyConName, funPtrTyConName, - word8TyConName, - - -- Plugins - pluginTyConName - , frontendPluginTyConName -- Unsafe coercion proofs - , unsafeCoercePrimName + unsafeCoercePrimName ] @@ -445,23 +444,6 @@ unsafeCoercePrimName = varQual gHC_INTERNAL_UNSAFE_COERCE (fsLit "unsafeCoerc genericClassKeys :: [KnownKey] genericClassKeys = [genClassKey, gen1ClassKey] --- Word module -word8TyConName :: Name -word8TyConName = tcQual gHC_INTERNAL_WORD (fsLit "Word8") word8TyConKey - --- PrelPtr module -ptrTyConName, funPtrTyConName :: Name -ptrTyConName = tcQual gHC_INTERNAL_PTR (fsLit "Ptr") ptrTyConKey -funPtrTyConName = tcQual gHC_INTERNAL_PTR (fsLit "FunPtr") funPtrTyConKey - --- plugins -pLUGINS :: Module -pLUGINS = mkThisGhcModule (fsLit "GHC.Driver.Plugins") -pluginTyConName :: Name -pluginTyConName = tcQual pLUGINS (fsLit "Plugin") pluginTyConKey -frontendPluginTyConName :: Name -frontendPluginTyConName = tcQual pLUGINS (fsLit "FrontendPlugin") frontendPluginTyConKey - {- ************************************************************************ * * ===================================== compiler/GHC/Builtin/WiredIn/Types.hs ===================================== @@ -58,7 +58,7 @@ module GHC.Builtin.WiredIn.Types ( wordTyCon, wordDataCon, wordTyConName, wordTy, -- * Word8 - word8TyCon, word8DataCon, word8Ty, + word8TyCon, word8DataCon, word8TyConName, word8Ty, -- * List listTyCon, listTyConName, listTyConKey, @@ -395,10 +395,11 @@ nothingDataConName = mkWiredInDataConName UserSyntax gHC_INTERNAL_MAYBE (fsLit " justDataConName = mkWiredInDataConName UserSyntax gHC_INTERNAL_MAYBE (fsLit "Just") justDataConKey justDataCon -wordTyConName, wordDataConName, word8DataConName :: Name -wordTyConName = mkWiredInTyConName UserSyntax gHC_TYPES (fsLit "Word") wordTyConKey wordTyCon -wordDataConName = mkWiredInDataConName UserSyntax gHC_TYPES (fsLit "W#") wordDataConKey wordDataCon -word8DataConName = mkWiredInDataConName UserSyntax gHC_INTERNAL_WORD (fsLit "W8#") word8DataConKey word8DataCon +wordTyConName, wordDataConName, word8TyConName, word8DataConName :: Name +wordTyConName = mkWiredInTyConName UserSyntax gHC_TYPES (fsLit "Word") wordTyConKey wordTyCon +wordDataConName = mkWiredInDataConName UserSyntax gHC_TYPES (fsLit "W#") wordDataConKey wordDataCon +word8TyConName = mkWiredInTyConName UserSyntax gHC_INTERNAL_WORD (fsLit "Word8") word8TyConKey word8TyCon +word8DataConName = mkWiredInDataConName UserSyntax gHC_INTERNAL_WORD (fsLit "W8#") word8DataConKey word8DataCon floatTyConName, floatDataConName, doubleTyConName, doubleDataConName :: Name floatTyConName = mkWiredInTyConName UserSyntax gHC_TYPES (fsLit "Float") floatTyConKey floatTyCon ===================================== compiler/GHC/Driver/Plugins.hs ===================================== @@ -5,6 +5,12 @@ {-# LANGUAGE UnboxedTuples #-} #endif +#if __GLASGOW_HASKELL__ > 1000 +{-# OPTIONS_GHC -fdefines-known-key-names #-} + -- 'Plugin' and 'FrontendPlugin' are known-key names + -- (they have a fixed known unique) (from GHC 10.2) + -- See Note [Overview of known entities] in GHC.Builtin +#endif -- | Definitions for writing /plugins/ for GHC. Plugins can hook into -- several areas of the compiler. See the 'Plugin' type. These plugins ===================================== compiler/GHC/HsToCore/Foreign/C.hs ===================================== @@ -365,7 +365,7 @@ toCType t = case f False t of -- If the inner type is void-based, we collapse the pointer -- chain to just "void*". See Note [Collapsing void pointer chains]. | Just (ptr, [t']) <- splitTyConApp_maybe t - , tyConName ptr `elem` [ptrTyConName, funPtrTyConName] + , tyConUnique ptr `elem` [ptrTyConKey, funPtrTyConKey] = case f True t' of (mh, True, _) -> (mh, True, text "void*") ===================================== compiler/GHC/Runtime/Loader.hs ===================================== @@ -37,7 +37,7 @@ import GHC.Rename.Names ( gresFromAvails ) import GHC.Tc.Utils.Monad ( initTcInteractive, initIfaceTcRn ) import GHC.Iface.Load ( loadPluginInterface, cannotFindModule ) -import GHC.Builtin.KnownKeys ( pluginTyConName, frontendPluginTyConName ) +import GHC.Builtin.KnownKeys ( pluginTyConKey, frontendPluginTyConKey ) import GHC.Driver.Env import GHCi.RemoteTypes ( HValue ) @@ -47,7 +47,7 @@ import GHC.Core.TyCon ( TyCon(tyConName) ) import GHC.Types.SrcLoc ( noSrcSpan ) -import GHC.Types.Name ( Name, nameModule, nameModule_maybe ) +import GHC.Types.Name ( Name, nameModule, nameModule_maybe, KnownKey, mkKnownKeyName, mkTcOcc ) import GHC.Types.Id ( idType ) import GHC.Types.PkgQual import GHC.Types.TyThing @@ -75,6 +75,7 @@ import GHC.Linker.Types import Data.List (unzip4) import GHC.Iface.Errors.Ppr import GHC.Driver.Monad +import GHC.Builtin.Modules {- Note [Timing of plugin initialization] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -170,12 +171,13 @@ loadPlugins hsc_env where options = [ option | (opt_mod_nm, option) <- pluginModNameOpts dflags , opt_mod_nm == mod_nm ] + pluginTyConName = mkKnownKeyGhcPluginsName (mkTcOcc "Plugin") pluginTyConKey loadPlugin = loadPlugin' (mkVarOccFS (fsLit "plugin")) pluginTyConName hsc_env - loadFrontendPlugin :: HscEnv -> ModuleName -> IO (FrontendPlugin, [LinkableUsage], PkgsLoaded) loadFrontendPlugin hsc_env mod_name = do checkExternalInterpreter hsc_env + let frontendPluginTyConName = mkKnownKeyGhcPluginsName (mkTcOcc "FrontendPlugin") frontendPluginTyConKey (plugin, _iface, links, pkgs) <- loadPlugin' (mkVarOccFS (fsLit "frontendPlugin")) frontendPluginTyConName hsc_env mod_name @@ -188,6 +190,10 @@ checkExternalInterpreter hsc_env = case interpInstance <$> hsc_interp hsc_env of -> throwIO (InstallationError "Plugins require -fno-external-interpreter") _ -> pure () +mkKnownKeyGhcPluginsName :: OccName -> KnownKey -> Name +mkKnownKeyGhcPluginsName occ kk = + mkKnownKeyName kk (mkThisGhcModule (fsLit "GHC.Driver.Plugins")) occ noSrcSpan + loadPlugin' :: OccName -> Name -> HscEnv -> ModuleName -> IO (a, ModIface, [LinkableUsage], PkgsLoaded) loadPlugin' occ_name plugin_name hsc_env mod_name = do { let plugin_rdr_name = mkRdrQual mod_name occ_name ===================================== libraries/base/src/GHC/Essentials.hs ===================================== @@ -76,6 +76,7 @@ module GHC.Essentials , Void -- FFI + , Ptr, FunPtr , ConstPtr -- Show internals @@ -302,6 +303,7 @@ import GHC.Internal.GHCi import GHC.Internal.Desugar (toAnnotationWrapper) import GHC.Internal.Stack.Types import GHC.Internal.Exception.Context +import GHC.Internal.Ptr import GHC.Internal.Foreign.C.ConstPtr #if defined(javascript_HOST_ARCH) import GHC.Internal.JS.Prim (unsafeUnpackJSStringUtf8##) ===================================== libraries/ghc-internal/src/GHC/Internal/Ptr.hs ===================================== @@ -2,6 +2,7 @@ {-# LANGUAGE CPP, NoImplicitPrelude, MagicHash, RoleAnnotations #-} {-# LANGUAGE UnboxedTuples #-} {-# OPTIONS_HADDOCK not-home #-} +{-# OPTIONS_GHC -fdefines-known-key-names #-} ----------------------------------------------------------------------------- -- | View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/64ed2f412343e5cdc5c0694b79f61e… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/64ed2f412343e5cdc5c0694b79f61e… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/dcoutts/windows-rts-dll] 5 commits: Add minimal dlltool support into ./configure
by David Eichmann (＠DavidEichmann) 06 May '26

06 May '26

David Eichmann pushed to branch wip/dcoutts/windows-rts-dll at Glasgow Haskell Compiler / GHC Commits: 22c5938f by Duncan Coutts at 2026-05-06T16:53:06+01:00 Add minimal dlltool support into ./configure Find dlltool, and hopefully support finding it within the bundled llvm toolchain on windows. - - - - - 5488bb7f by Duncan Coutts at 2026-05-06T16:53:06+01:00 Update the default host and target files for dlltool support - - - - - 16de35d7 by Duncan Coutts at 2026-05-06T16:53:06+01:00 Add dlltool as a hadrian builder Optional except on windows. - - - - - 48044722 by Duncan Coutts at 2026-05-06T16:53:06+01:00 Update and generate libHSghc-internal.def from .def.in file The only symbol that the rts imports from the ghc-internal package now is init_ghc_hs_iface. So the rts only needs an import lib that defines that one symbol. Also, remove the libHSghc-prim.def because it is redundant. The rts no longer imports anything from ghc-prim. Keep libHSffi.def for now. We may yet need it once it is clear how libffi is going to be built/used for ghc. - - - - - 3ea6bb3f by Duncan Coutts at 2026-05-06T16:53:06+01:00 Add rule to build libHSghc-internal.dll.a and link into the rts On windows only, with dynamic linking. This is needed because on windows, all symbols in dlls must be resolved. No dangling symbols allowed. References to external symbols must be explicit. We resolve this with an import library. We create an import library for ghc-internal, a .dll.a file. This is a static archive containing .o files that define the symbols we need, and crucially have ".idata" sections that specifies the symbols the dll imports and from where. Note that we do not install this libHSghc-internal.dll.a, and it does not need to list all the symbols exported by that package. We create a special purpose import lib and only use it when linking the rts dll, so it only has to list the symbols that the rts uses from ghc-internal (which is exactly one symbol: init_ghc_hs_iface). - - - - - 15 changed files: - configure.ac - distrib/configure.ac.in - hadrian/cfg/default.host.target.in - hadrian/cfg/default.target.in - hadrian/src/Builder.hs - hadrian/src/Rules/Generate.hs - hadrian/src/Rules/Library.hs - hadrian/src/Rules/Rts.hs - m4/find_llvm_prog.m4 - m4/fp_setup_windows_toolchain.m4 - m4/ghc_toolchain.m4 - m4/prep_target_file.m4 - rts/.gitignore - + rts/win32/libHSghc-internal.def.in - utils/ghc-toolchain/exe/Main.hs Changes: ===================================== configure.ac ===================================== @@ -314,13 +314,16 @@ else AC_CHECK_TOOL([RANLIB],[ranlib]) AC_CHECK_TOOL([OBJDUMP],[objdump]) AC_CHECK_TOOL([WindresCmd],[windres]) + AC_CHECK_TOOL([DlltoolCmd],[llvm-dlltool]) AC_CHECK_TOOL([Genlib],[genlib]) if test "$HostOS" = "mingw32"; then AC_CHECK_TARGET_TOOL([WindresCmd],[windres]) + AC_CHECK_TARGET_TOOL([DlltoolCmd],[llvm-dlltool]) AC_CHECK_TARGET_TOOL([OBJDUMP],[objdump]) WindresCmd="$(cygpath -m $WindresCmd)" + DlltoolCmd="$(cygpath -m $DlltoolCmd)" if test "$Genlib" != ""; then GenlibCmd="$(cygpath -m $Genlib)" @@ -568,6 +571,11 @@ FIND_LLVM_PROG([OPT], [opt], [$LlvmMinVersion], [$LlvmMaxVersion]) OptCmd="$OPT" AC_SUBST([OptCmd]) +dnl ** Which LLVM llvm-dlltool to use? +dnl -------------------------------------------------------------- +AC_ARG_VAR(DlltoolCmd,[Use as the path to LLVM's llvm-dlltool [default=autodetect]]) +FIND_LLVM_PROG([DlltoolCmd], [llvm-dlltool], [$LlvmMinVersion], [$LlvmMaxVersion]) + dnl ** look to see if we have a C compiler using an llvm back end. dnl FP_CC_LLVM_BACKEND @@ -1080,9 +1088,10 @@ echo "\ libdw : $UseLibdw Using LLVM tools - llc : $LlcCmd - opt : $OptCmd - llvm-as : $LlvmAsCmd" + llc : $LlcCmd + opt : $OptCmd + llvm-as : $LlvmAsCmd + llvm-dlltool : $DlltoolCmd" if test "$HSCOLOUR" = ""; then echo " ===================================== distrib/configure.ac.in ===================================== @@ -229,6 +229,13 @@ FIND_LLVM_PROG([LLVMAS], [clang], [$LlvmMinVersion], [$LlvmMaxVersion]) LlvmAsCmd="$LLVMAS" AC_SUBST([LlvmAsCmd]) +dnl ** Which LLVM llvm-dlltool to use? +dnl -------------------------------------------------------------- +AC_CHECK_TARGET_TOOL([DlltoolCmd],[llvm-dlltool]) +AC_ARG_VAR(DlltoolCmd,[Use as the path to LLVM's llvm-dlltool [default=autodetect]]) +FIND_LLVM_PROG([DlltoolCmd], [llvm-dlltool], [$LlvmMinVersion], [$LlvmMaxVersion]) +AC_SUBST([DlltoolCmd]) + dnl We know that `clang` supports `--target` and it is necessary to pass it dnl lest we see #25793. if test -z "$LlvmAsFlags" && ! test -z "$LlvmTarget"; then ===================================== hadrian/cfg/default.host.target.in ===================================== @@ -45,6 +45,7 @@ Target , tgtOpt = Nothing , tgtLlvmAs = Nothing , tgtWindres = Nothing +, tgtDlltool = Nothing , tgtOtool = Nothing , tgtInstallNameTool = Nothing } ===================================== hadrian/cfg/default.target.in ===================================== @@ -45,6 +45,7 @@ Target , tgtOpt = @OptCmdMaybeProg@ , tgtLlvmAs = @LlvmAsCmdMaybeProg@ , tgtWindres = @WindresCmdMaybeProg@ +, tgtDlltool = @DlltoolCmdMaybeProg@ , tgtOtool = @OtoolCmdMaybeProg@ , tgtInstallNameTool = @InstallNameToolCmdMaybeProg@ } ===================================== hadrian/src/Builder.hs ===================================== @@ -17,7 +17,7 @@ import Development.Shake.Classes import Development.Shake.Command import Development.Shake.FilePath import GHC.Generics -import GHC.Platform.ArchOS (ArchOS(..), Arch(..)) +import GHC.Platform.ArchOS (ArchOS(..), Arch(..), OS(..)) import qualified Hadrian.Builder as H import Hadrian.Builder hiding (Builder) import Hadrian.Builder.Ar @@ -180,6 +180,7 @@ data Builder = Alex | Objdump | Python | Ranlib + | Dlltool | Testsuite TestMode | Sphinx SphinxMode | Tar TarMode @@ -418,6 +419,7 @@ isOptional target = \case Alex -> True -- Most ar implemententions no longer need ranlib, but some still do Ranlib -> not $ Toolchain.arNeedsRanlib (tgtAr target) + Dlltool -> archOS_OS (tgtArchOs target) /= OSMinGW32 JsCpp -> not $ (archOS_arch . tgtArchOs) target == ArchJavaScript -- ArchWasm32 too? _ -> False @@ -442,6 +444,7 @@ systemBuilderPath builder = case builder of Objdump -> fromKey "objdump" Python -> fromKey "python" Ranlib -> fromTargetTC "ranlib" (maybeProg Toolchain.ranlibProgram . tgtRanlib) + Dlltool -> fromTargetTC "dlltool" (maybeProg id . tgtDlltool) Testsuite _ -> fromKey "python" Sphinx _ -> fromKey "sphinx-build" Tar _ -> fromKey "tar" ===================================== hadrian/src/Rules/Generate.hs ===================================== @@ -377,6 +377,7 @@ templateRules = do , interpolateSetting "ProjectPatchLevel1" ProjectPatchLevel1 , interpolateSetting "ProjectPatchLevel2" ProjectPatchLevel2 ] + templateRule "rts/win32/libHSghc-internal.def" projectVersion templateRule "docs/index.html" $ packageUnitIds Stage1 templateRule "docs/users_guide/ghc_config.py" $ mconcat [ projectVersion ===================================== hadrian/src/Rules/Library.hs ===================================== @@ -4,6 +4,8 @@ import Hadrian.BuildPath import Hadrian.Haskell.Cabal import Hadrian.Haskell.Cabal.Type import qualified Text.Parsec as Parsec +import GHC.Platform.ArchOS (ArchOS(archOS_OS), OS(..)) +import GHC.Toolchain.Target (Target(tgtArchOs)) import Base import Context @@ -185,9 +187,13 @@ jsObjects context = do srcs <- interpretInContext context (getContextData jsSrcs) mapM (objectPath context) srcs --- | Return extra object files needed to build the given library context. The --- resulting list is currently non-empty only when the package from the --- 'Context' is @ghc-internal@ built with in-tree GMP backend. +-- | Return extra object files needed to build the given library context. +-- +-- This is non-empty for: +-- +-- * @ghc-internal@ when built with in-tree GMP backend +-- * @rts@ on Windows when linking dynamically +-- extraObjects :: Context -> Action [FilePath] extraObjects context | package context == ghcInternal = do @@ -195,6 +201,13 @@ extraObjects context "gmp" -> gmpObjects (stage context) _ -> return [] + | package context == rts = do + target <- interpretInContext context getStagedTarget + builddir <- buildPath context + return [ builddir -/- "libHSghc-internal.dll.a" + | archOS_OS (tgtArchOs target) == OSMinGW32 + , Dynamic `wayUnit` way context ] + | otherwise = return [] -- | Return all the object files to be put into the library we're building for ===================================== hadrian/src/Rules/Rts.hs ===================================== @@ -24,6 +24,20 @@ rtsRules = priority 3 $ do (addRtsDummyVersion $ takeFileName rtsLibFilePath') rtsLibFilePath' + -- Solve the recursive dependency between the rts and ghc-internal + -- on Windows by creating an import lib for the ghc-internal dll, + -- to be linked into the rts dll. + forM_ [Stage1, Stage2, Stage3 ] $ \ stage -> do + let buildPath = root -/- buildDir (rtsContext stage) + buildPath -/- "libHSghc-internal.dll.a" %> buildGhcInternalImportLib + +buildGhcInternalImportLib :: FilePath -> Action () +buildGhcInternalImportLib target = do + let input = "rts/win32/libHSghc-internal.def" + output = target -- the .dll.a import lib + need [input] + runBuilder Dlltool ["-d", input, "-l", output] [input] [output] + -- Need symlinks generated by rtsRules. needRtsSymLinks :: Stage -> Set.Set Way -> Action () needRtsSymLinks stage rtsWays ===================================== m4/find_llvm_prog.m4 ===================================== @@ -15,10 +15,13 @@ AC_DEFUN([FIND_LLVM_PROG],[ AC_CHECK_TOOLS([$1], [$PROG_VERSION_CANDIDATES $2], []) AS_IF([test x"$$1" != x],[ PROG_VERSION=`$$1 --version | sed -n -e 's/.*version $\([[0-9]][[0-9]]*\.$$[[0-9]][[0-9]]*\.$*[[0-9]][[0-9]]*\).*/\1/gp'` - AS_IF([test x"$PROG_VERSION" = x], - [AC_MSG_RESULT(no) - $1="" - AC_MSG_NOTICE([We only support llvm $3 upto $4 (non-inclusive) (no version found).])], + AS_IF([test x"$PROG_VERSION" = x] + [AS_IF( + [test x"$2" = x"llvm-dlltool"] + [AC_MSG_RESULT(yes)] # llvm-dlltool doesn't have a --version + [AC_MSG_RESULT(no) + AC_MSG_NOTICE([We only support llvm $3 upto $4 (non-inclusive) (no version found).])] + )], [AC_MSG_CHECKING([$$1 version ($PROG_VERSION) is between $3 and $4]) AX_COMPARE_VERSION([$PROG_VERSION], [lt], [$3], [AC_MSG_RESULT(no) ===================================== m4/fp_setup_windows_toolchain.m4 ===================================== @@ -131,8 +131,8 @@ AC_DEFUN([FP_SETUP_WINDOWS_TOOLCHAIN],[ AR="${mingwbin}llvm-ar.exe" RANLIB="${mingwbin}llvm-ranlib.exe" OBJDUMP="${mingwbin}llvm-objdump.exe" - DLLTOOL="${mingwbin}llvm-dlltool.exe" WindresCmd="${mingwbin}llvm-windres.exe" + DlltoolCmd="${mingwbin}llvm-dlltool.exe" LLC="${mingwbin}llc.exe" OPT="${mingwbin}opt.exe" LLVMAS="${mingwbin}clang.exe" ===================================== m4/ghc_toolchain.m4 ===================================== @@ -95,6 +95,7 @@ AC_DEFUN([FIND_GHC_TOOLCHAIN], echo "--merge-objs=$MergeObjsCmd" >> acargs echo "--readelf=$READELF" >> acargs echo "--windres=$WindresCmd" >> acargs + echo "--dlltool=$DlltoolCmd" >> acargs echo "--llc=$LlcCmd" >> acargs echo "--opt=$OptCmd" >> acargs echo "--llvm-as=$LlvmAsCmd" >> acargs ===================================== m4/prep_target_file.m4 ===================================== @@ -191,6 +191,7 @@ AC_DEFUN([PREP_TARGET_FILE],[ PREP_MAYBE_SIMPLE_PROGRAM([OptCmd]) PREP_MAYBE_PROGRAM([LlvmAsCmd], [LlvmAsFlags]) PREP_MAYBE_SIMPLE_PROGRAM([WindresCmd]) + PREP_MAYBE_SIMPLE_PROGRAM([DlltoolCmd]) PREP_MAYBE_SIMPLE_PROGRAM([OtoolCmd]) PREP_MAYBE_SIMPLE_PROGRAM([InstallNameToolCmd]) PREP_MAYBE_STRING([TargetVendor_CPP]) ===================================== rts/.gitignore ===================================== @@ -20,3 +20,4 @@ /ghcautoconf.h.autoconf.in /ghcautoconf.h.autoconf /include/ghcautoconf.h +/win32/libHSghc-internal.def ===================================== rts/win32/libHSghc-internal.def.in ===================================== @@ -0,0 +1,4 @@ +LIBRARY libHSghc-internal-@ProjectVersionForLib@.0-ghc@ProjectVersion@.dll + +EXPORTS + init_ghc_hs_iface ===================================== utils/ghc-toolchain/exe/Main.hs ===================================== @@ -486,7 +486,7 @@ mkTarget opts = do -- for windows, also used for cross compiling windres <- optional $ findProgram "windres" (optWindres opts) ["windres"] - dlltool <- optional $ findProgram "dlltool" (optDlltool opts) ["dlltool", "llvm-dlltool"] + dlltool <- optional $ findProgram "dlltool" (optDlltool opts) ["llvm-dlltool"] -- Darwin-specific utilities (otool, installNameTool) <- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/75e4649ddc4561529a4945614cadb1… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/75e4649ddc4561529a4945614cadb1… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/dcoutts/windows-rts-dll] WIP: fix FIND_LLVM_PROG bug for llvm-dlltool
by Rodrigo Mesquita (＠alt-romes) 06 May '26

06 May '26

Rodrigo Mesquita pushed to branch wip/dcoutts/windows-rts-dll at Glasgow Haskell Compiler / GHC Commits: 75e4649d by Rodrigo Mesquita at 2026-05-06T16:38:17+01:00 WIP: fix FIND_LLVM_PROG bug for llvm-dlltool - - - - - 2 changed files: - configure.ac - m4/find_llvm_prog.m4 Changes: ===================================== configure.ac ===================================== @@ -575,7 +575,6 @@ dnl ** Which LLVM llvm-dlltool to use? dnl -------------------------------------------------------------- AC_ARG_VAR(DlltoolCmd,[Use as the path to LLVM's llvm-dlltool [default=autodetect]]) FIND_LLVM_PROG([DlltoolCmd], [llvm-dlltool], [$LlvmMinVersion], [$LlvmMaxVersion]) -AC_SUBST([DlltoolCmd]) dnl ** look to see if we have a C compiler using an llvm back end. dnl ===================================== m4/find_llvm_prog.m4 ===================================== @@ -15,10 +15,13 @@ AC_DEFUN([FIND_LLVM_PROG],[ AC_CHECK_TOOLS([$1], [$PROG_VERSION_CANDIDATES $2], []) AS_IF([test x"$$1" != x],[ PROG_VERSION=`$$1 --version | sed -n -e 's/.*version $\([[0-9]][[0-9]]*\.$$[[0-9]][[0-9]]*\.$*[[0-9]][[0-9]]*\).*/\1/gp'` - AS_IF([test x"$PROG_VERSION" = x], - [AC_MSG_RESULT(no) - $1="" - AC_MSG_NOTICE([We only support llvm $3 upto $4 (non-inclusive) (no version found).])], + AS_IF([test x"$PROG_VERSION" = x] + [AS_IF( + [test x"$2" = x"llvm-dlltool"] + [AC_MSG_RESULT(yes)] # llvm-dlltool doesn't have a --version + [AC_MSG_RESULT(no) + AC_MSG_NOTICE([We only support llvm $3 upto $4 (non-inclusive) (no version found).])] + )], [AC_MSG_CHECKING([$$1 version ($PROG_VERSION) is between $3 and $4]) AX_COMPARE_VERSION([$PROG_VERSION], [lt], [$3], [AC_MSG_RESULT(no) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/75e4649ddc4561529a4945614cadb1a… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/75e4649ddc4561529a4945614cadb1a… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] interface-stability/base: don't distinguish ws-32
by Marge Bot (＠marge-bot) 06 May '26

06 May '26

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: a3b339a4 by Teo Camarasu at 2026-05-06T09:54:25-04:00 interface-stability/base: don't distinguish ws-32 The interface of base is identical when the Word size is 32bits. Therefore, there is no need to have another file for this case. So, we delete it. Step towards: #26752 - - - - - 1 changed file: - − testsuite/tests/interface-stability/base-exports.stdout-ws-32 Changes: ===================================== testsuite/tests/interface-stability/base-exports.stdout-ws-32 deleted ===================================== The diff for this file was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/a3b339a4ecc46345bd5e86f4dcc8045… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/a3b339a4ecc46345bd5e86f4dcc8045… You're receiving this email because of your account on gitlab.haskell.org.

1 0