Commit 6b8d013f authored by Simon Peyton Jones's avatar Simon Peyton Jones

Merge remote-tracking branch 'origin/master' into tc-untouchables

parents e978cd66 cb467f02
......@@ -26,7 +26,10 @@ config.other_ways = ['extcore','optextcore',
'prof_hc_hb','prof_hb',
'prof_hd','prof_hy','prof_hr',
'threaded1_ls', 'threaded2_hT',
'llvm', 'debugllvm' ]
'llvm', 'debugllvm',
'profllvm', 'profoptllvm', 'profthreadedllvm',
'threaded1llvm', 'threaded2llvm',
'dynllvm']
if (ghc_with_native_codegen == 1):
config.compile_ways.append('optasm')
......@@ -86,7 +89,14 @@ config.way_flags = {
'prof_hd' : ['-O', '-prof', '-auto-all'],
'prof_hy' : ['-O', '-prof', '-auto-all'],
'prof_hr' : ['-O', '-prof', '-auto-all'],
'dyn' : ['-O', '-dynamic']
'dyn' : ['-O', '-dynamic'],
# llvm variants...
'profllvm' : ['-prof', '-auto-all', '-fllvm'],
'profoptllvm' : ['-O', '-prof', '-auto-all', '-fllvm'],
'profthreadedllvm' : ['-O', '-prof', '-auto-all', '-threaded', '-fllvm'],
'threaded1llvm' : ['-threaded', '-debug', '-fllvm'],
'threaded2llvm' : ['-O', '-threaded', '-eventlog', '-fllvm'],
'dynllvm' : ['-O', '-dynamic', '-fllvm']
}
config.way_rts_flags = {
......@@ -112,7 +122,14 @@ config.way_rts_flags = {
'prof_hd' : ['-hd'],
'prof_hy' : ['-hy'],
'prof_hr' : ['-hr'],
'dyn' : []
'dyn' : [],
# llvm variants...
'profllvm' : ['-p'],
'profoptllvm' : ['-hc', '-p'],
'profthreadedllvm' : ['-p'],
'threaded1llvm' : [],
'threaded2llvm' : ['-N2 -ls'],
'dynllvm' : []
}
# Useful classes of ways that can be used with only_ways() and
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment