diff options
| author | Dimitrios Vytiniotis <dimitris@microsoft.com> | 2011-11-29 19:20:33 +0000 |
|---|---|---|
| committer | Dimitrios Vytiniotis <dimitris@microsoft.com> | 2011-11-29 19:20:33 +0000 |
| commit | 42e3b5bd3ee9c555adaaf1e5a12f7ddd71423c0c (patch) | |
| tree | 0e8ca1886f847d878ab9b9126c2268e4c8b54a1b /compiler/nativeGen/X86/CodeGen.hs | |
| parent | e4d87e140697bcb380cc51a5aee598409930281e (diff) | |
| parent | 1f7433b7b998dda4dde6d09f22a37f637745c079 (diff) | |
| download | haskell-42e3b5bd3ee9c555adaaf1e5a12f7ddd71423c0c.tar.gz | |
Merge branch 'master' of http://darcs.haskell.org//ghc
Diffstat (limited to 'compiler/nativeGen/X86/CodeGen.hs')
| -rw-r--r-- | compiler/nativeGen/X86/CodeGen.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/nativeGen/X86/CodeGen.hs b/compiler/nativeGen/X86/CodeGen.hs index 97baeec1ab..5f0f716281 100644 --- a/compiler/nativeGen/X86/CodeGen.hs +++ b/compiler/nativeGen/X86/CodeGen.hs @@ -160,7 +160,7 @@ stmtToInstrs stmt = do where ty = cmmExprType src size = cmmTypeSize ty - CmmCall target result_regs args _ _ + CmmCall target result_regs args _ -> genCCall is32Bit target result_regs args CmmBranch id -> genBranch id @@ -1996,7 +1996,7 @@ outOfLineCmmOp mop res args targetExpr <- cmmMakeDynamicReference dflags addImportNat CallReference lbl let target = CmmCallee targetExpr CCallConv - stmtToInstrs (CmmCall target (catMaybes [res]) args' CmmUnsafe CmmMayReturn) + stmtToInstrs (CmmCall target (catMaybes [res]) args' CmmMayReturn) where -- Assume we can call these functions directly, and that they're not in a dynamic library. -- TODO: Why is this ok? Under linux this code will be in libm.so |