[commit: ghc] wip/nfs-locking: Add missing arguments for rts package. (13b1491)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/13b1491faf02d9e03385ad61a26bf90cbc951fda/ghc

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

commit 13b1491faf02d9e03385ad61a26bf90cbc951fda
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Sun Feb 28 23:47:46 2016 +0000

    Add missing arguments for rts package.


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

13b1491faf02d9e03385ad61a26bf90cbc951fda
 src/Settings/Packages/Rts.hs | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/Settings/Packages/Rts.hs b/src/Settings/Packages/Rts.hs
index 334a712..ba79289 100644
--- a/src/Settings/Packages/Rts.hs
+++ b/src/Settings/Packages/Rts.hs
@@ -62,7 +62,9 @@ rtsPackageArgs = package rts ? do
           -- there is a non-inlined variant to use instead. But rts does not
           -- provide non-inlined alternatives and hence needs the function to
           -- be inlined. See also Issue #90
-          , arg $ "-O2"
+          , arg "-O2"
+
+          , way == threaded ? arg "-DTHREADED_RTS"
 
           , (file "//RtsMessages.*" ||^ file "//Trace.*") ?
             arg ("-DProjectVersion=" ++ quote projectVersion)
@@ -82,7 +84,10 @@ rtsPackageArgs = package rts ? do
             , "-DTargetOS="                  ++ quote targetOs
             , "-DTargetVendor="              ++ quote targetVendor
             , "-DGhcUnregisterised="         ++ quote ghcUnreg
-            , "-DGhcEnableTablesNextToCode=" ++ quote ghcEnableTNC ] ]
+            , "-DGhcEnableTablesNextToCode=" ++ quote ghcEnableTNC ]
+
+            , (file "//Evac_thr.*" ||^ file "//Scav_thr.*") ?
+              append [ "-DPARALLEL_GC", "-Irts/sm" ] ]
 
         , builderGhc ? (arg "-Irts" <> includesArgs)
 
@@ -233,10 +238,3 @@ rtsPackageArgs = package rts ? do
 -- # -O3 helps unroll some loops (especially in copy() with a constant argument).
 -- rts/sm/Evac_CC_OPTS += -funroll-loops
 -- rts/dist/build/sm/Evac_thr_HC_OPTS += -optc-funroll-loops
-
--- # These files are just copies of sm/Evac.c and sm/Scav.c respectively,
--- # but compiled with -DPARALLEL_GC.
--- rts/dist/build/sm/Evac_thr_CC_OPTS += -DPARALLEL_GC -Irts/sm
--- rts/dist/build/sm/Scav_thr_CC_OPTS += -DPARALLEL_GC -Irts/sm
-
--- #-----------------------------------------------------------------------------