[commit: ghc] master: Add a couple more RTS ways (1b3f274)
Ian Lynagh <[email protected]>
| Newsgroups | gmane.comp.lang.haskell.cvs.ghc |
|---|---|
| Message-ID | <[email protected]> |
Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master http://hackage.haskell.org/trac/ghc/changeset/1b3f27473ce5e15392e65c1cc264e0ef86d1eade >--------------------------------------------------------------- commit 1b3f27473ce5e15392e65c1cc264e0ef86d1eade Author: Ian Lynagh <[email protected]> Date: Wed Oct 3 16:07:57 2012 +0100 Add a couple more RTS ways There are used by the testsuite when dynamic-by-default is on >--------------------------------------------------------------- mk/config.mk.in | 2 +- mk/ways.mk | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/mk/config.mk.in b/mk/config.mk.in index c10378d..93618a9 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -267,7 +267,7 @@ endif # (see GhcWithSMP). GhcRTSWays += thr thr_debug thr_l GhcRTSWays += $(if $(findstring p, $(GhcLibWays)),thr_p,) -GhcRTSWays += $(if $(findstring dyn, $(GhcLibWays)),dyn debug_dyn thr_dyn thr_debug_dyn,) +GhcRTSWays += $(if $(findstring dyn, $(GhcLibWays)),dyn debug_dyn thr_dyn thr_debug_dyn l_dyn thr_l_dyn,) # We can only build GHCi threaded if we have a threaded RTS: GhcThreaded = $(if $(findstring thr,$(GhcRTSWays)),YES,NO) diff --git a/mk/ways.mk b/mk/ways.mk index 1270a28..2c125e6 100644 --- a/mk/ways.mk +++ b/mk/ways.mk @@ -22,7 +22,7 @@ # # The ways currently defined. # -ALL_WAYS=v p t l s mp mg debug dyn thr thr_l debug_dyn thr_dyn thr_debug_dyn thr_p thr_debug debug_p thr_debug_p +ALL_WAYS=v p t l s mp mg debug dyn thr thr_l debug_dyn thr_dyn thr_debug_dyn thr_p thr_debug debug_p thr_debug_p l_dyn thr_l_dyn # # The following ways currently have treated specially, p t mg, @@ -93,9 +93,18 @@ WAY_thr_dyn_NAME=thr_dyn WAY_thr_dyn_HC_OPTS=-fPIC -dynamic -optc-DTHREADED_RTS # Way 'thr_debug_dyn': -WAY_thr_debug_dyn_NAME=thr_dyn +WAY_thr_debug_dyn_NAME=thr_debug_dyn WAY_thr_debug_dyn_HC_OPTS=-fPIC -dynamic -optc-DTHREADED_RTS -optc-DDEBUG # Way 'debug_dyn': -WAY_debug_dyn_NAME=thr_dyn +WAY_debug_dyn_NAME=debug_dyn WAY_debug_dyn_HC_OPTS=-fPIC -dynamic -optc-DDEBUG + +# Way 'l_dyn': +WAY_l_dyn_NAME=event logging dynamic +WAY_l_dyn_HC_OPTS= -fPIC -dynamic -eventlog + +# Way 'thr_l_dyn': +WAY_thr_l_dyn_NAME=threaded event logging dynamic +WAY_thr_l_dyn_HC_OPTS= -fPIC -dynamic -optc-DTHREADED_RTS -eventlog +