[Git][ghc/ghc][wip/ghc-internals-move-2] fix

[Matthew Pickering (@mpickering)]

Matthew Pickering pushed to branch wip/ghc-internals-move-2 at Glasgow Haskell Compiler / GHC


Commits:
2c94dfa0 by GHC GitLab CI at 2024-02-07T13:34:18+00:00
fix

- - - - -


2 changed files:

- compiler/GHC/Runtime/Interpreter/JS.hs
- compiler/GHC/StgToJS/Linker/Linker.hs


Changes:

=====================================
compiler/GHC/Runtime/Interpreter/JS.hs
=====================================
@@ -217,7 +217,7 @@ jsLinkRts logger tmpfs tmp_dir cfg unit_env inst = do
 
   -- link the RTS and its dependencies (things it uses from `base`, etc.)
   let link_spec = LinkSpec
-        { lks_unit_ids        = [rtsUnitId, baseUnitId, primUnitId]
+        { lks_unit_ids        = [rtsUnitId, ghcInternalUnitId, primUnitId]
         , lks_obj_files       = mempty
         , lks_obj_root_filter = const False
         , lks_extra_roots     = mempty


=====================================
compiler/GHC/StgToJS/Linker/Linker.hs
=====================================
@@ -820,31 +820,31 @@ diffDeps pkgs (deps_pkgs,deps_funs) =
 -- | dependencies for the RTS, these need to be always linked
 rtsDeps :: [UnitId] -> ([UnitId], Set ExportedFun)
 rtsDeps pkgs = diffDeps pkgs $
-  ( [baseUnitId, primUnitId]
+  ( [ghcInternalUnitId, primUnitId]
   , S.fromList $ concat
-      [ mkBaseFuns "GHC.Conc.Sync"
+      [ mkInternalFuns "GHC.Conc.Sync"
           ["reportError"]
-      , mkBaseFuns "Control.Exception.Base"
+      , mkInternalFuns "Control.Exception.Base"
           ["nonTermination"]
-      , mkBaseFuns "GHC.Exception.Type"
+      , mkInternalFuns "GHC.Exception.Type"
           [ "SomeException"
           , "underflowException"
           , "overflowException"
           , "divZeroException"
           ]
-      , mkBaseFuns "GHC.TopHandler"
+      , mkInternalFuns "GHC.TopHandler"
           [ "runMainIO"
           , "topHandler"
           ]
-      , mkBaseFuns "GHC.Base"
+      , mkInternalFuns "GHC.Base"
           ["$fMonadIO"]
-      , mkBaseFuns "GHC.Maybe"
+      , mkInternalFuns "GHC.Maybe"
           [ "Nothing"
           , "Just"
           ]
-      , mkBaseFuns "GHC.Ptr"
+      , mkInternalFuns "GHC.Ptr"
           ["Ptr"]
-      , mkBaseFuns "GHC.JS.Prim"
+      , mkInternalFuns "GHC.JS.Prim"
           [ "JSVal"
           , "JSException"
           , "$fShowJSException"
@@ -853,7 +853,7 @@ rtsDeps pkgs = diffDeps pkgs $
           , "resolveIO"
           , "toIO"
           ]
-      , mkBaseFuns "GHC.JS.Prim.Internal"
+      , mkInternalFuns "GHC.JS.Prim.Internal"
           [ "wouldBlock"
           , "blockedIndefinitelyOnMVar"
           , "blockedIndefinitelyOnSTM"
@@ -880,8 +880,8 @@ rtsDeps pkgs = diffDeps pkgs $
   )
 
 -- | Export the functions in base
-mkBaseFuns :: FastString -> [FastString] -> [ExportedFun]
-mkBaseFuns = mkExportedFuns baseUnitId
+mkInternalFuns :: FastString -> [FastString] -> [ExportedFun]
+mkInternalFuns = mkExportedFuns ghcInternalUnitId
 
 -- | Export the Prim functions
 mkPrimFuns :: FastString -> [FastString] -> [ExportedFun]



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/2c94dfa04f17f04d34369956f2f1f1697cb48382

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/2c94dfa04f17f04d34369956f2f1f1697cb48382
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/20240207/71fe6c49/attachment-0001.html>