projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix deadlock on second call to newSession
[ghc-hetmet.git]
/
compiler
/
main
/
StaticFlags.hs
diff --git
a/compiler/main/StaticFlags.hs
b/compiler/main/StaticFlags.hs
index
b708ad0
..
4f4fe66
100644
(file)
--- a/
compiler/main/StaticFlags.hs
+++ b/
compiler/main/StaticFlags.hs
@@
-55,7
+55,6
@@
module StaticFlags (
-- misc opts
opt_IgnoreDotGhci,
opt_ErrorSpans,
-- misc opts
opt_IgnoreDotGhci,
opt_ErrorSpans,
- opt_EmitCExternDecls,
opt_GranMacros,
opt_HiVersion,
opt_HistorySize,
opt_GranMacros,
opt_HiVersion,
opt_HistorySize,
@@
-69,7
+68,6
@@
module StaticFlags (
#include "HsVersions.h"
#include "HsVersions.h"
-import Util ( consIORef )
import CmdLineParser
import Config ( cProjectVersionInt, cProjectPatchLevel,
cGhcUnregisterised )
import CmdLineParser
import Config ( cProjectVersionInt, cProjectPatchLevel,
cGhcUnregisterised )
@@
-78,11
+76,11
@@
import Util
import Maybes ( firstJust )
import Panic ( GhcException(..), ghcError )
import Maybes ( firstJust )
import Panic ( GhcException(..), ghcError )
-import EXCEPTION ( throwDyn )
-import DATA_IOREF
-import UNSAFE_IO ( unsafePerformIO )
-import Monad ( when )
-import Char ( isDigit )
+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 )
-----------------------------------------------------------------------------
import Data.List ( sort, intersperse, nub )
-----------------------------------------------------------------------------
@@
-263,7
+261,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_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
opt_GranMacros = lookUp FSLIT("-fgransim")
opt_HiVersion = read (cProjectVersionInt ++ cProjectPatchLevel) :: Int
opt_HistorySize = lookup_def_int "-fhistory-size" 20
@@
-306,14
+303,10
@@
isStaticFlag f =
"fauto-sccs-on-individual-cafs",
"fscc-profiling",
"fticky-ticky",
"fauto-sccs-on-individual-cafs",
"fscc-profiling",
"fticky-ticky",
- "fall-strict",
"fdicts-strict",
"firrefutable-tuples",
"fparallel",
"fflatten",
"fdicts-strict",
"firrefutable-tuples",
"fparallel",
"fflatten",
- "fsemi-tagging",
- "flet-no-escape",
- "femit-extern-decls",
"fgransim",
"fno-hi-version-check",
"dno-black-holing",
"fgransim",
"fno-hi-version-check",
"dno-black-holing",
@@
-326,7
+319,6
@@
isStaticFlag f =
"static",
"funregisterised",
"fext-core",
"static",
"funregisterised",
"fext-core",
- "frule-check",
"frules-off",
"fcpr-off",
"ferror-spans",
"frules-off",
"fcpr-off",
"ferror-spans",