projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8f08820
)
LLVM: Allow optlc and optlo to override default params for these systools
author
David Terei
<davidterei@gmail.com>
Thu, 22 Jul 2010 18:16:31 +0000
(18:16 +0000)
committer
David Terei
<davidterei@gmail.com>
Thu, 22 Jul 2010 18:16:31 +0000
(18:16 +0000)
compiler/main/DriverPipeline.hs
patch
|
blob
|
history
diff --git
a/compiler/main/DriverPipeline.hs
b/compiler/main/DriverPipeline.hs
index
f56b122
..
8e11bf1
100644
(file)
--- a/
compiler/main/DriverPipeline.hs
+++ b/
compiler/main/DriverPipeline.hs
@@
-1248,11
+1248,11
@@
runPhase LlvmOpt _stop hsc_env _basename _suff input_fn get_output_fn maybe_loc
output_fn <- get_output_fn dflags LlvmLlc maybe_loc
SysTools.runLlvmOpt dflags
output_fn <- get_output_fn dflags LlvmLlc maybe_loc
SysTools.runLlvmOpt dflags
- (map SysTools.Option lo_opts
- ++ [ SysTools.FileOption "" input_fn,
+ ([ SysTools.FileOption "" input_fn,
SysTools.Option (llvmOpts !! opt_lvl),
SysTools.Option "-o",
SysTools.Option (llvmOpts !! opt_lvl),
SysTools.Option "-o",
- SysTools.FileOption "" output_fn])
+ SysTools.FileOption "" output_fn]
+ ++ map SysTools.Option lo_opts)
return (LlvmLlc, dflags, maybe_loc, output_fn)
where
return (LlvmLlc, dflags, maybe_loc, output_fn)
where
@@
-1278,11
+1278,10
@@
runPhase LlvmLlc _stop hsc_env _basename _suff input_fn get_output_fn maybe_loc
output_fn <- get_output_fn dflags nphase maybe_loc
SysTools.runLlvmLlc dflags
output_fn <- get_output_fn dflags nphase maybe_loc
SysTools.runLlvmLlc dflags
- (map SysTools.Option lc_opts
- ++ [ -- SysTools.Option "-tailcallopt",
- SysTools.Option (llvmOpts !! opt_lvl),
+ ([ SysTools.Option (llvmOpts !! opt_lvl),
SysTools.FileOption "" input_fn,
SysTools.FileOption "" input_fn,
- SysTools.Option "-o", SysTools.FileOption "" output_fn])
+ SysTools.Option "-o", SysTools.FileOption "" output_fn]
+ ++ map SysTools.Option lc_opts)
return (nphase, dflags, maybe_loc, output_fn)
where
return (nphase, dflags, maybe_loc, output_fn)
where