X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FabsCSyn%2FPprAbsC.lhs;h=c90b9b4443c2310ba68b2ab366c5ed5f5b491ceb;hb=511ec7f33db67d0daa4919bc06043b1e92879318;hp=e2210b2fe5416a52ce663e35df15b8945da788a9;hpb=2d9800cc39adb46f790e754189bfbaafd3ce0407;p=ghc-hetmet.git

diff --git a/ghc/compiler/absCSyn/PprAbsC.lhs b/ghc/compiler/absCSyn/PprAbsC.lhs
index e2210b2..c90b9b4 100644
--- a/ghc/compiler/absCSyn/PprAbsC.lhs
+++ b/ghc/compiler/absCSyn/PprAbsC.lhs
@@ -361,13 +361,14 @@ pprAbsC (CCodeBlock lbl abs_C) _
     else
     case (pprTempAndExternDecls abs_C) of { (pp_temps, pp_exts) ->
     vcat [
-        char ' ',
+        empty,
+	pp_exts, 
 	hcat [text (if (externallyVisibleCLabel lbl)
 			  then "FN_("	-- abbreviations to save on output
 			  else "IFN_("),
 		   pprCLabel lbl, text ") {"],
 
-	pp_exts, pp_temps,
+	pp_temps,
 
 	nest 8 (ptext SLIT("FB_")),
 	nest 8 (pprAbsC abs_C (costs abs_C)),
@@ -599,16 +600,14 @@ ppLocalnessMacro include_dyn_prefix clabel =
   where
    is_visible = externallyVisibleCLabel clabel
    label_type = labelType clabel
-   is_dynamic = labelDynamic clabel
 
    visiblity_prefix
      | is_visible = char 'E'
      | otherwise  = char 'I'
 
    dyn_prefix
-     | not include_dyn_prefix = empty
-     | is_dynamic	      = char 'D'
-     | otherwise	      = empty
+     | include_dyn_prefix && labelDynamic clabel = char 'D'
+     | otherwise	      			 = empty
 
 \end{code}
 
@@ -1295,7 +1294,7 @@ pprUnionTag AddrRep		= char 'a'
 pprUnionTag FloatRep		= char 'f'
 pprUnionTag DoubleRep		= panic "pprUnionTag:Double?"
 
-pprUnionTag StablePtrRep	= char 'i'
+pprUnionTag StablePtrRep	= char 'p'
 pprUnionTag StableNameRep	= char 'p'
 pprUnionTag WeakPtrRep		= char 'p'
 pprUnionTag ForeignObjRep	= char 'p'