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 /libraries | |
| 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 'libraries')
| -rw-r--r-- | libraries/ghc-boot/GHC/Platform.hs | 8 | ||||
| -rw-r--r-- | libraries/ghc-boot/GHC/Settings/Platform.hs | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/libraries/ghc-boot/GHC/Platform.hs b/libraries/ghc-boot/GHC/Platform.hs index 6c1be92512..6c132a2e76 100644 --- a/libraries/ghc-boot/GHC/Platform.hs +++ b/libraries/ghc-boot/GHC/Platform.hs @@ -64,6 +64,10 @@ data Platform = Platform , platformHasSubsectionsViaSymbols :: !Bool , platformIsCrossCompiling :: !Bool , platformLeadingUnderscore :: !Bool -- ^ Symbols need underscore prefix + , platformTablesNextToCode :: !Bool + -- ^ Determines whether we will be compiling info tables that reside just + -- before the entry code, or with an indirection to the entry code. See + -- TABLES_NEXT_TO_CODE in includes/rts/storage/InfoTables.h. } deriving (Read, Show, Eq) @@ -294,10 +298,6 @@ data PlatformMisc = PlatformMisc , platformMisc_ghcWithNativeCodeGen :: Bool , platformMisc_ghcWithSMP :: Bool , platformMisc_ghcRTSWays :: String - -- | Determines whether we will be compiling info tables that reside just - -- before the entry code, or with an indirection to the entry code. See - -- TABLES_NEXT_TO_CODE in includes/rts/storage/InfoTables.h. - , platformMisc_tablesNextToCode :: Bool , platformMisc_libFFI :: Bool , platformMisc_ghcThreaded :: Bool , platformMisc_ghcDebugged :: Bool diff --git a/libraries/ghc-boot/GHC/Settings/Platform.hs b/libraries/ghc-boot/GHC/Settings/Platform.hs index 0f41974002..bfe9b53dc5 100644 --- a/libraries/ghc-boot/GHC/Settings/Platform.hs +++ b/libraries/ghc-boot/GHC/Settings/Platform.hs @@ -43,6 +43,7 @@ getTargetPlatform settingsFile mySettings = do targetHasIdentDirective <- getBooleanSetting "target has .ident directive" targetHasSubsectionsViaSymbols <- getBooleanSetting "target has subsections via symbols" crossCompiling <- getBooleanSetting "cross compiling" + tablesNextToCode <- getBooleanSetting "Tables next to code" pure $ Platform { platformMini = PlatformMini @@ -57,6 +58,7 @@ getTargetPlatform settingsFile mySettings = do , platformHasSubsectionsViaSymbols = targetHasSubsectionsViaSymbols , platformIsCrossCompiling = crossCompiling , platformLeadingUnderscore = targetLeadingUnderscore + , platformTablesNextToCode = tablesNextToCode } ----------------------------------------------------------------------------- |