ilyakooo0/haskell.nix
1
0
Fork 0
mirror of https://github.com/ilyakooo0/haskell.nix.git synced 2024-09-17 09:57:27 +03:00
Code Issues Projects Releases Wiki Activity

fix: consider relocatable data as writable (#570)

Browse Source 
When declared as constant, read-only relocatable data are written to an unwriteable .rel.ro.data section. Being unwriteable, the gold linker doesn't put them inside the GNU_RELRO segment, but in a always read-only segment. Starting the relocation phase of such a built program then ends in a segmentation fault.

By declaring read-only relocatable data as writeable, they will be put inside a writeable .rel.ro.data section. The gold linker will then assume that those can be put inside the GNU_RELRO segment, that will only be writeable during the relocation phase.

The as assembler and ld linker will always consider the .rel.ro.data as writeable before relocation, and put the associated data in the GNU_RELRO.

Co-authored-by: Michivi <webmaster@michvi.com>
This commit is contained in:
Le Tuan 2020-05-09 01:04:50 +02:00 committed by GitHub
parent de3f82a419
commit 49ecc0e4db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
compiler/ghc/default.nix
View File

@ -102,6 +102,9 @@ let
GhcRtsHcOpts += -fPIC
'' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
EXTRA_CC_OPTS += -std=gnu99
'' + stdenv.lib.optionalString useLLVM ''
GhcStage2HcOpts += -fast-llvm
GhcLibHcOpts += -fast-llvm
'' + stdenv.lib.optionalString (!enableTerminfo) ''
WITH_TERMINFO=NO
''

1
overlays/bootstrap.nix
View File

@ -107,6 +107,7 @@ in {
++ final.lib.optional (version == "8.6.4") ./patches/ghc/ghc-8.6.4-reinstallable-lib-ghc.patch
++ final.lib.optional (version == "8.6.5") ./patches/ghc/ghc-8.6.5-reinstallable-lib-ghc.patch
++ final.lib.optional (version == "8.6.5") ./patches/ghc/ghc-8.6.5-atomic-arm-arch.patch
++ final.lib.optional (version == "8.6.5") ./patches/ghc/MR3214-writable-rel-ro-data.patch
++ final.lib.optional (version == "8.8.1") ./patches/ghc/ghc-8.8.1-reinstallable-lib-ghc.patch
++ fromUntil "8.8.2" "8.9" ./patches/ghc/ghc-8.8.2-reinstallable-lib-ghc.patch
++ final.lib.optional (version == "8.6.4") ./patches/ghc/ghc-8.6.4-better-plusSimplCountErrors.patch

13
overlays/patches/ghc/MR3214-writable-rel-ro-data.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/compiler/cmm/Cmm.hs b/compiler/cmm/Cmm.hs
index eb34618..f2cc32f 100644
--- a/compiler/cmm/Cmm.hs
+++ b/compiler/cmm/Cmm.hs
@@ -181,7 +181,7 @@ isSecConstant :: Section -> Bool
isSecConstant (Section t _) = case t of
Text -> True
ReadOnlyData -> True
- RelocatableReadOnlyData -> True
+ RelocatableReadOnlyData -> False
ReadOnlyData16 -> True
CString -> True
Data -> False