X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FStaticFlags.hs;h=68c50c8aa6863d1171e4420468c03ab5a3c2530b;hb=78bfe2ad25ff34cefa14e7f11093923f5d1e940f;hp=8843bc674604a9115e1b81e7ecf776b7ec100f9d;hpb=3b3abf5905882f769cfab419450b5db1783416b3;p=ghc-hetmet.git diff --git a/compiler/main/StaticFlags.hs b/compiler/main/StaticFlags.hs index 8843bc6..68c50c8 100644 --- a/compiler/main/StaticFlags.hs +++ b/compiler/main/StaticFlags.hs @@ -29,7 +29,6 @@ module StaticFlags ( -- language opts opt_DictsStrict, - opt_MaxContextReductionDepth, opt_IrrefutableTuples, opt_Parallel, opt_RuntimeTypes, @@ -53,39 +52,38 @@ module StaticFlags ( opt_UF_UpdateInPlace, opt_UF_DearOp, + -- Related to linking + opt_PIC, + opt_Static, + -- misc opts opt_IgnoreDotGhci, opt_ErrorSpans, - opt_EmitCExternDecls, opt_GranMacros, opt_HiVersion, opt_HistorySize, opt_OmitBlackHoling, - opt_Static, opt_Unregisterised, opt_EmitExternalCore, - opt_PIC, v_Ld_inputs, + tablesNextToCode ) where #include "HsVersions.h" -import Util ( consIORef ) import CmdLineParser -import Config ( cProjectVersionInt, cProjectPatchLevel, - cGhcUnregisterised ) +import Config import FastString ( FastString, mkFastString ) import Util import Maybes ( firstJust ) import Panic ( GhcException(..), ghcError ) -import Constants ( mAX_CONTEXT_REDUCTION_DEPTH ) -import EXCEPTION ( throwDyn ) -import DATA_IOREF -import UNSAFE_IO ( unsafePerformIO ) -import Monad ( when ) -import Char ( isDigit ) -import List ( sort, intersperse ) +import Control.Exception ( throwDyn ) +import Data.IORef +import System.IO.Unsafe ( unsafePerformIO ) +import Control.Monad ( when ) +import Data.Char ( isDigit ) +import Data.List ( sort, intersperse, nub ) ----------------------------------------------------------------------------- -- Static flags @@ -104,15 +102,32 @@ parseStaticFlags args = do | otherwise = [] (more_leftover, errs) <- processArgs static_flags (unreg_flags ++ way_flags) + + -- TABLES_NEXT_TO_CODE affects the info table layout. + -- Be careful to do this *after* all processArgs, + -- because evaluating tablesNextToCode involves looking at the global + -- static flags. Those pesky global variables... + let cg_flags | tablesNextToCode = ["-optc-DTABLES_NEXT_TO_CODE"] + | otherwise = [] + when (not (null errs)) $ ghcError (UsageError (unlines errs)) - return (more_leftover++leftover) + return (cg_flags++more_leftover++leftover) --- note that ordering is important in the following list: any flag which +static_flags :: [(String, OptKind IO)] +-- All the static flags should appear in this list. It describes how each +-- static flag should be processed. Two main purposes: +-- (a) if a command-line flag doesn't appear in the list, GHC can complain +-- (b) a command-line flag may remove, or add, other flags; e.g. the "-fno-X" things +-- +-- The common (PassFlag addOpt) action puts the static flag into the bunch of +-- things that are searched up by the top-level definitions like +-- opt_foo = lookUp FSLIT("-dfoo") + +-- Note that ordering is important in the following list: any flag which -- is a prefix flag (i.e. HasArg, Prefix, OptPrefix, AnySuffix) will override -- flags further down the list with the same prefix. -static_flags :: [(String, OptKind IO)] static_flags = [ ------- GHCi ------------------------------------------------------- ( "ignore-dot-ghci", PassFlag addOpt ) @@ -131,7 +146,6 @@ static_flags = [ -- ToDo: user ways ------ Debugging ---------------------------------------------------- - , ( "dppr-noprags", PassFlag addOpt ) , ( "dppr-debug", PassFlag addOpt ) , ( "dppr-user-length", AnySuffix addOpt ) -- rest of the debugging flags are dynamic @@ -253,7 +267,6 @@ opt_DoTickyProfiling = lookUp FSLIT("-fticky-ticky") -- language opts opt_DictsStrict = lookUp FSLIT("-fdicts-strict") opt_IrrefutableTuples = lookUp FSLIT("-firrefutable-tuples") -opt_MaxContextReductionDepth = lookup_def_int "-fcontext-stack" mAX_CONTEXT_REDUCTION_DEPTH opt_Parallel = lookUp FSLIT("-fparallel") opt_Flatten = lookUp FSLIT("-fflatten") @@ -266,7 +279,6 @@ opt_RulesOff = lookUp FSLIT("-frules-off") opt_LiberateCaseThreshold = lookup_def_int "-fliberate-case-threshold" (10::Int) opt_MaxWorkerArgs = lookup_def_int "-fmax-worker-args" (10::Int) -opt_EmitCExternDecls = lookUp FSLIT("-femit-extern-decls") opt_GranMacros = lookUp FSLIT("-fgransim") opt_HiVersion = read (cProjectVersionInt ++ cProjectPatchLevel) :: Int opt_HistorySize = lookup_def_int "-fhistory-size" 20 @@ -288,14 +300,22 @@ opt_UF_UpdateInPlace = lookUp FSLIT("-funfolding-update-in-place") opt_UF_DearOp = ( 4 :: Int) +opt_PIC = lookUp FSLIT("-fPIC") opt_Static = lookUp FSLIT("-static") opt_Unregisterised = lookUp FSLIT("-funregisterised") + +-- Derived, not a real option. 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/InfoTables.h. +tablesNextToCode = not opt_Unregisterised + && cGhcEnableTablesNextToCode == "YES" + opt_EmitExternalCore = lookUp FSLIT("-fext-core") -- Include full span info in error messages, instead of just the start position. opt_ErrorSpans = lookUp FSLIT("-ferror-spans") -opt_PIC = lookUp FSLIT("-fPIC") -- object files and libraries to be linked in are collected here. -- ToDo: perhaps this could be done without a global, it wasn't obvious @@ -309,15 +329,10 @@ isStaticFlag f = "fauto-sccs-on-individual-cafs", "fscc-profiling", "fticky-ticky", - "fall-strict", "fdicts-strict", "firrefutable-tuples", "fparallel", "fflatten", - "fsemi-tagging", - "flet-no-escape", - "femit-extern-decls", - "fglobalise-toplev-names", "fgransim", "fno-hi-version-check", "dno-black-holing", @@ -330,14 +345,12 @@ isStaticFlag f = "static", "funregisterised", "fext-core", - "frule-check", "frules-off", "fcpr-off", "ferror-spans", "fPIC" ] || any (flip prefixMatch f) [ - "fcontext-stack", "fliberate-case-threshold", "fmax-worker-args", "fhistory-size", @@ -449,7 +462,6 @@ allowed_combination way = and [ x `allowedWith` y _ `allowedWith` WayDebug = True WayDebug `allowedWith` _ = True - WayThreaded `allowedWith` WayProf = True WayProf `allowedWith` WayUnreg = True WayProf `allowedWith` WayNDP = True _ `allowedWith` _ = False @@ -458,7 +470,7 @@ allowed_combination way = and [ x `allowedWith` y findBuildTag :: IO [String] -- new options findBuildTag = do way_names <- readIORef v_Ways - let ws = sort way_names + let ws = sort (nub way_names) if not (allowed_combination ws) then throwDyn (CmdLineError $ "combination not supported: " ++ @@ -492,8 +504,13 @@ way_details :: [ (WayName, Way) ] way_details = [ (WayThreaded, Way "thr" True "Threaded" [ #if defined(freebsd_TARGET_OS) - "-optc-pthread" - , "-optl-pthread" +-- "-optc-pthread" +-- , "-optl-pthread" + -- FreeBSD's default threading library is the KSE-based M:N libpthread, + -- which GHC has some problems with. It's currently not clear whether + -- the problems are our fault or theirs, but it seems that using the + -- alternative 1:1 threading library libthr works around it: + "-optl-lthr" #elif defined(solaris2_TARGET_OS) "-optl-lrt" #endif