summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArkadiusz Miśkiewicz2018-07-28 10:32:38 (GMT)
committerArkadiusz Miśkiewicz2018-07-28 10:32:38 (GMT)
commita5e17970f8c44d7073156cff29897c58fba03086 (patch)
tree1212814f7bb43dbb2b24d3bf5d5ed227e4a68ab4
parentbe86541174e8a8ccc14d758f63955a42b9235e56 (diff)
downloadkernel-a5e17970f8c44d7073156cff29897c58fba03086.zip
kernel-a5e17970f8c44d7073156cff29897c58fba03086.tar.gz
- rel 2; fix build with gcc 8auto/th/kernel-4.14-4.14.59-2
-rw-r--r--kernel-small_fixes.patch26
-rw-r--r--kernel.spec2
2 files changed, 27 insertions, 1 deletions
diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index d4b6034..e56acbb 100644
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -26,3 +26,29 @@
exit
fi
done
+commit 80d172431696482d9acd8d2c4ea78fed8956e2a1
+Author: valdis.kletnieks@vt.edu <valdis.kletnieks@vt.edu>
+Date: Sun Feb 4 12:01:43 2018 -0500
+
+ gcc-plugins: Add include required by GCC release 8
+
+ GCC requires another #include to get the gcc-plugins to build cleanly.
+
+ Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+ Signed-off-by: Kees Cook <keescook@chromium.org>
+
+diff --git a/scripts/gcc-plugins/gcc-common.h b/scripts/gcc-plugins/gcc-common.h
+index ffd1dfaa1cc1..f46750053377 100644
+--- a/scripts/gcc-plugins/gcc-common.h
++++ b/scripts/gcc-plugins/gcc-common.h
+@@ -97,6 +97,10 @@
+ #include "predict.h"
+ #include "ipa-utils.h"
+
++#if BUILDING_GCC_VERSION >= 8000
++#include "stringpool.h"
++#endif
++
+ #if BUILDING_GCC_VERSION >= 4009
+ #include "attribs.h"
+ #include "varasm.h"
diff --git a/kernel.spec b/kernel.spec
index b0da4d3..7539660 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -68,7 +68,7 @@
%define have_pcmcia 0
%endif
-%define rel 1
+%define rel 2
%define basever 4.14
%define postver .59