Repository : ssh://darcs.haskell.org//srv/darcs/testsuite

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/f813e855a0fa194727bf05e9cab610f3863f50b5

>---------------------------------------------------------------

commit f813e855a0fa194727bf05e9cab610f3863f50b5
Author: David Terei <[email protected]>
Date:   Mon Oct 1 15:01:56 2012 -0700

    Add bunch of llvm ways for testing purposes.

>---------------------------------------------------------------

 config/ghc |   23 ++++++++++++++++++++---
 1 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/config/ghc b/config/ghc
index 3ce91af..8c8c329 100644
--- a/config/ghc
+++ b/config/ghc
@@ -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



_______________________________________________
Cvs-ghc mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/cvs-ghc

Reply via email to