projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
put coqPassCoreToCore on the CoreM monad, greatly simplify Desugar.lhs
[ghc-hetmet.git]
/
compiler
/
llvmGen
/
LlvmCodeGen.hs
diff --git
a/compiler/llvmGen/LlvmCodeGen.hs
b/compiler/llvmGen/LlvmCodeGen.hs
index
ba5c1ec
..
56d8386
100644
(file)
--- a/
compiler/llvmGen/LlvmCodeGen.hs
+++ b/
compiler/llvmGen/LlvmCodeGen.hs
@@
-28,7
+28,9
@@
import Outputable
import qualified Pretty as Prt
import UniqSupply
import Util
import qualified Pretty as Prt
import UniqSupply
import Util
+import SysTools ( figureLlvmVersion )
+import Data.Maybe ( fromMaybe )
import System.IO
-- -----------------------------------------------------------------------------
import System.IO
-- -----------------------------------------------------------------------------
@@
-48,8
+50,9
@@
llvmCodeGen dflags h us cmms
in do
bufh <- newBufHandle h
Prt.bufLeftRender bufh $ pprLlvmHeader
in do
bufh <- newBufHandle h
Prt.bufLeftRender bufh $ pprLlvmHeader
-
- env' <- cmmDataLlvmGens dflags bufh env cdata []
+ ver <- (fromMaybe defaultLlvmVersion) `fmap` figureLlvmVersion dflags
+
+ env' <- cmmDataLlvmGens dflags bufh (setLlvmVer ver env) cdata []
cmmProcLlvmGens dflags bufh us env' cmm 1 []
bFlush bufh
cmmProcLlvmGens dflags bufh us env' cmm 1 []
bFlush bufh