diff options
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/ghci/LibFFI.hsc | 3 | ||||
| -rw-r--r-- | compiler/typecheck/TcForeign.lhs | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/compiler/ghci/LibFFI.hsc b/compiler/ghci/LibFFI.hsc index 9dd2a24021..86714effa4 100644 --- a/compiler/ghci/LibFFI.hsc +++ b/compiler/ghci/LibFFI.hsc @@ -53,7 +53,8 @@ convToABI CCallConv = fFI_DEFAULT_ABI #ifdef mingw32_HOST_OS convToABI StdCallConv = fFI_STDCALL #endif -convToABI _ = panic "convToABI: convention not supported" +-- unknown conventions are mapped to the default, (#3336) +convToABI _ = fFI_DEFAULT_ABI -- c.f. DsForeign.primTyDescChar primRepToFFIType :: PrimRep -> Ptr C_ffi_type diff --git a/compiler/typecheck/TcForeign.lhs b/compiler/typecheck/TcForeign.lhs index d42b37283b..73fd449d32 100644 --- a/compiler/typecheck/TcForeign.lhs +++ b/compiler/typecheck/TcForeign.lhs @@ -310,7 +310,8 @@ checkCConv CCallConv = return () #if i386_TARGET_ARCH checkCConv StdCallConv = return () #else -checkCConv StdCallConv = addErrTc (text "calling convention not supported on this platform: stdcall") +-- This is a warning, not an error. see #3336 +checkCConv StdCallConv = addWarnTc (text "the 'stdcall' calling convention is unsupported on this platform,"$$ text "treating as ccall") #endif checkCConv PrimCallConv = addErrTc (text "The `prim' calling convention can only be used with `foreign import'") checkCConv CmmCallConv = panic "checkCConv CmmCallConv" |