]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
Revert "make.sh: Add -fstack-clash-protection on platforms that support it"
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 10 Feb 2018 13:30:58 +0000 (13:30 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 11 Feb 2018 20:56:12 +0000 (20:56 +0000)
This reverts commit 18b82970b81a5bbd31b8922440a97e43d6f01566.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
make.sh

diff --git a/make.sh b/make.sh
index 5767ae8f335927c344781ab19293039c09fb5e28..172ba3209dba79e93c8bed68e451b43d51f879c4 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -144,21 +144,21 @@ configure_build() {
                        BUILDTARGET="${build_arch}-unknown-linux-gnu"
                        CROSSTARGET="${build_arch}-cross-linux-gnu"
                        BUILD_PLATFORM="x86"
-                       CFLAGS_ARCH="-m64 -mindirect-branch=thunk -mfunction-return=thunk -mtune=generic -fstack-clash-protection"
+                       CFLAGS_ARCH="-m64 -mindirect-branch=thunk -mfunction-return=thunk -mtune=generic"
                        ;;
 
                i586)
                        BUILDTARGET="${build_arch}-pc-linux-gnu"
                        CROSSTARGET="${build_arch}-cross-linux-gnu"
                        BUILD_PLATFORM="x86"
-                       CFLAGS_ARCH="-march=i586 -mindirect-branch=thunk -mfunction-return=thunk -mtune=generic -fomit-frame-pointer -fstack-clash-protection"
+                       CFLAGS_ARCH="-march=i586 -mindirect-branch=thunk -mfunction-return=thunk -mtune=generic -fomit-frame-pointer"
                        ;;
 
                aarch64)
                        BUILDTARGET="${build_arch}-unknown-linux-gnu"
                        CROSSTARGET="${build_arch}-cross-linux-gnu"
                        BUILD_PLATFORM="arm"
-                       CFLAGS_ARCH="-fstack-clash-protection"
+                       CFLAGS_ARCH=""
                        ;;
 
                armv7hl)