From d42f502c84805e85957b264a93f4cc196d41bed9 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 26 Jun 2017 01:12:38 +0200 Subject: [PATCH] Revert "cc-wrapper: add stackcheck hardening (stack clash)" This reverts commit 4150f5e8ba650416dcb8956c9835885cc6a2a80d. The stack protector hardening breaks the llvm_4 build. --- pkgs/build-support/cc-wrapper/add-hardening.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/build-support/cc-wrapper/add-hardening.sh b/pkgs/build-support/cc-wrapper/add-hardening.sh index 2419b567d57..b98833b3513 100644 --- a/pkgs/build-support/cc-wrapper/add-hardening.sh +++ b/pkgs/build-support/cc-wrapper/add-hardening.sh @@ -1,4 +1,4 @@ -hardeningFlags=(fortify stackprotector pic strictoverflow format relro bindnow stackcheck) +hardeningFlags=(fortify stackprotector pic strictoverflow format relro bindnow) hardeningFlags+=("${hardeningEnable[@]}") hardeningCFlags=() hardeningLDFlags=() @@ -50,11 +50,7 @@ if [[ ! $hardeningDisable =~ "all" ]]; then if [[ -n "$NIX_DEBUG" ]]; then echo HARDENING: enabling bindnow >&2; fi hardeningLDFlags+=('-z' 'now') ;; - stackcheck) - if [[ -n "$NIX_DEBUG" ]]; then echo HARDENING: enabling stackcheck >&2; fi - hardeningCFlags+=('-fstack-check=specific') - ;; - *) + *) echo "Hardening flag unknown: $flag" >&2 ;; esac