From c970ab42e9abaf91c35e167acf1b8fe0e9e61dbd Mon Sep 17 00:00:00 2001 From: "naur@post11.tele.dk" Date: Sat, 3 Apr 2010 18:16:56 +0000 Subject: [PATCH] Fix error compiling AsmCodeGen.lhs for PPC Mac (mkRtsCodeLabel) The error messages eliminated are: > compiler/nativeGen/AsmCodeGen.lhs:875:31: > Not in scope: `mkRtsCodeLabel' > compiler/nativeGen/AsmCodeGen.lhs:879:31: > Not in scope: `mkRtsCodeLabel' > compiler/nativeGen/AsmCodeGen.lhs:883:31: > Not in scope: `mkRtsCodeLabel' --- compiler/nativeGen/AsmCodeGen.lhs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/nativeGen/AsmCodeGen.lhs b/compiler/nativeGen/AsmCodeGen.lhs index 615cc0c..30af913 100644 --- a/compiler/nativeGen/AsmCodeGen.lhs +++ b/compiler/nativeGen/AsmCodeGen.lhs @@ -872,15 +872,15 @@ cmmExprConFold referenceKind expr CmmReg (CmmGlobal EagerBlackholeInfo) | not opt_PIC -> cmmExprConFold referenceKind $ - CmmLit (CmmLabel (mkRtsCodeLabel (sLit "__stg_EAGER_BLACKHOLE_INFO"))) + CmmLit (CmmLabel (mkCmmCodeLabel rtsPackageId (fsLit "__stg_EAGER_BLACKHOLE_INFO"))) CmmReg (CmmGlobal GCEnter1) | not opt_PIC -> cmmExprConFold referenceKind $ - CmmLit (CmmLabel (mkRtsCodeLabel (sLit "__stg_gc_enter_1"))) + CmmLit (CmmLabel (mkCmmCodeLabel rtsPackageId (fsLit "__stg_gc_enter_1"))) CmmReg (CmmGlobal GCFun) | not opt_PIC -> cmmExprConFold referenceKind $ - CmmLit (CmmLabel (mkRtsCodeLabel (sLit "__stg_gc_fun"))) + CmmLit (CmmLabel (mkCmmCodeLabel rtsPackageId (fsLit "__stg_gc_fun"))) #endif CmmReg (CmmGlobal mid) -- 1.7.10.4