diff options
Diffstat (limited to 'compiler/GHC')
| -rw-r--r-- | compiler/GHC/Linker/Dynamic.hs | 10 | ||||
| -rw-r--r-- | compiler/GHC/Linker/Static.hs | 2 | ||||
| -rw-r--r-- | compiler/GHC/Platform.hs | 5 | ||||
| -rw-r--r-- | compiler/GHC/Settings/IO.hs | 2 |
4 files changed, 0 insertions, 19 deletions
diff --git a/compiler/GHC/Linker/Dynamic.hs b/compiler/GHC/Linker/Dynamic.hs index 171503d4d6..646eab59d4 100644 --- a/compiler/GHC/Linker/Dynamic.hs +++ b/compiler/GHC/Linker/Dynamic.hs @@ -3,8 +3,6 @@ -- | Dynamic linker module GHC.Linker.Dynamic ( linkDynLib - -- * Platform-specifics - , libmLinkOpts ) where @@ -214,7 +212,6 @@ linkDynLib logger tmpfs dflags0 unit_env o_files dep_packages runLink logger tmpfs dflags ( map Option verbFlags - ++ libmLinkOpts platform ++ [ Option "-o" , FileOption "" output_fn ] @@ -230,13 +227,6 @@ linkDynLib logger tmpfs dflags0 unit_env o_files dep_packages ++ map Option pkg_link_opts ) --- | Some platforms require that we explicitly link against @libm@ if any --- math-y things are used (which we assume to include all programs). See #14022. -libmLinkOpts :: Platform -> [Option] -libmLinkOpts platform - | platformHasLibm platform = [Option "-lm"] - | otherwise = [] - {- Note [-Bsymbolic assumptions by GHC] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/compiler/GHC/Linker/Static.hs b/compiler/GHC/Linker/Static.hs index 99495d33fb..d251832694 100644 --- a/compiler/GHC/Linker/Static.hs +++ b/compiler/GHC/Linker/Static.hs @@ -24,7 +24,6 @@ import GHC.Utils.TmpFs import GHC.Linker.MacOS import GHC.Linker.Unit -import GHC.Linker.Dynamic import GHC.Linker.ExtraObj import GHC.Linker.Windows import GHC.Linker.Static.Utils @@ -195,7 +194,6 @@ linkBinary' staticLink logger tmpfs dflags unit_env o_files dep_units = do ++ [ GHC.SysTools.Option "-o" , GHC.SysTools.FileOption "" output_fn ] - ++ libmLinkOpts platform ++ map GHC.SysTools.Option ( [] diff --git a/compiler/GHC/Platform.hs b/compiler/GHC/Platform.hs index a630e0c1d3..2faef1599f 100644 --- a/compiler/GHC/Platform.hs +++ b/compiler/GHC/Platform.hs @@ -79,10 +79,6 @@ data Platform = Platform -- ^ 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 rts/include/rts/storage/InfoTables.h. - , platformHasLibm :: !Bool - -- ^ Some platforms require that we explicitly link against @libm@ if any - -- math-y things are used (which we assume to include all programs). See - -- #14022. , platform_constants :: !(Maybe PlatformConstants) -- ^ Constants such as structure offsets, type sizes, etc. @@ -136,7 +132,6 @@ genericPlatform = Platform , platformHasGnuNonexecStack = False , platformHasIdentDirective = False , platformHasSubsectionsViaSymbols= False - , platformHasLibm = False , platformIsCrossCompiling = False , platformLeadingUnderscore = False , platformTablesNextToCode = True diff --git a/compiler/GHC/Settings/IO.hs b/compiler/GHC/Settings/IO.hs index 06952774fd..7a971af036 100644 --- a/compiler/GHC/Settings/IO.hs +++ b/compiler/GHC/Settings/IO.hs @@ -234,7 +234,6 @@ getTargetPlatform settingsFile settings = do targetHasGnuNonexecStack <- getBooleanSetting "target has GNU nonexec stack" targetHasIdentDirective <- getBooleanSetting "target has .ident directive" targetHasSubsectionsViaSymbols <- getBooleanSetting "target has subsections via symbols" - targetHasLibm <- getBooleanSetting "target has libm" crossCompiling <- getBooleanSetting "cross compiling" tablesNextToCode <- getBooleanSetting "Tables next to code" @@ -249,6 +248,5 @@ getTargetPlatform settingsFile settings = do , platformIsCrossCompiling = crossCompiling , platformLeadingUnderscore = targetLeadingUnderscore , platformTablesNextToCode = tablesNextToCode - , platformHasLibm = targetHasLibm , platform_constants = Nothing -- will be filled later when loading (or building) the RTS unit } |