diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2020-07-04 00:19:51 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2020-07-04 19:22:23 +0200 |
| commit | f4985a22ca1b46bbfa71dec4219b7fbeca2c0023 (patch) | |
| tree | 964f8813945913a7eaba920bda6a40be30516364 /target/linux/generic/pending-4.14/201-extra_optimization.patch | |
| parent | 73fecd36bfd2b9f92a2a20f38bdb73b4433dec3e (diff) | |
| download | upstream-f4985a22ca1b46bbfa71dec4219b7fbeca2c0023.tar.gz upstream-f4985a22ca1b46bbfa71dec4219b7fbeca2c0023.tar.bz2 upstream-f4985a22ca1b46bbfa71dec4219b7fbeca2c0023.zip | |
kernel: Update kernel 4.14 to version 4.14.187
Fixes:
- CVE-2020-10757
Run tested: ath79, ipq40xx
Build tested: ath79, ipq40xx
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/pending-4.14/201-extra_optimization.patch')
| -rw-r--r-- | target/linux/generic/pending-4.14/201-extra_optimization.patch | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/target/linux/generic/pending-4.14/201-extra_optimization.patch b/target/linux/generic/pending-4.14/201-extra_optimization.patch index 305ba3aad2..aef36a8c11 100644 --- a/target/linux/generic/pending-4.14/201-extra_optimization.patch +++ b/target/linux/generic/pending-4.14/201-extra_optimization.patch @@ -14,19 +14,15 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/Makefile +++ b/Makefile -@@ -656,12 +656,12 @@ KBUILD_CFLAGS += $(call cc-disable-warni +@@ -652,9 +652,9 @@ KBUILD_CFLAGS += $(call cc-disable-warni KBUILD_CFLAGS += $(call cc-disable-warning, attribute-alias) 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 |