summaryrefslogtreecommitdiff
path: root/compiler/codeGen
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2012-06-20 15:31:19 +0100
committerIan Lynagh <igloo@earth.li>2012-06-20 15:32:51 +0100
commitad3d65cd3d3d6e3831e5f842d27bbb6c33539a83 (patch)
tree87cc88cb2eddc4df1e1f4834ea6402e777ef6703 /compiler/codeGen
parent506d37b012843e7431cc36a2ed0a07b297831529 (diff)
downloadhaskell-ad3d65cd3d3d6e3831e5f842d27bbb6c33539a83.tar.gz
Make -fparallel a dynamic flag
Diffstat (limited to 'compiler/codeGen')
-rw-r--r--compiler/codeGen/ClosureInfo.lhs4
-rw-r--r--compiler/codeGen/StgCmmClosure.hs4
2 files changed, 4 insertions, 4 deletions
diff --git a/compiler/codeGen/ClosureInfo.lhs b/compiler/codeGen/ClosureInfo.lhs
index ac60677bbd..7a91a5e2a1 100644
--- a/compiler/codeGen/ClosureInfo.lhs
+++ b/compiler/codeGen/ClosureInfo.lhs
@@ -649,8 +649,8 @@ getCallMethod :: DynFlags
-> RepArity -- Number of available arguments
-> CallMethod
-getCallMethod _ _ _ lf_info _
- | nodeMustPointToIt lf_info && opt_Parallel
+getCallMethod dflags _ _ lf_info _
+ | nodeMustPointToIt lf_info && dopt Opt_Parallel dflags
= -- If we're parallel, then we must always enter via node.
-- The reason is that the closure may have been
-- fetched since we allocated it.
diff --git a/compiler/codeGen/StgCmmClosure.hs b/compiler/codeGen/StgCmmClosure.hs
index aaecdd3e4b..483a67c1fa 100644
--- a/compiler/codeGen/StgCmmClosure.hs
+++ b/compiler/codeGen/StgCmmClosure.hs
@@ -474,8 +474,8 @@ getCallMethod :: DynFlags
-> RepArity -- Number of available arguments
-> CallMethod
-getCallMethod _ _name _ lf_info _n_args
- | nodeMustPointToIt lf_info && opt_Parallel
+getCallMethod dflags _name _ lf_info _n_args
+ | nodeMustPointToIt lf_info && dopt Opt_Parallel dflags
= -- If we're parallel, then we must always enter via node.
-- The reason is that the closure may have been
-- fetched since we allocated it.