projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Adjust code from manual merges
[ghc-hetmet.git]
/
compiler
/
codeGen
/
CgHpc.hs
diff --git
a/compiler/codeGen/CgHpc.hs
b/compiler/codeGen/CgHpc.hs
index
82ea54a
..
d5f3542
100644
(file)
--- a/
compiler/codeGen/CgHpc.hs
+++ b/
compiler/codeGen/CgHpc.hs
@@
-48,7
+48,11
@@
cgTickBox mod n = do
[ CmmLoad ext_tick_box I32
, CmmLit (CmmInt (fromIntegral n) I32)
]
- , NoHint) ]
+ , NoHint)
+ , ( CmmReg (CmmGlobal CurrentTSO)
+ , PtrHint
+ )
+ ]
(Just [])
where
visible_tick = mkFastString "hs_hpc_tick"