diff options
| author | Robin Gloster <mail@glob.in> | 2016-08-26 15:19:37 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-08-26 15:19:37 +0000 |
| commit | e0deed0110ce2627d19eae04c16e8341f1d81269 (patch) | |
| tree | 90f01aaff636b1841523d00613b92c77f127bc9f | |
| parent | 098680e78e871d7eb699bc750d436ea24796f818 (diff) | |
| download | nixlib-e0deed0110ce2627d19eae04c16e8341f1d81269.tar nixlib-e0deed0110ce2627d19eae04c16e8341f1d81269.tar.gz nixlib-e0deed0110ce2627d19eae04c16e8341f1d81269.tar.bz2 nixlib-e0deed0110ce2627d19eae04c16e8341f1d81269.tar.lz nixlib-e0deed0110ce2627d19eae04c16e8341f1d81269.tar.xz nixlib-e0deed0110ce2627d19eae04c16e8341f1d81269.tar.zst nixlib-e0deed0110ce2627d19eae04c16e8341f1d81269.zip | |
ghc: add comment to relocation patch
| -rw-r--r-- | pkgs/applications/graphics/xaos/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghc/relocation.patch | 8 |
2 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/applications/graphics/xaos/default.nix b/pkgs/applications/graphics/xaos/default.nix index 1f3a9967b020..a6f97bb5334e 100644 --- a/pkgs/applications/graphics/xaos/default.nix +++ b/pkgs/applications/graphics/xaos/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { sha256 = "15cd1cx1dyygw6g2nhjqq3bsfdj8sj8m4va9n75i0f3ryww3x7wq"; }; + hardeningDisable = [ "format" ]; + buildInputs = [ aalib gsl libpng libX11 xproto libXext xextproto libXt zlib gettext intltool perl diff --git a/pkgs/development/compilers/ghc/relocation.patch b/pkgs/development/compilers/ghc/relocation.patch index c5b1f6c560da..b9becfc86b54 100644 --- a/pkgs/development/compilers/ghc/relocation.patch +++ b/pkgs/development/compilers/ghc/relocation.patch @@ -1,3 +1,11 @@ +Adding support for the R_X86_64_REX_GOTPCRELX relocation type. +This relocation is treated by the linker the same as the R_X86_64_GOTPCRELX type +G + GOT + A - P to generate relative offsets to the GOT. +The REX prefix has no influence in this stage. + +This caused breakage when enabling relro/bindnow hardening e.g. in ghcPaclages.vector + +Source: https://phabricator.haskell.org/D2303#67070 diff --git a/rts/Linker.c b/rts/Linker.c --- a/rts/Linker.c +++ b/rts/Linker.c |