[Git][ghc/ghc][wip/req_smp] re-add ghc_with_smp

doyougnu (@doyougnu) gitlab at gitlab.haskell.org
Fri Dec 23 12:13:02 UTC 2022



doyougnu pushed to branch wip/req_smp at Glasgow Haskell Compiler / GHC


Commits:
4a4bc1ae by doyougnu at 2022-12-23T07:12:54-05:00
re-add ghc_with_smp

- - - - -


2 changed files:

- hadrian/src/Settings/Builders/RunTest.hs
- testsuite/config/ghc


Changes:

=====================================
hadrian/src/Settings/Builders/RunTest.hs
=====================================
@@ -203,7 +203,6 @@ runTestBuilderArgs = builder Testsuite ? do
     bignumCheck   <- getBignumCheck
 
     keepFiles <- expr (testKeepFiles <$> userSetting defaultTestArgs)
-    isCross   <- cross
 
     accept <- expr (testAccept <$> userSetting defaultTestArgs)
     (acceptPlatform, acceptOS) <- expr . liftIO $
@@ -264,7 +263,6 @@ runTestBuilderArgs = builder Testsuite ? do
             , arg "-e", arg $ asBool "ghc_with_threaded_rts=" (hasThreadedRts)
             , arg "-e", arg $ asBool "config.have_fast_bignum=" (bignumBackend /= "native" && not bignumCheck)
             , arg "-e", arg $ asBool "target_with_smp=" targetWithSMP
-
             , arg "-e", arg $ "config.ghc_dynamic=" ++ show hasDynamic
             , arg "-e", arg $ "config.leading_underscore=" ++ show leadingUnderscore
 


=====================================
testsuite/config/ghc
=====================================
@@ -47,8 +47,7 @@ if config.have_interp:
 # whether the target supports smp
 if ghc_with_threaded_rts:
     config.run_ways.append('threaded1')
-    if ghc_with_smp:
-        config.target_have_smp = True
+    if target_with_smp:
         config.run_ways.append('threaded2')
         if config.speed == 0:
             config.run_ways.append('nonmoving_thr')



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/4a4bc1aeaac933119373685ff4b6c6537c6facb6

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/4a4bc1aeaac933119373685ff4b6c6537c6facb6
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20221223/57209d5a/attachment-0001.html>


More information about the ghc-commits mailing list