diff options
| author | Ian Lynagh <igloo@earth.li> | 2011-10-02 01:31:05 +0100 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2011-10-02 16:39:08 +0100 |
| commit | ac7a7eb93397a2343402f77f1a8a8b4a0e0298df (patch) | |
| tree | 86fae1d7598b2ddb94b1c00906468eb54af9a48e /compiler/codeGen/CgCon.lhs | |
| parent | d8d161749c8b13c3db802f348761cff662741c53 (diff) | |
| download | haskell-ac7a7eb93397a2343402f77f1a8a8b4a0e0298df.tar.gz | |
More CPP removal: pprDynamicLinkerAsmLabel in CLabel
And some knock-on changes
Diffstat (limited to 'compiler/codeGen/CgCon.lhs')
| -rw-r--r-- | compiler/codeGen/CgCon.lhs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/compiler/codeGen/CgCon.lhs b/compiler/codeGen/CgCon.lhs index 889b1db752..a675c5625c 100644 --- a/compiler/codeGen/CgCon.lhs +++ b/compiler/codeGen/CgCon.lhs @@ -47,6 +47,7 @@ import Outputable import ListSetOps import Util import Module +import DynFlags import FastString import StaticFlags \end{code} @@ -64,7 +65,7 @@ cgTopRhsCon :: Id -- Name of thing bound to this RHS -> [StgArg] -- Args -> FCode (Id, CgIdInfo) cgTopRhsCon id con args - = do { + = do { dflags <- getDynFlags #if mingw32_TARGET_OS -- Windows DLLs have a problem with static cross-DLL refs. ; this_pkg <- getThisPackage @@ -76,6 +77,7 @@ cgTopRhsCon id con args ; amodes <- getArgAmodes args ; let + platform = targetPlatform dflags name = idName id lf_info = mkConLFInfo con closure_label = mkClosureLabel name $ idCafInfo id @@ -89,7 +91,7 @@ cgTopRhsCon id con args payload = map get_lit amodes_w_offsets get_lit (CmmLit lit, _offset) = lit - get_lit other = pprPanic "CgCon.get_lit" (ppr other) + get_lit other = pprPanic "CgCon.get_lit" (pprPlatform platform other) -- NB1: amodes_w_offsets is sorted into ptrs first, then non-ptrs -- NB2: all the amodes should be Lits! |