diff options
| author | Simon Marlow <simonmar@microsoft.com> | 2006-02-09 15:44:49 +0000 |
|---|---|---|
| committer | Simon Marlow <simonmar@microsoft.com> | 2006-02-09 15:44:49 +0000 |
| commit | eba7b660a36878cd8d926845807913d7ec5734c9 (patch) | |
| tree | 66222153e7d3718ace78c27e5784ca3a3f0b9221 /ghc/compiler/main | |
| parent | 608bc3f3ad6fca14a23529f314dbd9d3342a9507 (diff) | |
| download | haskell-eba7b660a36878cd8d926845807913d7ec5734c9.tar.gz | |
Merge the smp and threaded RTS ways
Now, the threaded RTS also includes SMP support. The -smp flag is a
synonym for -threaded. The performance implications of this are small
to negligible, and it results in a code cleanup and reduces the number
of combinations we have to test.
Diffstat (limited to 'ghc/compiler/main')
| -rw-r--r-- | ghc/compiler/main/StaticFlags.hs | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/ghc/compiler/main/StaticFlags.hs b/ghc/compiler/main/StaticFlags.hs index 4e2e44efdf..3067063f7b 100644 --- a/ghc/compiler/main/StaticFlags.hs +++ b/ghc/compiler/main/StaticFlags.hs @@ -124,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) ) @@ -416,7 +416,6 @@ data WayName | WayTicky | WayPar | WayGran - | WaySMP | WayNDP | WayUser_a | WayUser_b @@ -554,16 +553,6 @@ way_details = , "-optc-DGRAN" , "-package concurrent" ]), - (WaySMP, Way "s" True "SMP" - [ -#if !defined(mingw32_TARGET_OS) - "-optc-pthread" -#endif -#if !defined(mingw32_TARGET_OS) && !defined(freebsd_TARGET_OS) - , "-optl-pthread" -#endif - ]), - (WayNDP, Way "ndp" False "Nested data parallelism" [ "-fparr" , "-fflatten"]), |