diff options
| author | Adam Gundry <adam@well-typed.com> | 2015-10-16 13:58:52 +0100 |
|---|---|---|
| committer | Adam Gundry <adam@well-typed.com> | 2015-10-16 13:58:52 +0100 |
| commit | 5a1b4f814f74ec1c48152d97523744518e212777 (patch) | |
| tree | 7c2207ecacbd37f12c78dbcf9d4334827164e0fb /compiler/llvmGen/LlvmCodeGen/Base.hs | |
| parent | 6757950cdd8bb0af0355539987ee78401a6a8f6b (diff) | |
| parent | 808bbdf08058785ae5bc59b5b4f2b04951d4cbbf (diff) | |
| download | haskell-wip/orf-reboot.tar.gz | |
Merge remote-tracking branch 'origin/master' into wip/orf-rebootwip/orf-reboot
Conflicts:
compiler/rename/RnNames.hs
compiler/typecheck/TcRnMonad.hs
utils/haddock
Diffstat (limited to 'compiler/llvmGen/LlvmCodeGen/Base.hs')
| -rw-r--r-- | compiler/llvmGen/LlvmCodeGen/Base.hs | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/compiler/llvmGen/LlvmCodeGen/Base.hs b/compiler/llvmGen/LlvmCodeGen/Base.hs index 5ef0a4bbfa..510d01f1d7 100644 --- a/compiler/llvmGen/LlvmCodeGen/Base.hs +++ b/compiler/llvmGen/LlvmCodeGen/Base.hs @@ -12,8 +12,7 @@ module LlvmCodeGen.Base ( LiveGlobalRegs, LlvmUnresData, LlvmData, UnresLabel, UnresStatic, - LlvmVersion, defaultLlvmVersion, minSupportLlvmVersion, - maxSupportLlvmVersion, + LlvmVersion, supportedLlvmVersion, LlvmM, runLlvm, liftStream, withClearVars, varLookup, varInsert, @@ -36,6 +35,7 @@ module LlvmCodeGen.Base ( ) where #include "HsVersions.h" +#include "ghcautoconf.h" import Llvm import LlvmCodeGen.Regs @@ -111,7 +111,7 @@ widthToLlvmInt w = LMInt $ widthInBits w llvmGhcCC :: DynFlags -> LlvmCallConvention llvmGhcCC dflags | platformUnregisterised (targetPlatform dflags) = CC_Ccc - | otherwise = CC_Ncc 10 + | otherwise = CC_Ghc -- | Llvm Function type for Cmm function llvmFunTy :: LiveGlobalRegs -> LlvmM LlvmType @@ -172,17 +172,11 @@ llvmPtrBits dflags = widthInBits $ typeWidth $ gcWord dflags -- -- | LLVM Version Number -type LlvmVersion = Int +type LlvmVersion = (Int, Int) --- | The LLVM Version we assume if we don't know -defaultLlvmVersion :: LlvmVersion -defaultLlvmVersion = 36 - -minSupportLlvmVersion :: LlvmVersion -minSupportLlvmVersion = 36 - -maxSupportLlvmVersion :: LlvmVersion -maxSupportLlvmVersion = 36 +-- | The LLVM Version that is currently supported. +supportedLlvmVersion :: LlvmVersion +supportedLlvmVersion = sUPPORTED_LLVM_VERSION -- ---------------------------------------------------------------------------- -- * Environment Handling |