summaryrefslogtreecommitdiff
path: root/compiler/main
diff options
context:
space:
mode:
authorMoritz Angermann <moritz.angermann@gmail.com>2021-02-13 16:44:19 +0800
committerMoritz Angermann <moritz.angermann@gmail.com>2021-02-17 21:09:55 +0800
commit9a1aa9fbee2fea8b85eeb5f80b748140efe9999e (patch)
tree06973ea9ea59104c970f87bb0fe54f2e45cd0d88 /compiler/main
parent5109e87e13ab45d799db2013535f54ca35f1f4dc (diff)
downloadhaskell-wip/angerman/adjustor-alloc-mark-split.tar.gz
Allocate Adjustors and mark them readable in two stepswip/angerman/adjustor-alloc-mark-split
This drops allocateExec for darwin, and replaces it with a alloc, write, mark executable strategy instead. This prevents us from trying to allocate an executable range and then write to it, which X^W will prohibit on darwin. This will *only* work if we can use mmap.
Diffstat (limited to 'compiler/main')
-rw-r--r--compiler/main/Packages.hs6
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/main/Packages.hs b/compiler/main/Packages.hs
index f5a8c964b3..66c46e9d91 100644
--- a/compiler/main/Packages.hs
+++ b/compiler/main/Packages.hs
@@ -1862,9 +1862,9 @@ packageHsLibs dflags p = map (mkDynName . addSuffix) (hsLibraries p)
-- This change elevates the need to add custom hooks
-- and handling specifically for the `rts` package for
-- example in ghc-cabal.
- addSuffix rts@"HSrts" = rts ++ (expandTag rts_tag)
- addSuffix rts@"HSrts-1.0"= rts ++ (expandTag rts_tag)
- addSuffix other_lib = other_lib ++ (expandTag tag)
+ addSuffix rts@"HSrts" = rts ++ (expandTag rts_tag)
+ addSuffix rts@"HSrts-1.0.1" = rts ++ (expandTag rts_tag)
+ addSuffix other_lib = other_lib ++ (expandTag tag)
expandTag t | null t = ""
| otherwise = '_':t