diff options
| author | Sylvain Henry <sylvain@haskus.fr> | 2020-05-25 17:37:55 +0200 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-06-18 23:08:35 -0400 |
| commit | d4a0be758003f32b9d9d89cfd14b9839ac002f4d (patch) | |
| tree | 2ced620f7598d9e71882be08b027a7ce9e448be2 /compiler/GHC.hs | |
| parent | 2af0ec9059b94e1fa6b37eda60216e0222e1a53d (diff) | |
| download | haskell-d4a0be758003f32b9d9d89cfd14b9839ac002f4d.tar.gz | |
Move tablesNextToCode field into Platform
tablesNextToCode is a platform setting and doesn't belong into DynFlags
(#17957). Doing this is also a prerequisite to fix #14335 where we deal
with two platforms (target and host) that may have different platform
settings.
Diffstat (limited to 'compiler/GHC.hs')
| -rw-r--r-- | compiler/GHC.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/GHC.hs b/compiler/GHC.hs index c7527d2b22..a3fff116a0 100644 --- a/compiler/GHC.hs +++ b/compiler/GHC.hs @@ -545,7 +545,7 @@ checkBrokenTablesNextToCode' :: MonadIO m => DynFlags -> m Bool checkBrokenTablesNextToCode' dflags | not (isARM arch) = return False | WayDyn `S.notMember` ways dflags = return False - | not (tablesNextToCode dflags) = return False + | not tablesNextToCode = return False | otherwise = do linkerInfo <- liftIO $ getLinkerInfo dflags case linkerInfo of @@ -553,6 +553,7 @@ checkBrokenTablesNextToCode' dflags _ -> return False where platform = targetPlatform dflags arch = platformArch platform + tablesNextToCode = platformTablesNextToCode platform -- %************************************************************************ |