[Git][ghc/ghc][master] 2 commits: rts: remove legacy logging cabal flag

[Marge Bot (@marge-bot)]

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC


Commits:
63aa0069 by Cheng Shao at 2022-09-17T06:46:04-04:00
rts: remove legacy logging cabal flag

- - - - -
bd0f4184 by Cheng Shao at 2022-09-17T06:46:04-04:00
rts: make threaded ways optional

For certain targets (e.g. wasm32-wasi), the threaded rts is known not to
work. This patch adds a "threaded" cabal flag to rts to make threaded
rts ways optional. Hadrian enables this flag iff the flavour rtsWays
contains threaded ways.

- - - - -


2 changed files:

- hadrian/src/Settings/Packages.hs
- rts/rts.cabal.in


Changes:

=====================================
hadrian/src/Settings/Packages.hs
=====================================
@@ -389,6 +389,7 @@ rtsPackageArgs = package rts ? do
           [ any (wayUnit Profiling) rtsWays `cabalFlag` "profiling"
           , any (wayUnit Debug) rtsWays     `cabalFlag` "debug"
           , any (wayUnit Dynamic) rtsWays   `cabalFlag` "dynamic"
+          , any (wayUnit Threaded) rtsWays  `cabalFlag` "threaded"
           , useSystemFfi                    `cabalFlag` "use-system-libffi"
           , useLibffiForAdjustors           `cabalFlag` "libffi-adjustors"
           , Debug `wayUnit` way             `cabalFlag` "find-ptr"


=====================================
rts/rts.cabal.in
=====================================
@@ -49,10 +49,10 @@ flag profiling
   default: False
 flag debug
   default: False
-flag logging
-  default: False
 flag dynamic
   default: False
+flag threaded
+  default: False
 flag thread-sanitizer
   description:
     Enable checking for data races using the ThreadSanitizer (TSAN)
@@ -80,17 +80,26 @@ library
     -- Here we declare several flavours to be available when passing the
     -- suitable (combination of) flag(s) when configuring the RTS from hadrian,
     -- using Cabal.
-    extra-library-flavours: _thr
+    if flag(threaded)
+      extra-library-flavours: _thr
 
     if flag(profiling)
-      extra-library-flavours: _p _thr_p
+      extra-library-flavours: _p
+      if flag(threaded)
+        extra-library-flavours: _thr_p
       if flag(debug)
-        extra-library-flavours: _debug_p _thr_debug_p
+        extra-library-flavours: _debug_p
+        if flag(threaded)
+          extra-library-flavours: _thr_debug_p
     if flag(debug)
-      extra-library-flavours: _debug _thr_debug
+      extra-library-flavours: _debug
+      if flag(threaded)
+        extra-library-flavours: _thr_debug
       if flag(dynamic)
-        extra-dynamic-library-flavours: _debug _thr_debug
-    if flag(dynamic)
+        extra-dynamic-library-flavours: _debug
+        if flag(threaded)
+          extra-dynamic-library-flavours: _thr_debug
+    if flag(dynamic) && flag(threaded)
       extra-dynamic-library-flavours: _thr
 
     if flag(thread-sanitizer)



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/85431ac363e77dd0f93d46ff1ed450b4833c2a40...bd0f418422a3ace8d05c8ce93850190e57321465

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/85431ac363e77dd0f93d46ff1ed450b4833c2a40...bd0f418422a3ace8d05c8ce93850190e57321465
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/20220917/ad4141a0/attachment-0001.html>