diff options
| author | Patrick Palka <patrick@parcs.ath.cx> | 2013-09-08 22:10:50 -0400 |
|---|---|---|
| committer | Patrick Palka <patrick@parcs.ath.cx> | 2013-09-08 22:10:50 -0400 |
| commit | 783ca393d9b262fe0efc6308e71c95a2da0eda1a (patch) | |
| tree | d515913f550abc335500613a02c1311d6e12e341 /compiler/llvmGen/LlvmCodeGen | |
| parent | a58ba1856451447350132f20637deb898ebee252 (diff) | |
| parent | 2cec084e45392e0b0d198254017b140accee32f0 (diff) | |
| download | haskell-ghc-parmake-gsoc.tar.gz | |
Merge remote-tracking branch 'origin/master' into ghc-parmake-gsocghc-parmake-gsoc
Diffstat (limited to 'compiler/llvmGen/LlvmCodeGen')
| -rw-r--r-- | compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/compiler/llvmGen/LlvmCodeGen/CodeGen.hs b/compiler/llvmGen/LlvmCodeGen/CodeGen.hs index 6f898fa56c..def9e2b81e 100644 --- a/compiler/llvmGen/LlvmCodeGen/CodeGen.hs +++ b/compiler/llvmGen/LlvmCodeGen/CodeGen.hs @@ -296,6 +296,7 @@ genCall target res args = do CCallConv -> CC_Ccc CApiConv -> CC_Ccc PrimCallConv -> panic "LlvmCodeGen.CodeGen.genCall: PrimCallConv" + JavaScriptCallConv -> panic "LlvmCodeGen.CodeGen.genCall: JavaScriptCallConv" PrimTarget _ -> CC_Ccc |