ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 12:53:59 +03:00
Code Issues Projects Releases Wiki Activity

ghc: add comment to relocation patch

Browse Source
This commit is contained in:
Robin Gloster 2016-08-26 15:19:37 +00:00
parent 098680e78e
commit e0deed0110
No known key found for this signature in database
GPG Key ID: 5E4C836C632C2882
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/graphics/xaos/default.nix
View File

@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "15cd1cx1dyygw6g2nhjqq3bsfdj8sj8m4va9n75i0f3ryww3x7wq"; sha256 = "15cd1cx1dyygw6g2nhjqq3bsfdj8sj8m4va9n75i0f3ryww3x7wq";
}; };
hardeningDisable = [ "format" ];
buildInputs = [ buildInputs = [
aalib gsl libpng libX11 xproto libXext xextproto aalib gsl libpng libX11 xproto libXext xextproto
libXt zlib gettext intltool perl libXt zlib gettext intltool perl

8
pkgs/development/compilers/ghc/relocation.patch
View File

@ -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 diff --git a/rts/Linker.c b/rts/Linker.c
--- a/rts/Linker.c --- a/rts/Linker.c
+++ b/rts/Linker.c +++ b/rts/Linker.c