X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FcodeGen%2FCodeGen.lhs;h=4302e84f56b637c4e7847227a25a5ec76a7db57d;hb=ead424357937b23f30295608b467aacbc3a8a8bc;hp=3b7fc0abe2511729a9209f1c6f43a43ebcc497d8;hpb=d5934bbb856aa0aa620c9b2e0fa51c90a1a5a048;p=ghc-hetmet.git diff --git a/compiler/codeGen/CodeGen.lhs b/compiler/codeGen/CodeGen.lhs index 3b7fc0a..4302e84 100644 --- 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] - ; whenC (dopt Opt_Hpc dflags) $ + ; whenC (opt_Hpc) $ 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 (dopt Opt_Hpc dflags) $ + ; whenC (opt_Hpc) $ 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) [] ] - 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