diff options
| author | Sylvain Henry <sylvain@haskus.fr> | 2020-10-12 12:43:38 +0200 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-11-03 17:40:34 -0500 |
| commit | 14ce454f7294381225b4211dc191a167a386e380 (patch) | |
| tree | 00dde0d9eeaee019842352560bc42f7147e4abaa /testsuite | |
| parent | 78f2767d4db5e69a142ac6a408a217b11c35949d (diff) | |
| download | haskell-14ce454f7294381225b4211dc191a167a386e380.tar.gz | |
Linker: reorganize linker related code
Move linker related code into GHC.Linker. Previously it was scattered
into GHC.Unit.State, GHC.Driver.Pipeline, GHC.Runtime.Linker, etc.
Add documentation in GHC.Linker
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/tests/ghc-api/T4891/T4891.hs | 2 | ||||
| -rw-r--r-- | testsuite/tests/ghci/linking/T11531.stderr | 2 | ||||
| -rw-r--r-- | testsuite/tests/rts/linker/LinkerUnload.hs | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/testsuite/tests/ghc-api/T4891/T4891.hs b/testsuite/tests/ghc-api/T4891/T4891.hs index 89a8403b94..4ae055daa4 100644 --- a/testsuite/tests/ghc-api/T4891/T4891.hs +++ b/testsuite/tests/ghc-api/T4891/T4891.hs @@ -8,7 +8,7 @@ import GHC.Core.DataCon import GHC import GHC.Exts.Heap import GHC.Driver.Ppr -import GHC.Runtime.Linker +import GHC.Linker.Loader import GHC.Runtime.Heap.Inspect import GHC.Tc.Utils.Env import GHC.Core.Type diff --git a/testsuite/tests/ghci/linking/T11531.stderr b/testsuite/tests/ghci/linking/T11531.stderr index 98b9219530..b6527a3268 100644 --- a/testsuite/tests/ghci/linking/T11531.stderr +++ b/testsuite/tests/ghci/linking/T11531.stderr @@ -1,5 +1,5 @@ -GHC.Runtime.Linker.dynLoadObjs: Loading temp shared object failed +GHC.Linker.Runtime.dynLoadObjs: Loading temp shared object failed During interactive linking, GHCi couldn't find the following symbol: This may be due to you not asking GHCi to load extra object files, archives or DLLs needed by your current session. Restart GHCi, specifying diff --git a/testsuite/tests/rts/linker/LinkerUnload.hs b/testsuite/tests/rts/linker/LinkerUnload.hs index 9c1d08249c..9bdc92fdc2 100644 --- a/testsuite/tests/rts/linker/LinkerUnload.hs +++ b/testsuite/tests/rts/linker/LinkerUnload.hs @@ -4,7 +4,7 @@ import GHC import GHC.Unit.State import GHC.Driver.Session import GHC.Driver.Backend -import GHC.Runtime.Linker as Linker +import qualified GHC.Linker.Loader as Loader import System.Environment import GHC.Utils.Monad ( MonadIO(..) ) @@ -19,4 +19,4 @@ loadPackages = do , ghcLink = LinkInMemory } setSessionDynFlags dflags' hsc_env <- getSession - liftIO $ Linker.linkPackages hsc_env (preloadUnits (unitState dflags')) + liftIO $ Loader.loadPackages hsc_env (preloadUnits (unitState dflags')) |