projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FIX #1110: the linker also needs the workaround
[ghc-hetmet.git]
/
compiler
/
codeGen
/
CodeGen.lhs
diff --git
a/compiler/codeGen/CodeGen.lhs
b/compiler/codeGen/CodeGen.lhs
index
3b7fc0a
..
13e9c4a
100644
(file)
--- a/
compiler/codeGen/CodeGen.lhs
+++ b/
compiler/codeGen/CodeGen.lhs
@@
-152,7
+152,7
@@
mkModuleInit dflags way cost_centre_info this_mod main_mod foreign_stubs importe
emitData Data [CmmDataLabel moduleRegdLabel,
CmmStaticLit zeroCLit]
emitData Data [CmmDataLabel moduleRegdLabel,
CmmStaticLit zeroCLit]
- ; whenC (dopt Opt_Hpc dflags) $
+ ; whenC (opt_Hpc) $
hpcTable this_mod hpc_info
-- we emit a recursive descent module search for all modules
hpcTable this_mod hpc_info
-- we emit a recursive descent module search for all modules
@@
-210,7
+210,7
@@
mkModuleInit dflags way cost_centre_info this_mod main_mod foreign_stubs importe
; whenC (opt_SccProfilingOn) $ do
initCostCentres cost_centre_info
; whenC (opt_SccProfilingOn) $ do
initCostCentres cost_centre_info
- ; whenC (dopt Opt_Hpc dflags) $
+ ; whenC (opt_Hpc) $
initHpc this_mod hpc_info
; mapCs (registerModuleImport this_pkg way)
initHpc this_mod hpc_info
; mapCs (registerModuleImport this_pkg way)
@@
-224,7
+224,7
@@
mkModuleInit dflags way cost_centre_info this_mod main_mod foreign_stubs importe
, CmmJump (CmmLoad (cmmRegOffW spReg (-1)) wordRep) [] ]
, CmmJump (CmmLoad (cmmRegOffW spReg (-1)) wordRep) [] ]
- rec_descent_init = if opt_SccProfilingOn || dopt Opt_Hpc dflags
+ rec_descent_init = if opt_SccProfilingOn || opt_Hpc
then jump_to_init
else ret_code
then jump_to_init
else ret_code
@@
-350,7
+350,7
@@
maybeExternaliseId dflags id
name = idName id
uniq = nameUnique name
new_occ = mkLocalOcc uniq (nameOccName name)
name = idName id
uniq = nameUnique name
new_occ = mkLocalOcc uniq (nameOccName name)
- loc = nameSrcLoc name
+ loc = nameSrcSpan name
-- We want to conjure up a name that can't clash with any
-- existing name. So we generate
-- Mod_$L243foo
-- We want to conjure up a name that can't clash with any
-- existing name. So we generate
-- Mod_$L243foo