diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2012-07-30 13:16:37 +0100 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2012-07-30 13:16:37 +0100 |
| commit | a0020c1eed97d5b7f81f06194f4adb21825c0ac5 (patch) | |
| tree | bc56b12a4555d1a263f93eda3b8e2801098a6336 /compiler/nativeGen | |
| parent | a2e0fbe50513da4aa8749c3b2bccc41e73808adf (diff) | |
| download | haskell-a0020c1eed97d5b7f81f06194f4adb21825c0ac5.tar.gz | |
fix merge bugs
Diffstat (limited to 'compiler/nativeGen')
| -rw-r--r-- | compiler/nativeGen/SPARC/Ppr.hs | 6 | ||||
| -rw-r--r-- | 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 8a5761990e..b384b6e0ba 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 c935eb8ab0..743d79c5ff 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)) |