Initial hack on the new low-level compiler API.

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

diff --git a/ghc/compiler/main/StaticFlags.hs b/ghc/compiler/main/StaticFlags.hs
index ad65dfe..3067063 100644 (file)
--- a/ghc/compiler/main/StaticFlags.hs
+++ b/ghc/compiler/main/StaticFlags.hs
@@ -32,7 +32,6 @@ module StaticFlags (
         opt_MaxContextReductionDepth,
        opt_IrrefutableTuples,
        opt_Parallel,
-       opt_SMP,
        opt_RuntimeTypes,
        opt_Flatten,
 
@@ -125,7 +124,7 @@ static_flags = [
   ,  ( "ticky"         , NoArg (addWay WayTicky) )
   ,  ( "parallel"      , NoArg (addWay WayPar) )
   ,  ( "gransim"       , NoArg (addWay WayGran) )
-  ,  ( "smp"           , NoArg (addWay WaySMP) )
+  ,  ( "smp"           , NoArg (addWay WayThreaded) ) -- backwards compat.
   ,  ( "debug"         , NoArg (addWay WayDebug) )
   ,  ( "ndp"           , NoArg (addWay WayNDP) )
   ,  ( "threaded"      , NoArg (addWay WayThreaded) )
@@ -256,7 +255,6 @@ 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_SMP                                = lookUp  FSLIT("-fsmp")
 opt_Flatten                    = lookUp  FSLIT("-fflatten")
 
 -- optimisation opts
@@ -315,7 +313,6 @@ isStaticFlag f =
        "fdicts-strict",
        "firrefutable-tuples",
        "fparallel",
-       "fsmp",
        "fflatten",
        "fsemi-tagging",
        "flet-no-escape",
@@ -419,7 +416,6 @@ data WayName
   | WayTicky
   | WayPar
   | WayGran
-  | WaySMP
   | WayNDP
   | WayUser_a
   | WayUser_b
@@ -455,7 +451,6 @@ allowed_combination way = and [ x `allowedWith` y
 
        WayThreaded `allowedWith` WayProf       = True
        WayProf `allowedWith` WayUnreg          = True
-       WayProf `allowedWith` WaySMP            = True
        WayProf `allowedWith` WayNDP            = True
        _ `allowedWith` _                       = False
 
@@ -558,16 +553,6 @@ way_details =
        , "-optc-DGRAN"
        , "-package concurrent" ]),
 
-    (WaySMP, Way  "s" False "SMP"
-       [ "-fsmp"
-#if !defined(mingw32_TARGET_OS)
-       , "-optc-pthread"
-#endif
-#if !defined(mingw32_TARGET_OS) && !defined(freebsd_TARGET_OS)
-       , "-optl-pthread"
-#endif
-       , "-optc-DSMP" ]),
-
     (WayNDP, Way  "ndp" False "Nested data parallelism"
        [ "-fparr"
        , "-fflatten"]),