merge upstream HEAD

[ghc-hetmet.git] / compiler / main / StaticFlagParser.hs

diff --git a/compiler/main/StaticFlagParser.hs b/compiler/main/StaticFlagParser.hs
index 7d499e6..5767a52 100644 (file)
--- a/compiler/main/StaticFlagParser.hs
+++ b/compiler/main/StaticFlagParser.hs
@@ -121,15 +121,21 @@ static_flags = [
     -- is required to get the RTS ticky support.
 
         ------ Debugging ----------------------------------------------------
-  , Flag "dppr-debug"                (PassFlag addOpt)
-  , Flag "dsuppress-uniques"         (PassFlag addOpt)
-  , Flag "dsuppress-coercions"       (PassFlag addOpt)
-  , Flag "dsuppress-module-prefixes" (PassFlag addOpt)
-  , Flag "dppr-user-length"          (AnySuffix addOpt)
-  , Flag "dopt-fuel"                 (AnySuffix addOpt)
-  , Flag "dtrace-level"              (AnySuffix addOpt)
-  , Flag "dno-debug-output"          (PassFlag addOpt)
-  , Flag "dstub-dead-values"         (PassFlag addOpt)
+  , Flag "dppr-debug"                  (PassFlag addOpt)
+  , Flag "dppr-cols"                   (AnySuffix addOpt)
+  , Flag "dppr-user-length"            (AnySuffix addOpt)
+  , Flag "dppr-case-as-let"            (PassFlag addOpt)
+  , Flag "dsuppress-all"               (PassFlag addOpt)
+  , Flag "dsuppress-uniques"           (PassFlag addOpt)
+  , Flag "dsuppress-coercions"         (PassFlag addOpt)
+  , Flag "dsuppress-module-prefixes"   (PassFlag addOpt)
+  , Flag "dsuppress-type-applications" (PassFlag addOpt)
+  , Flag "dsuppress-idinfo"            (PassFlag addOpt)
+  , Flag "dsuppress-type-signatures"   (PassFlag addOpt)
+  , Flag "dopt-fuel"                   (AnySuffix addOpt)
+  , Flag "dtrace-level"                (AnySuffix addOpt)
+  , Flag "dno-debug-output"            (PassFlag addOpt)
+  , Flag "dstub-dead-values"           (PassFlag addOpt)
       -- rest of the debugging flags are dynamic
 
         ----- Linker --------------------------------------------------------
@@ -177,9 +183,9 @@ isStaticFlag f =
     "dno-black-holing",
     "fno-state-hack",
     "fsimple-list-literals",
-    "fno-ds-multi-tyvar",
     "fruntime-types",
     "fno-pre-inlining",
+    "fno-opt-coercion",
     "fexcess-precision",
     "static",
     "fhardwire-lib-paths",
@@ -204,7 +210,6 @@ unregFlags :: [Located String]
 unregFlags = map (mkGeneralLocated "in unregFlags")
    [ "-optc-DNO_REGS"
    , "-optc-DUSE_MINIINTERPRETER"
-   , "-fno-asm-mangling"
    , "-funregisterised" ]
 
 -----------------------------------------------------------------------------