]> git.ipfire.org Git - people/ms/ipfire-2.x.git/commitdiff
make.sh: Remove -mindirect-branch=thunk and -mfunction-return=thunk as default
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 7 Aug 2020 11:50:00 +0000 (11:50 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 11 Aug 2020 10:31:15 +0000 (10:31 +0000)
I cannot find any evidence that this is helpful and no other
distribution has this as default. Packages that are vulnerable to these
attacks (i.e. the kernel) add these flags as appropriate automatically.

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

diff --git a/make.sh b/make.sh
index a2e54f233923fe383612eced435f3e0068c736e6..274838b0415043f4719c82859f4f77316e58ec22 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -146,14 +146,14 @@ 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"
+                       CFLAGS_ARCH="-m64 -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"
+                       CFLAGS_ARCH="-march=i586 -mtune=generic -fomit-frame-pointer"
                        ;;
 
                aarch64)