summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-4.9/201-extra_optimization.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2020-07-03 21:46:40 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2020-07-05 15:02:47 +0200
commit0f07496f520cef7c58efe125d542cbc063bbc558 (patch)
tree8ef66ba2f34a3d081c788fa21d79b602f45f33f0 /target/linux/generic/pending-4.9/201-extra_optimization.patch
parent1f8d9f70c259a5702c4a7646754ccad6add5d9ab (diff)
downloadopenwrt-0f07496f520cef7c58efe125d542cbc063bbc558.tar.gz
openwrt-0f07496f520cef7c58efe125d542cbc063bbc558.tar.bz2
openwrt-0f07496f520cef7c58efe125d542cbc063bbc558.zip
kernel: Update kernel 4.9 to version 4.9.229
Fixes: - CVE-2020-10757 Run tested: ar71xx Build tested: ar71xx Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/pending-4.9/201-extra_optimization.patch')
-rw-r--r--target/linux/generic/pending-4.9/201-extra_optimization.patch12
1 files changed, 4 insertions, 8 deletions
diff --git a/target/linux/generic/pending-4.9/201-extra_optimization.patch b/target/linux/generic/pending-4.9/201-extra_optimization.patch
index 813951158c..7c64123f6e 100644
--- a/target/linux/generic/pending-4.9/201-extra_optimization.patch
+++ b/target/linux/generic/pending-4.9/201-extra_optimization.patch
@@ -14,19 +14,15 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/Makefile
+++ b/Makefile
-@@ -658,12 +658,12 @@ KBUILD_CFLAGS += $(call cc-option,-fdata
+@@ -654,9 +654,9 @@ KBUILD_CFLAGS += $(call cc-option,-fdata
endif
ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
--KBUILD_CFLAGS += -Os $(call cc-disable-warning,maybe-uninitialized,)
-+KBUILD_CFLAGS += -Os $(call cc-disable-warning,maybe-uninitialized,) $(EXTRA_OPTIMIZATION)
- else
- ifdef CONFIG_PROFILE_ALL_BRANCHES
--KBUILD_CFLAGS += -O2 $(call cc-disable-warning,maybe-uninitialized,)
-+KBUILD_CFLAGS += -O2 $(call cc-disable-warning,maybe-uninitialized,) $(EXTRA_OPTIMIZATION)
+-KBUILD_CFLAGS += -Os
++KBUILD_CFLAGS += -Os $(EXTRA_OPTIMIZATION)
else
-KBUILD_CFLAGS += -O2
+KBUILD_CFLAGS += -O2 -fno-reorder-blocks -fno-tree-ch $(EXTRA_OPTIMIZATION)
endif
- endif
+ # Tell gcc to never replace conditional load with a non-conditional one