diff options
| author | David Waern <david.waern@gmail.com> | 2011-11-29 02:09:28 +0100 |
|---|---|---|
| committer | David Waern <david.waern@gmail.com> | 2011-11-29 02:09:28 +0100 |
| commit | e26443e75fdf33301df22d6da4911e888bb10282 (patch) | |
| tree | 73bf733972ee973e0d5011bcd94c96a908753f56 /compiler/cmm | |
| parent | fdf98d6255deba9582dd475e6953b1bb49fba660 (diff) | |
| parent | 36f8cabecd5a8320ee174abb56e73841a5cbc9c7 (diff) | |
| download | haskell-e26443e75fdf33301df22d6da4911e888bb10282.tar.gz | |
Merge branch 'master' of http://darcs.haskell.org/ghc
Diffstat (limited to 'compiler/cmm')
| -rw-r--r-- | compiler/cmm/PprC.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/cmm/PprC.hs b/compiler/cmm/PprC.hs index a2ffd18649..4f8a061bdd 100644 --- a/compiler/cmm/PprC.hs +++ b/compiler/cmm/PprC.hs @@ -254,7 +254,7 @@ pprStmt platform stmt = case stmt of pprCFunType :: SDoc -> CCallConv -> [HintedCmmFormal] -> [HintedCmmActual] -> SDoc pprCFunType ppr_fn cconv ress args = res_type ress <+> - parens (text (ccallConvAttribute cconv) <> ppr_fn) <> + parens (ccallConvAttribute cconv <> ppr_fn) <> parens (commafy (map arg_type args)) where res_type [] = ptext (sLit "void") @@ -845,6 +845,7 @@ pprCall platform ppr_fn cconv results args _ -- change in the future... is_cishCC :: CCallConv -> Bool is_cishCC CCallConv = True +is_cishCC CApiConv = True is_cishCC StdCallConv = True is_cishCC CmmCallConv = False is_cishCC PrimCallConv = False |