Merge pull request #316761 from risicle/ris-zerocallusedregs-default

stdenv: promote `zerocallusedregs` to `defaultHardeningFlags`
This commit is contained in:
Robert Scott
2024-06-03 19:52:30 +01:00
committed by GitHub
3 changed files with 9 additions and 1 deletions
@@ -45,6 +45,7 @@
"relro"
"stackprotector"
"strictoverflow"
"zerocallusedregs"
] ++ lib.optional (with stdenvNoCC;
# Musl-based platforms will keep "pie", other platforms will not.
# If you change this, make sure to update section `{#sec-hardening-in-nixpkgs}`
@@ -126,6 +126,14 @@ in let
# It's not clear to me why this isn't an issue for LLVM developers running
# on macOS (nothing about this _seems_ nix specific)..
./llvm/lit-shell-script-runner-set-dyld-library-path.patch
# resolves https://github.com/llvm/llvm-project/issues/75168
(fetchpatch {
name = "fix-fzero-call-used-regs.patch";
url = "https://github.com/llvm/llvm-project/commit/f800c1f3b207e7bcdc8b4c7192928d9a078242a0.patch";
stripLen = 1;
hash = "sha256-e8YKrMy2rGcSJGC6er2V66cOnAnI+u1/yImkvsRsmg8=";
})
];
pollyPatches = [
./llvm/gnu-install-dirs-polly.patch
-1
View File
@@ -292,7 +292,6 @@ let
pkgsExtraHardening = super';
stdenv = super'.withDefaultHardeningFlags (
super'.stdenv.cc.defaultHardeningFlags ++ [
"zerocallusedregs"
"trivialautovarinit"
]
) super'.stdenv;