diff options
| author | Ian Lynagh <ian@well-typed.com> | 2013-05-13 22:39:29 +0100 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2013-05-14 13:49:09 +0100 |
| commit | 60b86b04b2c214ef75b01371901a040933debf31 (patch) | |
| tree | ed89503ca5c5039464692d0993b3525e209c99a6 /compiler/cmm/CLabel.hs | |
| parent | ff1a16a0bd630f97dc507f96977eaaae9d8df9a6 (diff) | |
| download | haskell-60b86b04b2c214ef75b01371901a040933debf31.tar.gz | |
Fix the GHC package DLL-splitting
There's now an internal -dll-split flag, which we use to tell GHC how
the GHC package is split into 2 separate DLLs. This is used by
Packages.isDllName to determine whether a call is within the same
DLL, or whether it is a call to another DLL.
Diffstat (limited to 'compiler/cmm/CLabel.hs')
| -rw-r--r-- | compiler/cmm/CLabel.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/cmm/CLabel.hs b/compiler/cmm/CLabel.hs index c14c958218..1bcb695020 100644 --- a/compiler/cmm/CLabel.hs +++ b/compiler/cmm/CLabel.hs @@ -838,12 +838,12 @@ idInfoLabelType info = -- in a DLL, be it a data reference or not. labelDynamic :: DynFlags -> PackageId -> Module -> CLabel -> Bool -labelDynamic dflags this_pkg _this_mod lbl = +labelDynamic dflags this_pkg this_mod lbl = case lbl of -- is the RTS in a DLL or not? RtsLabel _ -> not (gopt Opt_Static dflags) && (this_pkg /= rtsPackageId) - IdLabel n _ _ -> isDllName dflags this_pkg n + IdLabel n _ _ -> isDllName dflags this_pkg this_mod n -- When compiling in the "dyn" way, each package is to be linked into -- its own shared library. |