diff options
author | Me at work <simonmar-work@simonmar-laptop.(none)> | 2012-02-14 11:49:53 +0000 |
---|---|---|
committer | Me at work <simonmar-work@simonmar-laptop.(none)> | 2012-02-14 11:49:53 +0000 |
commit | 1e07bd74037127d3b9c90f7e7246c6761fced953 (patch) | |
tree | f8b976de22b854bd1c98e73a54bc8cb464eb9335 /compiler/codeGen/StgCmmForeign.hs | |
parent | 8fb67a2a9c798976cefecb8d69d73fde5383c4f1 (diff) | |
parent | 5cf9c0191566a3fd806a12e58b93ee813d4528f9 (diff) | |
download | haskell-1e07bd74037127d3b9c90f7e7246c6761fced953.tar.gz |
Merge remote-tracking branch 'laptop/newcg' into newcg
Diffstat (limited to 'compiler/codeGen/StgCmmForeign.hs')
-rw-r--r-- | compiler/codeGen/StgCmmForeign.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/codeGen/StgCmmForeign.hs b/compiler/codeGen/StgCmmForeign.hs index d6aa19a2da..f1a522b37d 100644 --- a/compiler/codeGen/StgCmmForeign.hs +++ b/compiler/codeGen/StgCmmForeign.hs @@ -241,7 +241,7 @@ nursery_bdescr_blocks = cmmOffset stgCurrentNursery oFFSET_bdescr_blocks tso_stackobj, tso_CCCS, stack_STACK, stack_SP :: ByteOff tso_stackobj = closureField oFFSET_StgTSO_stackobj -tso_CCCS = closureField oFFSET_StgTSO_CCCS +tso_CCCS = closureField oFFSET_StgTSO_cccs stack_STACK = closureField oFFSET_StgStack_stack stack_SP = closureField oFFSET_StgStack_sp |