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/ByteCode | |
| 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/ByteCode')
| -rw-r--r-- | compiler/GHC/ByteCode/InfoTable.hs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/compiler/GHC/ByteCode/InfoTable.hs b/compiler/GHC/ByteCode/InfoTable.hs index b02683d10f..84f4ed3ef0 100644 --- a/compiler/GHC/ByteCode/InfoTable.hs +++ b/compiler/GHC/ByteCode/InfoTable.hs @@ -11,6 +11,7 @@ module GHC.ByteCode.InfoTable ( mkITbls ) where import GHC.Prelude +import GHC.Platform import GHC.ByteCode.Types import GHC.Runtime.Interpreter import GHC.Driver.Session @@ -72,7 +73,8 @@ make_constr_itbls hsc_env cons = descr = dataConIdentity dcon - tables_next_to_code = tablesNextToCode dflags + platform = targetPlatform dflags + tables_next_to_code = platformTablesNextToCode platform r <- iservCmd hsc_env (MkConInfoTable tables_next_to_code ptrs' nptrs_really conNo (tagForCon dflags dcon) descr) |