[commit: ghc] master: fix merge bugs (a0020c1)

[Simon Marlow]

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/a0020c1eed97d5b7f81f06194f4adb21825c0ac5

>---------------------------------------------------------------

commit a0020c1eed97d5b7f81f06194f4adb21825c0ac5
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Mon Jul 30 13:16:37 2012 +0100

    fix merge bugs

>---------------------------------------------------------------

 compiler/nativeGen/SPARC/Ppr.hs |    6 +++---
 compiler/nativeGen/X86/Ppr.hs   |    8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/compiler/nativeGen/SPARC/Ppr.hs b/compiler/nativeGen/SPARC/Ppr.hs
index 8a57619..b384b6e 100644
--- a/compiler/nativeGen/SPARC/Ppr.hs
+++ b/compiler/nativeGen/SPARC/Ppr.hs
@@ -68,7 +68,7 @@ pprNatCmmDecl proc@(CmmProc _ lbl (ListGraph blocks)) =
       pprSectionHeader Text $$
       (
            (if platformHasSubsectionsViaSymbols platform
-            then pprCLabel (mkDeadStripPreventer info_lbl) <> char ':'
+            then ppr (mkDeadStripPreventer info_lbl) <> char ':'
             else empty) $$
            vcat (map pprData info) $$
            pprLabel info_lbl
@@ -85,9 +85,9 @@ pprNatCmmDecl proc@(CmmProc _ lbl (ListGraph blocks)) =
              -- so that the linker will not think it is unreferenced and dead-strip
              -- it. That's why the label is called a DeadStripPreventer (_dsp).
                       text "\t.long "
-                  <+> pprCLabel info_lbl
+                  <+> ppr info_lbl
                   <+> char '-'
-                  <+> pprCLabel (mkDeadStripPreventer info_lbl)
+                  <+> ppr (mkDeadStripPreventer info_lbl)
              else empty)
 
 
diff --git a/compiler/nativeGen/X86/Ppr.hs b/compiler/nativeGen/X86/Ppr.hs
index c935eb8..743d79c 100644
--- a/compiler/nativeGen/X86/Ppr.hs
+++ b/compiler/nativeGen/X86/Ppr.hs
@@ -67,7 +67,7 @@ pprNatCmmDecl proc@(CmmProc top_info lbl (ListGraph blocks)) =
     Just (Statics info_lbl info) ->
       sdocWithPlatform $ \platform ->
       (if platformHasSubsectionsViaSymbols platform
-          then pprCLabel (mkDeadStripPreventer info_lbl) <> char ':'
+          then ppr (mkDeadStripPreventer info_lbl) <> char ':'
           else empty) $$
       vcat (map (pprBasicBlock top_info) blocks) $$
          -- above: Even the first block gets a label, because with branch-chain
@@ -81,9 +81,9 @@ pprNatCmmDecl proc@(CmmProc top_info lbl (ListGraph blocks)) =
              -- so that the linker will not think it is unreferenced and dead-strip
              -- it. That's why the label is called a DeadStripPreventer (_dsp).
                       text "\t.long "
-                  <+> pprCLabel info_lbl
+                  <+> ppr info_lbl
                   <+> char '-'
-                  <+> pprCLabel (mkDeadStripPreventer info_lbl)
+                  <+> ppr (mkDeadStripPreventer info_lbl)
              else empty) $$
       pprSizeDecl info_lbl
 
@@ -107,7 +107,7 @@ pprBasicBlock info_env (BasicBlock blockid instrs)
        Just (Statics info_lbl info) ->
            pprSectionHeader Text $$
            vcat (map pprData info) $$
-           pprLabel platform info_lbl
+           pprLabel info_lbl
 
 pprDatas :: (Alignment, CmmStatics) -> SDoc
 pprDatas (align, (Statics lbl dats))