diff options
| author | Simon Marlow <simonmar@microsoft.com> | 2006-02-09 15:44:49 +0000 |
|---|---|---|
| committer | Simon Marlow <simonmar@microsoft.com> | 2006-02-09 15:44:49 +0000 |
| commit | eba7b660a36878cd8d926845807913d7ec5734c9 (patch) | |
| tree | 66222153e7d3718ace78c27e5784ca3a3f0b9221 /mk | |
| parent | 608bc3f3ad6fca14a23529f314dbd9d3342a9507 (diff) | |
| download | haskell-eba7b660a36878cd8d926845807913d7ec5734c9.tar.gz | |
Merge the smp and threaded RTS ways
Now, the threaded RTS also includes SMP support. The -smp flag is a
synonym for -threaded. The performance implications of this are small
to negligible, and it results in a code cleanup and reduces the number
of combinations we have to test.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/config.mk.in | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/mk/config.mk.in b/mk/config.mk.in index 931c4f5244..67b69d8c75 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -311,10 +311,8 @@ endif # # thr : threaded # thr_p : threaded profiled -# s : smp # debug : debugging (compile with -g for the C compiler, and -DDEBUG) # debug_p : debugging profiled -# debug_s : debugging smp # debug_u : debugging unregisterised # thr_debug : debugging threaded # thr_debug_p : debugging threaded profiled @@ -322,7 +320,7 @@ endif ifeq "$(BootingFromHc)" "YES" GhcRTSWays= else -GhcRTSWays=thr thr_p s debug debug_s thr_debug +GhcRTSWays=thr thr_p debug thr_debug endif # Option flags to pass to GHC when it's compiling modules in @@ -1070,10 +1068,6 @@ WAY_thr_HC_OPTS=-optc-DTHREADED_RTS WAY_thr_p_NAME=threaded profiled WAY_thr_p_HC_OPTS=-optc-DTHREADED_RTS -prof -# Way `s': -WAY_s_NAME=threads (for SMP) -WAY_s_HC_OPTS=-optc-DSMP -optc-DTHREADED_RTS - # Way 'debug': WAY_debug_NAME=debug WAY_debug_HC_OPTS=-optc-DDEBUG @@ -1086,10 +1080,6 @@ WAY_debug_p_HC_OPTS=-optc-DDEBUG -prof WAY_debug_u_NAME=debug unregisterised WAY_debug_u_HC_OPTS=-optc-DDEBUG -unreg -# Way 'debug_s': -WAY_debug_s_NAME=debug SMP -WAY_debug_s_HC_OPTS=-optc-DDEBUG -optc-DTHREADED_RTS -optc-DSMP - # Way 'thr_debug': WAY_thr_debug_NAME=threaded WAY_thr_debug_HC_OPTS=-optc-DTHREADED_RTS -optc-DDEBUG |