GitLab

David Eichmann pushed to branch wip/davide/ghc-internal-def at Glasgow Haskell Compiler / GHC

Commits:

9c2789b7

by David Eichmann at 2026-05-28T14:05:02+01:00

Hadrian: create a ghc-internal .def file per ghc-internal dll

The .def file generated from rts/win32/libHSghc-internal.def.in contains
the name of the ghc-internal dll. The correct dll name differs based
on if the dll is inplace/final and if using the Dynamic way. Previously,
this was not accounted for and inconsistent dlls names where used. That
led to failure when loading dlls at runtime in experiments with windows
dynamic linking.

4 changed files:

hadrian/src/Rules/Generate.hs
hadrian/src/Rules/Library.hs
hadrian/src/Rules/Rts.hs
rts/win32/libHSghc-internal.def.in

Changes:

hadrian/src/Rules/Generate.hs

@@ -377,7 +377,6 @@ 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

@@ -9,6 +9,7 @@ import GHC.Toolchain.Target (Target(tgtArchOs))
  import Base
  import Context
 +import qualified Data.List as List
  import Expression hiding (way, package, stage)
  import Oracles.ModuleFiles
  import Packages
@@ -20,6 +21,7 @@ import Utilities
  import Data.Time.Clock
  import Rules.Generate (generatedDependencies)
  import Oracles.Flag
 +import Way.Type (wayToUnits)
  -- * Library 'Rules'
@@ -203,13 +205,29 @@ extraObjects context
      | 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 ]
 +          if not (archOS_OS (tgtArchOs target) == OSMinGW32
 +                && Dynamic `wayUnit` way context)
 +          then return []
 +          else do
 +            -- Find the ghc-internal library file name
 +            ghcInternalDllName <- takeFileName <$> pkgLibraryFile Context {
 +                    stage = stage context,
 +                    way = rtsWayToLibraryWay (way context),
 +                    iplace = iplace context,
 +                    package = ghcInternal
 +                }
++
 +            builddir <- buildPath context
 +            return [ builddir -/- ghcInternalDllName <> ".a"]
      | otherwise = return []
 +-- | The rts is compiled in many different ways, but libraries are only built in
 +-- (non)Dynamic and (non)Profiled ways. This function converts the rts way into
 +-- compatible library way.
 +rtsWayToLibraryWay :: Way -> Way
 +rtsWayToLibraryWay = wayFromUnits . List.intersect [Dynamic, Profiling] . wayToUnits
++
  -- | Return all the object files to be put into the library we're building for
  -- the given 'Context'.
  libraryObjects :: Context -> Action [FilePath]

hadrian/src/Rules/Rts.hs

@@ -13,11 +13,19 @@ rtsRules = priority 3 $ do
      -- 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
 +        buildPath -/- "libHSghc-internal-*.def" %> buildGhcInternalImportDef
 +        buildPath -/- "libHSghc-internal-*.dll.a" %> buildGhcInternalImportLib
++
 +buildGhcInternalImportDef :: FilePath -> Action ()
 +buildGhcInternalImportDef target = do
 +    templateIn <- readFile' "rts/win32/libHSghc-internal.def.in"
 +    let dllName = (dropExtension (takeFileName target)) <.> "dll"
 +        templateOut = replace "@GhcInternalDll@" dllName templateIn
 +    writeFile' target templateOut
  buildGhcInternalImportLib :: FilePath -> Action ()
  buildGhcInternalImportLib target = do
 -    let input  = "rts/win32/libHSghc-internal.def"
 +    let input = dropExtensions target <.> "def" -- the .def file
          output = target -- the .dll.a import lib
      need [input]
      runBuilder Dlltool ["-d", input, "-l", output] [input] [output]

rts/win32/libHSghc-internal.def.in

 -LIBRARY libHSghc-internal-@ProjectVersionForLib@.0-ghc@ProjectVersion@.dll
 +LIBRARY @GhcInternalDll@
  EXPORTS
      init_ghc_hs_iface